Changeset 3455 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java

Timestamp:

08/22/13 12:17:19 (11 years ago)

Author:

olhsha

Message:

replacing DaishIdentifier?-based classes with simply UUID. tested. Works, excpet that UUID seems not be be serailizable, see e.g. getAllAnnotations in NotebookResource? where I have to use Peter's workoaroun to put UUID in JAXBElement<UUID>

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (6 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java

@@ -21 +21 @@
 import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
-import eu.dasish.annotation.backend.identifiers.AnnotationIdentifier;
 import eu.dasish.annotation.schema.Annotation;
 import eu.dasish.annotation.schema.AnnotationInfo;
@@ -31 +30 @@
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import static org.junit.Assert.*;
 import org.junit.Test;
@@ -159 +159 @@
      *
      * Test of getAnnotationID method, of class JdbcAnnotationDao. Integer
-     * getAnnotationID(AnnotationIdentifier externalID)
+     * getAnnotationID(UUID externalID)
      */
     @Test
@@ -165 +165 @@
         System.out.println("test getInternalID");
 
-        final Number annotaionId = jdbcAnnotationDao.getInternalID(new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_2_EXT));
+        final Number annotaionId = jdbcAnnotationDao.getInternalID(UUID.fromString(TestBackendConstants._TEST_ANNOT_2_EXT));
         assertEquals(2, annotaionId.intValue());
 
-        final Number annotaionIdNE = jdbcAnnotationDao.getInternalID(new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_7_EXT_NOT_IN_DB));
+        final Number annotaionIdNE = jdbcAnnotationDao.getInternalID(UUID.fromString(TestBackendConstants._TEST_ANNOT_7_EXT_NOT_IN_DB));
         assertEquals(null, annotaionIdNE);
 
@@ -266 +266 @@
         System.out.println("getExternalID");
 
-        final AnnotationIdentifier externalId = jdbcAnnotationDao.getExternalID(2);
-        assertEquals(new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_2_EXT), externalId);
-
-
-        final AnnotationIdentifier externalIdThree = jdbcAnnotationDao.getExternalID(null);
-        assertEquals(null, externalIdThree.getUUID());
+        final UUID externalId = jdbcAnnotationDao.getExternalID(2);
+        assertEquals(UUID.fromString(TestBackendConstants._TEST_ANNOT_2_EXT), externalId);
+
+
+        final UUID externalIdThree = jdbcAnnotationDao.getExternalID(null);
+        assertEquals(null, externalIdThree);
 
     }
@@ -277 +277 @@
     
     /** test
-     * public List<Number> getFilteredAnnotationIDs(String link, String text, String access, String namespace, UserIdentifier owner, Timestamp after, Timestamp before) {
+     * public List<Number> getFilteredAnnotationIDs(String link, String text, String access, String namespace, UUID owner, Timestamp after, Timestamp before) {
   **/