diff options
author | Olivier Lamy <olamy@apache.org> | 2012-12-10 17:37:50 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2012-12-10 17:37:50 +0000 |
commit | 504abcf6973458748072a4e95212bebd85f049f9 (patch) | |
tree | 4640dab70b3a7822eb0e297f0efc5ed00ba11aca /archiva-modules/archiva-web | |
parent | b5f494d22c909bd471290ca44657956356d361c5 (diff) | |
download | archiva-504abcf6973458748072a4e95212bebd85f049f9.tar.gz archiva-504abcf6973458748072a4e95212bebd85f049f9.zip |
fix compilation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1419602 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
2 files changed, 9 insertions, 7 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java index 375612a63..ed524fd5c 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java @@ -67,7 +67,7 @@ public class ArchivaRuntimeConfigurationServiceTest ArchivaRuntimeConfigurationService service = getArchivaRuntimeConfigurationService(); List<UserManagerImplementationInformation> infos = service.getUserManagerImplementationInformations(); Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains( - new UserManagerImplementationInformation( "jdo", null ) ); + new UserManagerImplementationInformation( "jdo", null, false ) ); } diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java index 5163eaf61..fb9a5078d 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java @@ -26,6 +26,7 @@ import org.apache.archiva.redback.rbac.RBACManager; 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.ContextConfiguration; 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 AbstractSecurityTest 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 AbstractSecurityTest } protected User createUser( String principal, String fullname ) + throws UserManagerException { UserManager userManager = securitySystem.getUserManager(); |