You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/07/28 00:55:09 UTC
svn commit: r798322 - in
/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering:
DefaultMavenFileFilterTest.java DefaultMavenResourcesFilteringTest.java
IncrementalResourceFilteringTest.java PropertyUtilsTest.java
Author: olamy
Date: Mon Jul 27 22:55:09 2009
New Revision: 798322
URL: http://svn.apache.org/viewvc?rev=798322&view=rev
Log:
formatting
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=798322&r1=798321&r2=798322&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java Mon Jul 27 22:55:09 2009
@@ -33,13 +33,13 @@
extends PlexusTestCase
{
- File to = new File(getBasedir(), "target/reflection-test.properties");
-
+ File to = new File( getBasedir(), "target/reflection-test.properties" );
+
protected void setUp()
throws Exception
{
super.setUp();
- if (to.exists())
+ if ( to.exists() )
{
FileUtils.forceDelete( to );
}
@@ -67,7 +67,7 @@
assertEquals( "${pom.version}", properties.getProperty( "version" ) );
}
-
+
public void testOverwriteFile()
throws Exception
{
@@ -89,15 +89,16 @@
Properties properties = PropertyUtils.loadPropertyFile( to, null );
assertEquals( "older file", properties.getProperty( "version" ) );
- }
-
- public void testNullSafeDefaultFilterWrappers() throws Exception
+ }
+
+ public void testNullSafeDefaultFilterWrappers()
+ throws Exception
{
- MavenFileFilter mavenFileFilter = (MavenFileFilter) lookup( MavenFileFilter.class.getName(), "default" );
-
- mavenFileFilter.getDefaultFilterWrappers(null, null, false, null, null);
-
- //shouldn't fail
+ MavenFileFilter mavenFileFilter = (MavenFileFilter) lookup( MavenFileFilter.class.getName(), "default" );
+
+ mavenFileFilter.getDefaultFilterWrappers( null, null, false, null, null );
+
+ // shouldn't fail
}
}
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java?rev=798322&r1=798321&r2=798322&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java Mon Jul 27 22:55:09 2009
@@ -69,8 +69,8 @@
projectProperties.put( "foo", "bar" );
projectProperties.put( "java.version", "zloug" );
mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
@@ -106,8 +106,8 @@
projectProperties.put( "foo", "bar" );
projectProperties.put( "java.version", "zloug" );
mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
@@ -123,10 +123,9 @@
+ "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
List nonFilteredFileExtensions = Collections.singletonList( "gif" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", filtersFile,
- nonFilteredFileExtensions,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ nonFilteredFileExtensions, new StubMavenSession() );
mavenResourcesExecution.setEscapeString( "\\" );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
assertFiltering( baseDir, initialImageFile, true );
@@ -172,15 +171,15 @@
assertEquals( "${}", result.getProperty( "emptyexpression2" ) );
assertEquals( System.getProperty( "user.dir" ), result.getProperty( "userDir" ) );
String userDir = result.getProperty( "userDir" );
- assertTrue( new File ( userDir ).exists() );
- assertEquals( new File ( System.getProperty( "user.dir" ) ), new File ( userDir ));
+ assertTrue( new File( userDir ).exists() );
+ assertEquals( new File( System.getProperty( "user.dir" ) ), new File( userDir ) );
assertEquals( System.getProperty( "java.version" ), result.getProperty( "javaVersion" ) );
String userHome = result.getProperty( "userHome" );
-
- assertTrue( new File ( userHome ).exists() );
- assertEquals( new File ( System.getProperty( "user.home" ) ), new File ( userHome ));
-
+
+ assertTrue( new File( userHome ).exists() );
+ assertEquals( new File( System.getProperty( "user.home" ) ), new File( userHome ) );
+
if ( escapeTest )
{
assertEquals( "${java.version}", result.getProperty( "escapeJavaVersion" ) );
@@ -191,7 +190,7 @@
File imageFile = new File( outputDirectory, "happy_duke.gif" );
assertTrue( imageFile.exists() );
- //assertEquals( initialImageFile.length(), imageFile.length() );
+ // assertEquals( initialImageFile.length(), imageFile.length() );
assertTrue( filesAreIdentical( initialImageFile, imageFile ) );
}
@@ -208,8 +207,8 @@
projectProperties.put( "foo", "bar" );
projectProperties.put( "java.version", "zloug" );
mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
@@ -226,16 +225,15 @@
List nonFilteredFileExtensions = Collections.singletonList( "gif" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", null,
- nonFilteredFileExtensions,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", null,
+ nonFilteredFileExtensions, new StubMavenSession() );
mavenResourcesExecution.addFilerWrapperWithEscaping( new MavenProjectValueSource( mavenProject, true ), "@",
"@", null );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
- Properties result = PropertyUtils
- .loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
+ Properties result =
+ PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
assertFalse( result.isEmpty() );
assertEquals( mavenProject.getName(), result.get( "pomName" ) );
assertFiltering( baseDir, initialImageFile, false );
@@ -248,8 +246,8 @@
mavenProject.setVersion( "1.0" );
mavenProject.setGroupId( "org.apache" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
@@ -264,8 +262,8 @@
Collections.EMPTY_LIST, new StubMavenSession() );
assertEquals( 7, outputDirectory.listFiles().length );
- Properties result = PropertyUtils.loadPropertyFile( new File( outputDirectory,
- "empty-maven-resources-filtering.txt" ), null );
+ Properties result =
+ PropertyUtils.loadPropertyFile( new File( outputDirectory, "empty-maven-resources-filtering.txt" ), null );
assertTrue( result.isEmpty() );
result = PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
@@ -326,8 +324,8 @@
mavenProject.setGroupId( "org.apache" );
mavenProject.setName( "test project" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
@@ -342,10 +340,9 @@
filtersFile.add( getBasedir()
+ "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", filtersFile,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = outputDirectory.listFiles();
@@ -363,8 +360,8 @@
mavenProject.setGroupId( "org.apache" );
mavenProject.setName( "test project" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
@@ -380,10 +377,9 @@
filtersFile.add( getBasedir()
+ "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", filtersFile,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = outputDirectory.listFiles();
@@ -405,8 +401,8 @@
mavenProject.setGroupId( "org.apache" );
mavenProject.setName( "test project" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
@@ -422,10 +418,9 @@
filtersFile.add( getBasedir()
+ "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", filtersFile,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = outputDirectory.listFiles();
@@ -442,7 +437,7 @@
File excludeDir = new File( outputDirectory, "excludedir" );
assertFalse( excludeDir.exists() );
}
-
+
public void testTargetAbsolutePath()
throws Exception
{
@@ -452,8 +447,8 @@
mavenProject.setGroupId( "org.apache" );
mavenProject.setName( "test project" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
@@ -467,7 +462,7 @@
String targetPath = getBasedir() + "/target/testAbsolutePath/";
File targetPathFile = new File( targetPath );
resource.setTargetPath( targetPathFile.getAbsolutePath() );
-
+
if ( !targetPathFile.exists() )
{
targetPathFile.mkdirs();
@@ -480,16 +475,15 @@
filtersFile.add( getBasedir()
+ "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", filtersFile,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
+
File[] files = targetPathFile.listFiles();
assertEquals( 1, files.length );
assertEquals( "includefile.txt", files[0].getName() );
- }
+ }
public void testTargetPath()
throws Exception
@@ -500,8 +494,8 @@
mavenProject.setGroupId( "org.apache" );
mavenProject.setName( "test project" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
@@ -516,10 +510,9 @@
filtersFile.add( getBasedir()
+ "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", filtersFile,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File targetPathFile = new File( outputDirectory, "testTargetPath" );
@@ -527,7 +520,7 @@
File[] files = targetPathFile.listFiles();
assertEquals( 1, files.length );
assertEquals( "includefile.txt", files[0].getName() );
- }
+ }
public void testEmptyDirectories()
throws Exception
@@ -538,9 +531,8 @@
mavenProject.setGroupId( "org.apache" );
mavenProject.setName( "test project" );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
-
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
List resources = new ArrayList();
resources.add( new Resource()
@@ -549,16 +541,15 @@
setDirectory( getBasedir() + "/src/test/units-files/includeEmptyDirs" );
}
} );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8", Collections.EMPTY_LIST,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", Collections.EMPTY_LIST,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesExecution.setIncludeEmptyDirs( true );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
+
File[] childs = outputDirectory.listFiles();
assertEquals( 3, childs.length );
-
+
for ( int i = 0, size = childs.length; i < size; i++ )
{
File file = childs[i];
@@ -586,8 +577,8 @@
fail( "unknow child file found " + file.getName() );
}
}
- }
-
+ }
+
/**
* unit test for MSHARED-81 : http://jira.codehaus.org/browse/MSHARED-81
*/
@@ -595,16 +586,16 @@
throws Exception
{
StubMavenProject mavenProject = new StubMavenProject( new File( "/foo/bar" ) );
-
+
mavenProject.setVersion( "1.0" );
- mavenProject.addProperty( "escaped","this is escaped");
- mavenProject.addProperty( "escaped.at","this is escaped.at");
- mavenProject.addProperty( "foo","this is foo");
- mavenProject.addProperty( "bar","this is bar");
-
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ mavenProject.addProperty( "escaped", "this is escaped" );
+ mavenProject.addProperty( "escaped.at", "this is escaped.at" );
+ mavenProject.addProperty( "foo", "this is foo" );
+ mavenProject.addProperty( "bar", "this is bar" );
+
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
List resources = new ArrayList();
resources.add( new Resource()
@@ -622,28 +613,29 @@
}
} );
File output = new File( outputDirectory, "MSHARED-81" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, output, mavenProject,
- "UTF-8", Collections.EMPTY_LIST,
- Collections.EMPTY_LIST,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.EMPTY_LIST,
+ Collections.EMPTY_LIST, new StubMavenSession() );
mavenResourcesExecution.setIncludeEmptyDirs( true );
mavenResourcesExecution.setEscapeString( "\\" );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null );
- Properties expectedFilteredResult = PropertyUtils.loadPropertyFile( new File( getBasedir()
- + "/src/test/units-files/MSHARED-81", "expected-filtered.properties" ), null );
+ Properties expectedFilteredResult =
+ PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81",
+ "expected-filtered.properties" ), null );
assertTrue( filteredResult.equals( expectedFilteredResult ) );
- Properties nonFilteredResult = PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ),
- null );
+ Properties nonFilteredResult =
+ PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null );
- Properties expectedNonFilteredResult = PropertyUtils.loadPropertyFile( new File( getBasedir()
- + "/src/test/units-files/MSHARED-81/resources", "unfiltered.properties" ), null );
+ Properties expectedNonFilteredResult =
+ PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81/resources",
+ "unfiltered.properties" ), null );
assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) );
- }
+ }
}
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java?rev=798322&r1=798321&r2=798322&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java Mon Jul 27 22:55:09 2009
@@ -56,7 +56,7 @@
assertTime( "notime", "file01.txt" );
assertTime( "time", "file02.txt" ); // this one is unchanged
- assertTrue( ctx.getRefreshFiles().contains( new File(outputDirectory, "file01.txt") ) );
+ assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
// one file is expected to be deleted
HashSet deletedFiles = new HashSet();
@@ -69,7 +69,7 @@
assertFalse( new File( outputDirectory, "file01.txt" ).exists() );
assertTime( "time", "file02.txt" ); // this one is unchanged
- assertTrue( ctx.getRefreshFiles().contains( new File(outputDirectory, "file01.txt") ) );
+ assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
}
@@ -79,7 +79,7 @@
// run full build first
filter( "time" );
- // all files are reprocessed after content of filters changes
+ // all files are reprocessed after content of filters changes
HashSet changedFiles = new HashSet();
changedFiles.add( "filters.txt" );
TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, changedFiles, new HashMap() );
@@ -89,9 +89,9 @@
assertTime( "notime", "file01.txt" );
assertTime( "notime", "file02.txt" );
- assertTrue( ctx.getRefreshFiles().contains( new File(outputDirectory, "file01.txt") ) );
- assertTrue( ctx.getRefreshFiles().contains( new File(outputDirectory, "file02.txt") ) );
-
+ assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
+ assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
+
}
public void testFilterDeleted()
@@ -100,18 +100,19 @@
// run full build first
filter( "time" );
- // all files are reprocessed after content of filters changes
+ // all files are reprocessed after content of filters changes
HashSet deletedFiles = new HashSet();
deletedFiles.add( "filters.txt" );
- TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, new HashSet(), deletedFiles, new HashMap() );
+ TestIncrementalBuildContext ctx =
+ new TestIncrementalBuildContext( unitDirectory, new HashSet(), deletedFiles, new HashMap() );
ThreadBuildContext.setThreadBuildContext( ctx );
filter( "notime" );
assertTime( "notime", "file01.txt" );
assertTime( "notime", "file02.txt" );
- assertTrue( ctx.getRefreshFiles().contains( new File(outputDirectory, "file01.txt") ) );
- assertTrue( ctx.getRefreshFiles().contains( new File(outputDirectory, "file02.txt") ) );
+ assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
+ assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
}
private void assertTime( String time, String relpath )
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java?rev=798322&r1=798321&r2=798322&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java Mon Jul 27 22:55:09 2009
@@ -34,8 +34,6 @@
extends PlexusTestCase
{
private static File testDirectory = new File( getBasedir(), "target/test-classes/" );
-
-
public void testBasic()
throws Exception
@@ -99,7 +97,7 @@
// exception ok
}
}
-
+
public void testloadpropertiesFile()
throws Exception
{
@@ -112,5 +110,5 @@
assertEquals( "${foo}", interpolated.get( "foo" ) );
assertEquals( "realVersion", interpolated.get( "bar" ) );
assertEquals( "none filtered", interpolated.get( "none" ) );
- }
+ }
}