Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1419602 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-12-10 17:37:50 +00:00
parent b5f494d22c
commit 504abcf697
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
View File

@ -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 ) );
}

14
archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
View File

@ -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();