Fixing tests for rest services

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/RequestValidationInterceptor.java

@@ -122,6 +122,9 @@ public class RequestValidationInterceptor extends AbstractInterceptor implements
             log.info("CSRF Filter is disabled by configuration");
         }
         checkToken = !config.getBoolean(CFG_REST_CSRF_DISABLE_TOKEN_VALIDATION, false);
+        if (!checkToken) {
+            log.info("CSRF Token validation is disabled by configuration");
+        }
     }
 
     @Override

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/LoginServiceTest.java

@@ -23,10 +23,16 @@ import org.apache.archiva.redback.rest.api.model.LoginRequest;
 import org.apache.archiva.redback.rest.api.model.User;
 import org.apache.archiva.redback.rest.api.services.UserService;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Olivier Lamy
  */
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration(
+        locations = { "classpath:/spring-context.xml" } )
 public class LoginServiceTest
     extends AbstractRestServicesTest
 {

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java

@@ -25,6 +25,9 @@ import org.apache.archiva.redback.rest.api.services.RoleManagementService;
 import org.apache.archiva.redback.rest.api.services.UserService;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import javax.ws.rs.ForbiddenException;
 import java.util.Arrays;
@@ -34,6 +37,9 @@ import java.util.List;
 /**
  * @author Olivier Lamy
  */
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration(
+        locations = { "classpath:/spring-context.xml" } )
 public class RoleManagementServiceTest
     extends AbstractRestServicesTest
 {

redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java

@@ -32,6 +32,9 @@ import org.apache.archiva.redback.rest.services.mock.ServicesAssert;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.core.MediaType;
@@ -45,6 +48,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Olivier Lamy
  */
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration(
+        locations = { "classpath:/spring-context.xml" } )
 public class UserServiceTest
     extends AbstractRestServicesTest
 {

redback-integrations/redback-rest/redback-rest-services/src/test/resources/security.properties

@@ -17,3 +17,4 @@
 # under the License.
 #
 user.manager.impl=jdo
+rest.csrffilter.disableTokenValidation=true

redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml

@@ -23,25 +23,27 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
-      init-method="initialize">
-    <property name="configs">
-      <list>
-        <value>src/test/resources/security.properties</value>
-      </list>
-    </property>
-
-    <property name="registry" ref="registry#commons-configuration"/>
-
-  </bean>
-
-  <bean name="registry#commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
-      init-method="initialize">
-
-  </bean>
 
   <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
 
+
+  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+      init-method="initialize">
+    <property name="properties">
+      <value>
+        <![CDATA[
+        <configuration>
+          <system/>
+          <properties fileName="${basedir}/src/test/resources/security.properties" config-optional="true"
+                      config-at="org.apache.archiva.redback"/>
+        </configuration>
+        ]]>
+      </value>
+    </property>
+  </bean>
+
+
+
   <alias name="authorizer#rbac" alias="authorizer#default"/>
 
   <alias name="userManager#configurable" alias="userManager#default"/>

redback-integrations/redback-rest/redback-rest-services/src/test/security.properties

@@ -34,3 +34,5 @@ ldap.config.groups.role.snapshot-observer=Repository Observer - snapshots
 
 #ldap.config.writable=true
 #ldap.config.groups.use.rolename=true
+
+rest.csrffilter.disableTokenValidation=true