Author: olamy
Date: Tue Jun 14 21:46:04 2011
New Revision: 1135814
URL: http://svn.apache.org/viewvc?rev=1135814&view=rev
Log:
fix junit BrowseActionTest and RepositoriesActionTest
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java?rev=1135814&r1=1135813&r2=1135814&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
Tue Jun 14 21:46:04 2011
@@ -107,8 +107,7 @@ public abstract class AbstractActionTest
protected void setObservableRepos( List<String> repoIds )
{
- //(UserRepositoriesStub) lookup( UserRepositories.class );
- UserRepositoriesStub repos = applicationContext.getBean(
"userRepositories#test", UserRepositoriesStub.class );
+ UserRepositoriesStub repos = applicationContext.getBean(
"userRepositories", UserRepositoriesStub.class );
repos.setObservableRepositoryIds( repoIds );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java?rev=1135814&r1=1135813&r2=1135814&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
Tue Jun 14 21:46:04 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.web.act
* under the License.
*/
+import com.google.common.collect.Lists;
import com.opensymphony.xwork2.Action;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.repository.RepositorySession;
@@ -390,6 +391,7 @@ public class BrowseActionTest
throws Exception
{
super.setUp();
+ setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
//action = (BrowseAction) lookup( Action.class, ACTION_HINT );
action = (BrowseAction) getActionProxy( "/browse.action" ).getAction();
metadataResolver = new TestMetadataResolver();
@@ -399,4 +401,11 @@ public class BrowseActionTest
applicationContext.getBean( "repositorySessionFactory#test",
TestRepositorySessionFactory.class );
factory.setRepositorySession( repositorySession );
}
+
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+ setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
+ }
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java?rev=1135814&r1=1135813&r2=1135814&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
Tue Jun 14 21:46:04 2011
@@ -50,7 +50,7 @@ public class RepositoriesActionTest
super.setUp();
//action = (RepositoriesAction) lookup( Action.class.getName(),
"repositoriesAction" );
- action = (RepositoriesAction) getActionProxy( "/admin/index.action"
).getAction();
+ action = (RepositoriesAction) getActionProxy( "/admin/index.action"
).getAction();
}
@@ -67,20 +67,20 @@ public class RepositoriesActionTest
MetadataRepository metadataRepository = (MetadataRepository)
control.getMock();
control.expectAndReturn( metadataRepository.getMetadataFacets(
"internal", RepositoryStatistics.FACET_ID ),
Arrays.asList( "20091125.123456.678" ) );
- control.expectAndReturn( metadataRepository.getMetadataFacet(
"internal", RepositoryStatistics.FACET_ID,
-
"20091125.123456.678" ),
- new RepositoryStatistics() );
+ control.expectAndReturn(
+ metadataRepository.getMetadataFacet( "internal",
RepositoryStatistics.FACET_ID, "20091125.123456.678" ),
+ new RepositoryStatistics() );
control.expectAndReturn( metadataRepository.getMetadataFacets(
"snapshots", RepositoryStatistics.FACET_ID ),
Arrays.asList( "20091112.012345.012" ) );
- control.expectAndReturn( metadataRepository.getMetadataFacet(
"snapshots", RepositoryStatistics.FACET_ID,
-
"20091112.012345.012" ),
- new RepositoryStatistics() );
+ control.expectAndReturn(
+ metadataRepository.getMetadataFacet( "snapshots",
RepositoryStatistics.FACET_ID, "20091112.012345.012" ),
+ new RepositoryStatistics() );
control.replay();
RepositorySession session = mock( RepositorySession.class );
when( session.getRepository() ).thenReturn( metadataRepository );
- //TestRepositorySessionFactory factory =
(TestRepositorySessionFactory) lookup( RepositorySessionFactory.class );
- TestRepositorySessionFactory factory = new
TestRepositorySessionFactory();
+ TestRepositorySessionFactory factory =
+ applicationContext.getBean( "repositorySessionFactory#test",
TestRepositorySessionFactory.class );
factory.setRepositorySession( session );
ServletRunner sr = new ServletRunner();
