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

Timestamp:

02/06/14 12:21:44 (10 years ago)

Author:

olhsha

Message:

Unit test HSQL database is cleaned up (obsolete rows are removed), UNit tests are refactored (hairy code is removed, a lot of test backend constants). Existed unit tests work.

File:

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

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

@@ -80 +80 @@
     public AnnotationResourceTest() { 
         mockRequest = new MockHttpServletRequest();
-        mockRequest.setRemoteUser("twan");
+        mockRequest.setRemoteUser("olhsha@mpi.nl");
         
     }
@@ -91 +91 @@
     public void testGetAnnotation() throws SQLException, JAXBException, Exception {
         System.out.println("getAnnotation");
-        final String externalIDstring= TestBackendConstants._TEST_ANNOT_2_EXT;
+        final String externalIDstring= "00000000-0000-0000-0000-000000000021";
         final Annotation expectedAnnotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();       
         annotationResource.setHttpServletRequest(mockRequest);        
@@ -107 +107 @@
                 will(doAll());
                 
-                oneOf(mockDbIntegrityService).getUserInternalIDFromRemoteID("twan");
+                oneOf(mockDbIntegrityService).getUserInternalIDFromRemoteID("olhsha@mpi.nl");
                 will(returnValue(3)); 
                 
@@ -139 +139 @@
         mockDelete[0]=1; // # deleted annotations
         mockDelete[3]=1; // # deleted annotation_prinipal_permissions
-        mockDelete[2]=2; // # deleted  annotations_target_Targets, (5,3), (5,4)
+        mockDelete[2]=2; // # deleted  annotations_target_Targets, (4,3), (4,4)
         mockDelete[3]=1; // # deletd Targets, 4
         
@@ -151 +151 @@
                
               
-                oneOf(mockDbIntegrityService).getUserInternalIDFromRemoteID("twan");
-                will(returnValue(5)); 
+                oneOf(mockDbIntegrityService).getUserInternalIDFromRemoteID("olhsha@mpi.nl");
+                will(returnValue(3)); 
                 
                 oneOf(mockDbIntegrityService).setServiceURI(with(any(String.class)));
@@ -158 +158 @@
                 
                 oneOf(mockDbIntegrityService).getAnnotationInternalIdentifier(with(aNonNull(UUID.class)));              
-                will(returnValue(5)); 
-                
-               
-                oneOf(mockDbIntegrityService).getAnnotationOwner(5);
-                will(returnValue(5));  
-                
-                oneOf(mockDbIntegrityService).deleteAnnotation(5);
+                will(returnValue(4)); 
+                
+               
+                oneOf(mockDbIntegrityService).getAnnotationOwner(4);
+                will(returnValue(3));  
+                
+                oneOf(mockDbIntegrityService).deleteAnnotation(4);
                 will(returnValue(mockDelete));
             }
@@ -170 +170 @@
         
        
-        String result = annotationResource.deleteAnnotation(TestBackendConstants._TEST_ANNOT_5_EXT);
+        String result = annotationResource.deleteAnnotation("00000000-0000-0000-0000-000000000024");
         assertEquals("1 annotation(s) deleted.", result);
     }
@@ -187 +187 @@
         annotationToAdd.setTargets(TargetInfoList);
         annotationToAdd.setOwnerRef(null);      
-        annotationToAdd.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP));
+        annotationToAdd.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar("2013-08-12T09:25:00.383000Z"));
         annotationToAdd.setHeadline("headline");
         annotationToAdd.setTargets(TargetInfoList);
@@ -209 +209 @@
         final Annotation addedAnnotation = (new ObjectFactory()).createAnnotation(annotationToAdd).getValue();
         addedAnnotation.setURI("http://localhost:8080/annotator-backend/api/annotations/"+UUID.randomUUID().toString());
-        addedAnnotation.setOwnerRef("http://localhost:8080/annotator-backend/api/users/"+TestBackendConstants._TEST_USER_3_EXT_ID);
+        addedAnnotation.setOwnerRef("http://localhost:8080/annotator-backend/api/users/"+"00000000-0000-0000-0000-000000000111");
      
         annotationResource.setHttpServletRequest(mockRequest); 
@@ -223 +223 @@
                 will(doAll());
                 
-                oneOf(mockDbIntegrityService).getUserInternalIDFromRemoteID("twan");
+                oneOf(mockDbIntegrityService).getUserInternalIDFromRemoteID("olhsha@mpi.nl");
                 will(returnValue(3));