This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MRELEASE-998 in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit bc5843bbfc1618372aae185c3831b6f45030bc02 Author: rfscholte <rfscho...@apache.org> AuthorDate: Sat Feb 10 15:21:40 2018 +0100 Improve tests --- .../PropertiesReleaseDescriptorStoreTest.java | 38 ++-- .../shared/release/config/ReleaseUtilsTest.java | 222 ++++++++++----------- 2 files changed, 121 insertions(+), 139 deletions(-) diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java index 3bce7c3..ebe2462 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java @@ -45,7 +45,7 @@ public class PropertiesReleaseDescriptorStoreTest { super.setUp(); store = (PropertiesReleaseDescriptorStore) lookup( ReleaseDescriptorStore.class, "properties" ); - secDispatcher = (SecDispatcher) lookup( SecDispatcher.class, "mng-4384" ); + secDispatcher = lookup( SecDispatcher.class, "mng-4384" ); } public void testReadFromFile() @@ -67,10 +67,10 @@ public class PropertiesReleaseDescriptorStoreTest builder.setWorkingDirectory( AbstractReleaseTestCase.getPath( getTestFile( "target/test-classes" ) ) ); ReleaseDescriptor config = store.read( builder ).build(); - ReleaseDescriptor expected = createExpectedReleaseConfiguration().build(); + ReleaseDescriptorBuilder expected = createExpectedReleaseConfiguration(); expected.setWorkingDirectory( builder.build().getWorkingDirectory() ); - assertEquals( "check matches", expected, config ); + assertEquals( "check matches", expected.build(), config ); } public void testReadFromEmptyFile() @@ -128,8 +128,8 @@ public class PropertiesReleaseDescriptorStoreTest ReleaseDescriptor rereadDescriptor = store.read( file ).build(); - assertAndAdjustScmPassword( config.build(), rereadDescriptor ); - assertAndAdjustScmPrivateKeyPassPhrase( config.build(), rereadDescriptor ); + assertAndAdjustScmPassword( config, rereadDescriptor ); + assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor ); assertEquals( "compare configuration", config.build(), rereadDescriptor ); } @@ -147,13 +147,13 @@ public class PropertiesReleaseDescriptorStoreTest store.write( config.build() ); - ReleaseDescriptor rereadDescriptor = store.read( file ).build(); - rereadDescriptor.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) ); + ReleaseDescriptorBuilder rereadDescriptorBuilder = store.read( file ); + rereadDescriptorBuilder.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) ); - assertAndAdjustScmPassword( config.build(), rereadDescriptor ); - assertAndAdjustScmPrivateKeyPassPhrase( config.build(), rereadDescriptor ); + assertAndAdjustScmPassword( config, rereadDescriptorBuilder.build() ); + assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptorBuilder.build() ); - assertEquals( "compare configuration", config.build(), rereadDescriptor ); + assertEquals( "compare configuration", config.build(), rereadDescriptorBuilder.build() ); } public void testWriteToNewFileRequiredOnly() @@ -224,7 +224,7 @@ public class PropertiesReleaseDescriptorStoreTest ReleaseDescriptor rereadDescriptor = store.read( file ).build(); assertNull( "check null scm is mapped correctly", - rereadDescriptor.getOriginalScmInfo().get( "group.id:artifact.id" ) ); + rereadDescriptor.getOriginalScmInfo( "group.id:artifact.id" ) ); assertEquals( "compare configuration", builder.build(), rereadDescriptor ); } @@ -241,8 +241,8 @@ public class PropertiesReleaseDescriptorStoreTest ReleaseDescriptor rereadDescriptor = store.read( file ).build(); - assertAndAdjustScmPassword( config.build(), rereadDescriptor ); - assertAndAdjustScmPrivateKeyPassPhrase( config.build(), rereadDescriptor ); + assertAndAdjustScmPassword( config, rereadDescriptor ); + assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor ); assertEquals( "compare configuration", config.build(), rereadDescriptor ); } @@ -363,10 +363,10 @@ public class PropertiesReleaseDescriptorStoreTest return releaseDescriptor; } - private void assertAndAdjustScmPassword( ReleaseDescriptor expected, ReleaseDescriptor original ) + private void assertAndAdjustScmPassword( ReleaseDescriptorBuilder expected, ReleaseDescriptor original ) throws Exception { - String expectedPassword = expected.getScmPassword(); + String expectedPassword = expected.build().getScmPassword(); String originalPassword = original.getScmPassword(); // encrypting the same password twice doesn't have to be the same result @@ -376,13 +376,13 @@ public class PropertiesReleaseDescriptorStoreTest expected.setScmPassword( originalPassword ); } - assertEquals( expected.getScmPassword(), original.getScmPassword() ); + assertEquals( expected.build().getScmPassword(), original.getScmPassword() ); } - private void assertAndAdjustScmPrivateKeyPassPhrase( ReleaseDescriptor expected, ReleaseDescriptor original ) + private void assertAndAdjustScmPrivateKeyPassPhrase( ReleaseDescriptorBuilder expected, ReleaseDescriptor original ) throws Exception { - String expectedPassPhrase = expected.getScmPrivateKeyPassPhrase(); + String expectedPassPhrase = expected.build().getScmPrivateKeyPassPhrase(); String originalPassPhrase = original.getScmPrivateKeyPassPhrase(); // encrypting the same passphrase twice doesn't have to be the same result @@ -392,7 +392,7 @@ public class PropertiesReleaseDescriptorStoreTest expected.setScmPrivateKeyPassPhrase( originalPassPhrase ); } - assertEquals( expected.getScmPrivateKeyPassPhrase(), original.getScmPrivateKeyPassPhrase() ); + assertEquals( expected.build().getScmPrivateKeyPassPhrase(), original.getScmPrivateKeyPassPhrase() ); } private ReleaseDescriptorBuilder createExpectedReleaseConfiguration() diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java index e7d35d9..659ace0 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java @@ -40,159 +40,159 @@ public class ReleaseUtilsTest public void testEquals() throws IOException { - ReleaseDescriptor originalReleaseDescriptor = createReleaseDescriptor().build(); - ReleaseDescriptor releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor ).build(); - doEqualsAssertions( releaseDescriptor, originalReleaseDescriptor, "other", new File( "f" ) ); - originalReleaseDescriptor = createReleaseDescriptor().build(); - releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor ).build(); - doEqualsAssertions( originalReleaseDescriptor, releaseDescriptor, "other", new File( "f" ) ); - - originalReleaseDescriptor = createReleaseDescriptor().build(); - releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor ).build(); - doEqualsAssertions( releaseDescriptor, originalReleaseDescriptor, null, null ); - originalReleaseDescriptor = createReleaseDescriptor().build(); - releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor ).build(); - doEqualsAssertions( originalReleaseDescriptor, releaseDescriptor, null, null ); - - assertEquals( "test ==", releaseDescriptor, releaseDescriptor ); + ReleaseDescriptorBuilder originalReleaseDescriptor = createReleaseDescriptor(); + ReleaseDescriptorBuilder builder = copyReleaseDescriptor( originalReleaseDescriptor.build() ); + doEqualsAssertions( builder, originalReleaseDescriptor, "other", new File( "f" ) ); + originalReleaseDescriptor = createReleaseDescriptor(); + builder = copyReleaseDescriptor( originalReleaseDescriptor.build() ); + doEqualsAssertions( originalReleaseDescriptor, builder, "other", new File( "f" ) ); + + originalReleaseDescriptor = createReleaseDescriptor(); + builder = copyReleaseDescriptor( originalReleaseDescriptor.build() ); + doEqualsAssertions( builder, originalReleaseDescriptor, null, null ); + originalReleaseDescriptor = createReleaseDescriptor(); + builder = copyReleaseDescriptor( originalReleaseDescriptor.build() ); + doEqualsAssertions( originalReleaseDescriptor, builder, null, null ); + + assertEquals( "test ==", builder, builder ); Object obj = this; - assertFalse( "test class instance", releaseDescriptor.equals( obj ) ); + assertFalse( "test class instance", builder.equals( obj ) ); } - private static void doEqualsAssertions( ReleaseDescriptor releaseDescriptor, - ReleaseDescriptor originalReleaseDescriptor, String other, File otherFile ) + private static void doEqualsAssertions( ReleaseDescriptorBuilder releaseDescriptor, + ReleaseDescriptorBuilder originalReleaseDescriptor, String other, File otherFile ) throws IOException { - ReleaseDescriptor origConfig = originalReleaseDescriptor; - ReleaseDescriptor config = releaseDescriptor; - assertEquals( "Check original comparison", config, origConfig ); + ReleaseDescriptor origConfig = originalReleaseDescriptor.build(); + ReleaseDescriptorBuilder configBuilder = releaseDescriptor; + assertEquals( "Check original comparison", configBuilder.build(), origConfig ); - config.setScmSourceUrl( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmSourceUrl( origConfig.getScmSourceUrl() ); + configBuilder.setScmSourceUrl( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmSourceUrl( origConfig.getScmSourceUrl() ); - config.setAdditionalArguments( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setAdditionalArguments( origConfig.getAdditionalArguments() ); + configBuilder.setAdditionalArguments( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setAdditionalArguments( origConfig.getAdditionalArguments() ); - config.setAddSchema( !origConfig.isAddSchema() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setAddSchema( origConfig.isAddSchema() ); + configBuilder.setAddSchema( !origConfig.isAddSchema() ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setAddSchema( origConfig.isAddSchema() ); - config.setGenerateReleasePoms( !origConfig.isAddSchema() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setGenerateReleasePoms( origConfig.isGenerateReleasePoms() ); + configBuilder.setGenerateReleasePoms( !origConfig.isAddSchema() ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setGenerateReleasePoms( origConfig.isGenerateReleasePoms() ); - config.setScmUseEditMode( !origConfig.isScmUseEditMode() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmUseEditMode( origConfig.isScmUseEditMode() ); + configBuilder.setScmUseEditMode( !origConfig.isScmUseEditMode() ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmUseEditMode( origConfig.isScmUseEditMode() ); - config.setInteractive( !origConfig.isInteractive() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setInteractive( origConfig.isInteractive() ); + configBuilder.setInteractive( !origConfig.isInteractive() ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setInteractive( origConfig.isInteractive() ); - config.setCommitByProject( !origConfig.isCommitByProject() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setCommitByProject( origConfig.isCommitByProject() ); + configBuilder.setCommitByProject( !origConfig.isCommitByProject() ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setCommitByProject( origConfig.isCommitByProject() ); - config.setCompletedPhase( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setCompletedPhase( origConfig.getCompletedPhase() ); + configBuilder.setCompletedPhase( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setCompletedPhase( origConfig.getCompletedPhase() ); - config.setScmPrivateKeyPassPhrase( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmPrivateKeyPassPhrase( origConfig.getScmPrivateKeyPassPhrase() ); + configBuilder.setScmPrivateKeyPassPhrase( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmPrivateKeyPassPhrase( origConfig.getScmPrivateKeyPassPhrase() ); - config.setScmPassword( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmPassword( origConfig.getScmPassword() ); + configBuilder.setScmPassword( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmPassword( origConfig.getScmPassword() ); - config.setScmUsername( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmUsername( origConfig.getScmUsername() ); + configBuilder.setScmUsername( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmUsername( origConfig.getScmUsername() ); - config.setScmPrivateKey( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmPrivateKey( origConfig.getScmPrivateKey() ); + configBuilder.setScmPrivateKey( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmPrivateKey( origConfig.getScmPrivateKey() ); - config.setPomFileName( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setPomFileName( origConfig.getPomFileName() ); + configBuilder.setPomFileName( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setPomFileName( origConfig.getPomFileName() ); - config.setPreparationGoals( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setPreparationGoals( origConfig.getPreparationGoals() ); + configBuilder.setPreparationGoals( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setPreparationGoals( origConfig.getPreparationGoals() ); - config.setScmReleaseLabel( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmReleaseLabel( origConfig.getScmReleaseLabel() ); + configBuilder.setScmReleaseLabel( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmReleaseLabel( origConfig.getScmReleaseLabel() ); - config.setScmTagBase( other ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config.setScmTagBase( origConfig.getScmTagBase() ); + configBuilder.setScmTagBase( other ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder.setScmTagBase( origConfig.getScmTagBase() ); if ( otherFile != null ) { - config.setWorkingDirectory( AbstractReleaseTestCase.getPath( otherFile ) ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); + configBuilder.setWorkingDirectory( AbstractReleaseTestCase.getPath( otherFile ) ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); } - config.setWorkingDirectory( origConfig.getWorkingDirectory() ); + configBuilder.setWorkingDirectory( origConfig.getWorkingDirectory() ); // sanity check the test was resetting correctly - assertEquals( "Check original comparison", config, origConfig ); + assertEquals( "Check original comparison", configBuilder.build(), origConfig ); - config.addDevelopmentVersion( "groupId:artifactId", "1.0-SNAPSHOT" ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder.addDevelopmentVersion( "groupId:artifactId", "1.0-SNAPSHOT" ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addReleaseVersion( "groupId:artifactId", "1.0" ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder.addReleaseVersion( "groupId:artifactId", "1.0" ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", new Scm() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder.addOriginalScmInfo( "groupId:artifactId", new Scm() ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", new Scm() ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", new Scm() ); origConfig.addOriginalScmInfo( "foo", new Scm() ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); origConfig = createReleaseDescriptor().build(); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", new Scm() ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", new Scm() ); origConfig.addOriginalScmInfo( "groupId:artifactId", new Scm() ); - assertEquals( "Check original comparison", config, origConfig ); + assertEquals( "Check original comparison", configBuilder.build(), origConfig ); origConfig = createReleaseDescriptor().build(); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); origConfig.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); - assertEquals( "Check original comparison", config, origConfig ); + assertEquals( "Check original comparison", configBuilder.build(), origConfig ); origConfig = createReleaseDescriptor().build(); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", getScm( "-", "dev", "url", "tag" ) ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", getScm( "-", "dev", "url", "tag" ) ); origConfig.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); origConfig = createReleaseDescriptor().build(); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "-", "url", "tag" ) ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "-", "url", "tag" ) ); origConfig.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); origConfig = createReleaseDescriptor().build(); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "-", "tag" ) ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "-", "tag" ) ); origConfig.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); origConfig = createReleaseDescriptor().build(); - config = copyReleaseDescriptor( origConfig ).build(); + configBuilder = copyReleaseDescriptor( origConfig ); - config.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "-" ) ); + configBuilder.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "-" ) ); origConfig.addOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) ); - assertFalse( "Check original comparison", config.equals( origConfig ) ); + assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) ); } public void testHashCode() @@ -259,24 +259,6 @@ public class ReleaseUtilsTest return scm; } - private static ReleaseDescriptorBuilder createMergeDescriptor( String workingDirectory, String completedPhase ) - { - ReleaseDescriptorBuilder mergeDescriptor = new ReleaseDescriptorBuilder(); - mergeDescriptor.setScmSourceUrl( "scm-url-merge" ); - mergeDescriptor.setCompletedPhase( completedPhase ); - mergeDescriptor.setScmPrivateKeyPassPhrase( "passphrase-merge" ); - mergeDescriptor.setScmPassword( "password-merge" ); - mergeDescriptor.setScmPrivateKey( "private-key-merge" ); - mergeDescriptor.setScmTagBase( "tag-base-merge" ); - mergeDescriptor.setScmReleaseLabel( "tag-merge" ); - mergeDescriptor.setScmUsername( "username-merge" ); - mergeDescriptor.setAdditionalArguments( "additional-arguments-merge" ); - mergeDescriptor.setPomFileName( "pom-file-name-merge" ); - mergeDescriptor.setPreparationGoals( "preparation-goals-merge" ); - mergeDescriptor.setWorkingDirectory( workingDirectory ); - return mergeDescriptor; - } - private static ReleaseDescriptorBuilder createReleaseDescriptor() throws IOException { -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.