Changeset 4173 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

Timestamp:

12/10/13 15:18:42 (10 years ago)

Author:

olhsha

Message:

lintegrity unit test reconstructed so it does not mock any more. getAnnotation works (the others are "ignored"). Needs refactoring (the subdirectory with beans and DummySecurityFilter? class.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified) (4 diffs)

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

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.dao.DBIntegrityService;
-import eu.dasish.annotation.backend.Helpers;
 import eu.dasish.annotation.backend.MockObjectsFactoryRest;
 import eu.dasish.annotation.backend.TestBackendConstants;
@@ -45 +44 @@
 import java.lang.InstantiationException;
 import java.net.URI;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
@@ -74 +72 @@
     private DBIntegrityService mockDbIntegrityService;
     @Autowired
+    UriInfo mockUriInfo;    
+    @Autowired
     private AnnotationResource annotationResource;
-    @Autowired
-    UriInfo mockUriInfo;
     
     private MockHttpServletRequest mockRequest;
@@ -94 +92 @@
         System.out.println("getAnnotation");
         final String externalIDstring= TestBackendConstants._TEST_ANNOT_2_EXT;
-        final Annotation expectedAnnotation = (new TestInstances()).getAnnotationOne();       
+        final Annotation expectedAnnotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();       
         annotationResource.setHttpServletRequest(mockRequest);        
         annotationResource.setUriInfo(mockUriInfo);