Author: rfscholte
Date: Thu May 5 10:43:28 2016
New Revision: 1742402
URL: http://svn.apache.org/viewvc?rev=1742402&view=rev
Log:
When role-hint is automatically set to default, the current PlexusContainer
generates a new instance on lookup. This is only an issue during testing where
we want to manipulate components, so use Whitebox to access fields
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java?rev=1742402&r1=1742401&r2=1742402&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
Thu May 5 10:43:28 2016
@@ -41,7 +41,7 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
-import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
+import org.mockito.internal.util.reflection.Whitebox;
/**
* Base class with tests for rewriting POMs with edit mode.
@@ -74,7 +74,7 @@ public abstract class AbstractEditModeRe
ScmManagerStub scmManager = new ScmManagerStub();
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManager );
ScmProviderStub providerStub = (ScmProviderStub)
scmManager.getProviderByUrl( config.getScmSourceUrl() );
@@ -106,7 +106,7 @@ public abstract class AbstractEditModeRe
ScmManagerStub scmManager = new ScmManagerStub();
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManager );
scmManager.setScmProvider( scmProviderMock );
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=1742402&r1=1742401&r2=1742402&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
Thu May 5 10:43:28 2016
@@ -43,6 +43,7 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.mockito.internal.util.reflection.Whitebox;
/**
* Base class with tests for rewriting POMs.
@@ -489,7 +490,7 @@ public abstract class AbstractRewritingR
when( scmManagerMock.makeScmRepository( config.getScmSourceUrl() )
).thenThrow( new ScmRepositoryException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
try
@@ -520,7 +521,7 @@ public abstract class AbstractRewritingR
when( scmManagerMock.makeScmRepository( config.getScmSourceUrl() )
).thenThrow( new NoSuchScmProviderException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java?rev=1742402&r1=1742401&r2=1742402&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
Thu May 5 10:43:28 2016
@@ -53,9 +53,9 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.stubs.ScmManagerStub;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.mockito.internal.util.reflection.Whitebox;
/**
* Test the SCM branch phase.
@@ -306,7 +306,7 @@ public class ScmBranchPhaseTest
when( scmManagerMock.makeScmRepository( "scm-url" ) ).thenThrow( new
NoSuchScmProviderException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
@@ -336,7 +336,7 @@ public class ScmBranchPhaseTest
ScmManager scmManagerMock = mock( ScmManager.class );
when( scmManagerMock.makeScmRepository( "scm-url" ) ).thenThrow( new
ScmRepositoryException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java?rev=1742402&r1=1742401&r2=1742402&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
Thu May 5 10:43:28 2016
@@ -53,8 +53,8 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.codehaus.plexus.PlexusTestCase;
+import org.mockito.internal.util.reflection.Whitebox;
/**
* Test the SCM modification check phase.
@@ -86,7 +86,7 @@ public class ScmCheckModificationsPhaseT
when( scmManagerMock.makeScmRepository( eq( "scm-url" ) ) ).thenThrow(
new NoSuchScmProviderException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
@@ -129,7 +129,7 @@ public class ScmCheckModificationsPhaseT
when( scmManagerMock.makeScmRepository( eq( "scm-url" ) ) ).thenThrow(
new ScmRepositoryException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java?rev=1742402&r1=1742401&r2=1742402&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
Thu May 5 10:43:28 2016
@@ -55,8 +55,8 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.mockito.internal.util.reflection.Whitebox;
/**
* Test the release or branch preparation SCM commit phase.
@@ -301,8 +301,8 @@ public class ScmCommitPreparationPhaseTe
ScmManager scmManagerMock = mock( ScmManager.class );
when( scmManagerMock.makeScmRepository( "scm-url" ) ).thenThrow( new
NoSuchScmProviderException( "..." ) );
- DefaultScmRepositoryConfigurator configurator =
(DefaultScmRepositoryConfigurator) lookup(
- ScmRepositoryConfigurator.ROLE );
+ DefaultScmRepositoryConfigurator configurator =
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
@@ -332,8 +332,8 @@ public class ScmCommitPreparationPhaseTe
ScmManager scmManagerMock = mock( ScmManager.class );
when( scmManagerMock.makeScmRepository( "scm-url" ) ).thenThrow( new
ScmRepositoryException( "..." ) );
- DefaultScmRepositoryConfigurator configurator =
(DefaultScmRepositoryConfigurator) lookup(
- ScmRepositoryConfigurator.ROLE );
+ DefaultScmRepositoryConfigurator configurator =
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java?rev=1742402&r1=1742401&r2=1742402&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Thu May 5 10:43:28 2016
@@ -53,9 +53,9 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.stubs.ScmManagerStub;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.mockito.internal.util.reflection.Whitebox;
/**
* Test the SCM tag phase.
@@ -306,7 +306,7 @@ public class ScmTagPhaseTest
when( scmManagerMock.makeScmRepository( "scm-url" ) ).thenThrow( new
NoSuchScmProviderException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
@@ -336,7 +336,7 @@ public class ScmTagPhaseTest
ScmManager scmManagerMock = mock( ScmManager.class );
when( scmManagerMock.makeScmRepository( "scm-url" ) ).thenThrow( new
ScmRepositoryException( "..." ) );
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup(
ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) Whitebox.getInternalState(
phase, "scmRepositoryConfigurator" );
configurator.setScmManager( scmManagerMock );
// execute
