@@ -10,52 +10,65 @@ public class OtherBranchIT extends AbstractIntegrationTest {
1010 @ Test
1111 public void featureSnapshotSemVer () throws Exception {
1212 Verifier verifier = createVerifier ("/project-stub" , "origin/feature/poc/my-feature-branch" , "5.0.0-SNAPSHOT" );
13- verifier .executeGoal ("deploy" );
13+ try {
14+ verifier .executeGoal ("deploy" );
1415
15- verifier .verifyTextInLog ("Artifact versions updated with semVer build metadata: +origin-feature-poc-my-feature-branch-SNAPSHOT" );
16- verifier .verifyErrorFreeLog ();
17- verifier .resetStreams ();
16+ verifier .verifyTextInLog ("Artifact versions updated with semVer build metadata: +origin-feature-poc-my-feature-branch-SNAPSHOT" );
17+ verifier .verifyErrorFreeLog ();
18+ } finally {
19+ verifier .resetStreams ();
20+ }
1821 }
1922
2023 @ Test
2124 public void featureSemVer () throws Exception {
2225 Verifier verifier = createVerifier ("/project-stub" , "origin/feature/poc/my-feature-branch.with.other.identifiers" , "5.0.1" );
23- verifier .executeGoal ("deploy" );
26+ try {
27+ verifier .executeGoal ("deploy" );
2428
25- verifier .verifyTextInLog ("Artifact versions updated with semVer build metadata: +origin-feature-poc-my-feature-branch.with.other.identifiers-SNAPSHOT" );
26- verifier .verifyErrorFreeLog ();
27- verifier .resetStreams ();
29+ verifier .verifyTextInLog ("Artifact versions updated with semVer build metadata: +origin-feature-poc-my-feature-branch.with.other.identifiers-SNAPSHOT" );
30+ verifier .verifyErrorFreeLog ();
31+ } finally {
32+ verifier .resetStreams ();
33+ }
2834 }
2935
3036 @ Test
3137 public void noOtherDeployMatch () throws Exception {
3238 Verifier verifier = createVerifier ("/project-stub" , "origin/feature/my-feature-branch" , "5.0.1-SNAPSHOT" );
33- verifier .executeGoal ("deploy" );
39+ try {
40+ verifier .executeGoal ("deploy" );
3441
35- verifier .verifyTextInLog ("Un-Setting artifact repositories." );
36- verifier .verifyErrorFreeLog ();
37- verifier .resetStreams ();
42+ verifier .verifyTextInLog ("Un-Setting artifact repositories." );
43+ verifier .verifyErrorFreeLog ();
44+ } finally {
45+ verifier .resetStreams ();
46+ }
3847 }
3948
4049 @ Test
4150 public void automagicVersionDependenciesResolve () throws Exception {
4251 // Create a -SNAPSHOT of the project-stub.
4352 Verifier verifier = createVerifier ("/project-stub" , "origin/feature/poc/long-running" , "2.0.0" );
53+ try {
54+ verifier .executeGoal ("deploy" );
4455
45- verifier .executeGoal ( "deploy " );
46-
47- verifier . verifyTextInLog ( "Artifact versions updated with semVer build metadata: +origin-feature-poc-long-running-SNAPSHOT" );
48- verifier .verifyErrorFreeLog ();
49- verifier . resetStreams ();
56+ verifier .verifyTextInLog ( "Artifact versions updated with semVer build metadata: +origin-feature-poc-long-running-SNAPSHOT " );
57+ verifier . verifyErrorFreeLog ();
58+ } finally {
59+ verifier .resetStreams ();
60+ }
5061
5162 // Create a -SNAPSHOT of the project-alt1-stub that depends upon the other project's automagic version.
5263 verifier = createVerifier ("/project-alt1-stub" , "origin/feature/poc/long-running" , "2.0.0" );
64+ try {
65+ verifier .getCliOptions ().add ("-Ddependency.stub.version=2.0.0+origin-feature-poc-long-running-SNAPSHOT" );
66+ verifier .getCliOptions ().add ("-Dplugin.stub.version=2.0.0+origin-feature-poc-long-running-SNAPSHOT" );
5367
54- verifier .getCliOptions ().add ("-Ddependency.stub.version=2.0.0+origin-feature-poc-long-running-SNAPSHOT" );
55- verifier .getCliOptions ().add ("-Dplugin.stub.version=2.0.0+origin-feature-poc-long-running-SNAPSHOT" );
56-
57- verifier .executeGoal ("deploy" );
58- verifier .verifyErrorFreeLog ();
59- verifier .resetStreams ();
68+ verifier .executeGoal ("deploy" );
69+ verifier .verifyErrorFreeLog ();
70+ } finally {
71+ verifier .resetStreams ();
72+ }
6073 }
6174}
0 commit comments