Changeset 4173 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.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/TestInstances.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import eu.dasish.annotation.schema.TargetInfo;
 import eu.dasish.annotation.schema.TargetInfoList;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
 
 /**
@@ -33 +35 @@
     final private Annotation _annotationToAdd;
     
-    public TestInstances(){
-        _annotationOne = makeAnnotationOne();
-        _annotationToAdd = makeAnnotationToAdd();    
+    public TestInstances(String baseURI){
+        _annotationOne = makeAnnotationOne(baseURI);
+        _annotationToAdd = makeAnnotationToAdd(baseURI);    
     }
     
     
-    private Annotation makeAnnotationOne(){
-        Annotation result = makeAnnotation(TestBackendConstants._TEST_ANNOT_2_BODY, TestBackendConstants._TEST_BODY_MIMETYPE_HTML, TestBackendConstants._TEST_ANNOT_2_HEADLINE, TestBackendConstants._TEST_ANNOT_2_OWNER);
+    private Annotation makeAnnotationOne(String baseURI){
+        Annotation result = makeAnnotation(baseURI, TestBackendConstants._TEST_ANNOT_2_BODY, TestBackendConstants._TEST_BODY_MIMETYPE_HTML, TestBackendConstants._TEST_ANNOT_2_HEADLINE, TestBackendConstants._TEST_USER_3_EXT_ID);
+        try {
+        result.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP));
+        } catch (DatatypeConfigurationException dce) {
+            System.out.println("wrongly-formatted test timestamp "+TestBackendConstants._TEST_ANNOT_2_TIME_STAMP);
+            result.setLastModified(null);
+        }
         return result;
     }
     
-    private Annotation makeAnnotationToAdd(){
-       Annotation result = makeAnnotation(TestBackendConstants._TEST_ANNOT_TO_ADD_BODY, TestBackendConstants._TEST_BODY_MIMETYPE_TEXT, TestBackendConstants._TEST_ANNOT_TO_ADD_HEADLINE, 5);
+    private Annotation makeAnnotationToAdd(String baseURI){
+       Annotation result = makeAnnotation(baseURI, TestBackendConstants._TEST_ANNOT_TO_ADD_BODY, TestBackendConstants._TEST_BODY_MIMETYPE_TEXT, TestBackendConstants._TEST_ANNOT_TO_ADD_HEADLINE, TestBackendConstants._TEST_USER_3_EXT_ID);
        
        TargetInfo TargetInfo =  new TargetInfo();
@@ -60 +68 @@
     
 
-    private Annotation makeAnnotation(String bodyTxt, String bodyMimeType, String headline, int ownerId){
+    private Annotation makeAnnotation(String baseURI, String bodyTxt, String bodyMimeType, String headline, String ownerID){
         Annotation result = new Annotation();
         AnnotationBody body = new AnnotationBody();
@@ -70 +78 @@
        
         result.setHeadline(headline);
-        result.setOwnerRef(String.valueOf(ownerId)); 
+        result.setOwnerRef(baseURI+"users/"+ownerID); 
         
         result.setLastModified(null);