Author: olamy
Date: Wed Sep 28 21:33:56 2011
New Revision: 1177068
URL: http://svn.apache.org/viewvc?rev=1177068&view=rev
Log:
format : no code change
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java?rev=1177068&r1=1177067&r2=1177068&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java
Wed Sep 28 21:33:56 2011
@@ -48,9 +48,31 @@ public class BrowseActionTest
private static final String OTHER_TEST_REPO = "other-repo";
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
+ action = (BrowseAction) getActionProxy( "/browse.action" ).getAction();
+ metadataResolver = new TestMetadataResolver();
+ RepositorySession repositorySession = mock( RepositorySession.class );
+ when( repositorySession.getResolver() ).thenReturn( metadataResolver );
+ TestRepositorySessionFactory factory =
+ applicationContext.getBean( "repositorySessionFactory#test",
TestRepositorySessionFactory.class );
+ factory.setRepositorySession( repositorySession );
+ }
+
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+ applicationContext.getBean( DefaultDownloadRemoteIndexScheduler.class
).shutdown();
+ setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
+ }
+
public void testInstantiation()
{
- assertFalse( action == (BrowseAction) getActionProxy( "/browse.action"
).getAction() );
+ assertFalse( action == getActionProxy( "/browse.action" ).getAction()
);
}
public void testBrowse()
@@ -389,26 +411,5 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
- protected void setUp()
- 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();
- RepositorySession repositorySession = mock( RepositorySession.class );
- when( repositorySession.getResolver() ).thenReturn( metadataResolver );
- TestRepositorySessionFactory factory =
- applicationContext.getBean( "repositorySessionFactory#test",
TestRepositorySessionFactory.class );
- factory.setRepositorySession( repositorySession );
- }
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- applicationContext.getBean( DefaultDownloadRemoteIndexScheduler.class
).shutdown();
- setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
- }
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java?rev=1177068&r1=1177067&r2=1177068&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
Wed Sep 28 21:33:56 2011
@@ -91,8 +91,6 @@ public abstract class AbstractRepository
protected RemoteRepoInfo remoteSnapshots;
- protected RemoteRepoInfo remotePrivateSnapshots;
-
@Before
public void setUp()
throws Exception
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=1177068&r1=1177067&r2=1177068&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
Wed Sep 28 21:33:56 2011
@@ -52,7 +52,6 @@ import java.io.IOException;
* @version $Id$
*/
@RunWith( SpringJUnit4ClassRunner.class )
-//ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
@ContextConfiguration( locations = {
"classpath*:/repository-servlet-simple.xml" } )
public abstract class AbstractRepositoryServletTestCase
extends TestCase
