Changeset 4175

Timestamp:

12/10/13 16:08:19 (10 years ago)

Author:

olhsha

Message:

integrity-spring-configuration context is refactored

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test

Files:

• java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified) (3 diffs)
• resources/spring-integrity-test-config (deleted)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

@@ -24 +24 @@
 import com.sun.jersey.core.util.Base64;
 import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
+import com.sun.jersey.test.framework.AppDescriptor;
 import com.sun.jersey.test.framework.JerseyTest;
 import com.sun.jersey.test.framework.WebAppDescriptor;
@@ -69 +70 @@
  */
 @RunWith(value = SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"/spring-integrity-test-config/dataSource.xml"})
+@ContextConfiguration({"/spring-test-config/dataSource.xml"})
 public class AnnotationsTest extends JerseyTest {    
     
@@ -75 +76 @@
     private JdbcTemplate jdbcTemplate;
     
-    public AnnotationsTest() {
-        super(new WebAppDescriptor.Builder(AnnotationResource.class.getPackage().getName())
+    
+    
+    
+    @Override
+    protected AppDescriptor configure() {
+       return new WebAppDescriptor.Builder(AnnotationResource.class.getPackage().getName())
                 .servletClass(SpringServlet.class)
-                .contextParam("contextConfigLocation", "classpath*:spring-integrity-test-config/*.xml")
+                .contextParam("contextConfigLocation", getApplicationContextFile())
                 .addFilter(DummySecurityFilter.class, "DummySecurityFilter")
                 .requestListenerClass(RequestContextListener.class)
                 .contextListenerClass(ContextLoaderListener.class)
-                .build());
-        
+                .build();
+        
+    }
+    
+    private String getApplicationContextFile() {
+        // sorry for the duplication, but JerseyTest is not aware of
+        // @ContextConfiguration
+        return "classpath:spring-config/componentscan.xml, classpath:spring-config/annotationDao.xml, classpath:spring-config/userDao.xml, classpath:spring-config/targetDao.xml, classpath:spring-config/cachedRepresentationDao.xml, classpath:spring-config/dbIntegrityService.xml, classpath:spring-config/jaxbMarshallerFactory.xml, classpath:spring-test-config/dataSource.xml";
     }