svn commit: r1419602 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ archiva-security/src/test/java/org/apache/archiva/security/

[ol...@apache.org]

Author: olamy
Date: Mon Dec 10 17:37:50 2012
New Revision: 1419602

URL: http://svn.apache.org/viewvc?rev=1419602&view=rev
Log:
fix compilation

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java?rev=1419602&r1=1419601&r2=1419602&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java Mon Dec 10 17:37:50 2012
@@ -67,7 +67,7 @@ public class ArchivaRuntimeConfiguration
         ArchivaRuntimeConfigurationService service = getArchivaRuntimeConfigurationService();
         List<UserManagerImplementationInformation> infos = service.getUserManagerImplementationInformations();
         Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains(
-            new UserManagerImplementationInformation( "jdo", null ) );
+            new UserManagerImplementationInformation( "jdo", null, false ) );
 
     }
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java?rev=1419602&r1=1419601&r2=1419602&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java Mon Dec 10 17:37:50 2012
@@ -26,6 +26,7 @@ import org.apache.archiva.redback.rbac.R
 import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.role.RoleManager;
 import org.apache.archiva.redback.users.User;
+import org.apache.archiva.redback.users.UserManagerException;
 import org.apache.archiva.security.common.ArchivaRoleConstants;
 import org.apache.commons.io.FileUtils;
 import org.apache.archiva.configuration.ArchivaConfiguration;
@@ -42,14 +43,14 @@ import org.springframework.test.context.
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.io.File;
+
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 
 /**
  * AbstractSecurityTest
- *
  */
-@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@RunWith(ArchivaSpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" })
 public abstract class AbstractSecurityTest
     extends TestCase
 {
@@ -63,18 +64,18 @@ public abstract class AbstractSecurityTe
     protected static final String USER_ALPACA = "alpaca";
 
     @Inject
-    @Named( value = "securitySystem#testable" )
+    @Named(value = "securitySystem#testable")
     protected SecuritySystem securitySystem;
 
     @Inject
-    @Named( value = "rBACManager#memory" )
+    @Named(value = "rBACManager#memory")
     protected RBACManager rbacManager;
 
     @Inject
     protected RoleManager roleManager;
 
     @Inject
-    @Named( value = "archivaConfiguration#default" )
+    @Named(value = "archivaConfiguration#default")
     private ArchivaConfiguration archivaConfiguration;
 
     @Inject
@@ -104,6 +105,7 @@ public abstract class AbstractSecurityTe
     }
 
     protected User createUser( String principal, String fullname )
+        throws UserManagerException
     {
         UserManager userManager = securitySystem.getUserManager();