Changeset 3455 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDaoTest.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/JdbcSourceDaoTest.java (modified) (5 diffs)

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

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.TestBackendConstants;
-import eu.dasish.annotation.backend.identifiers.SourceIdentifier;
 import eu.dasish.annotation.schema.Source;
 import eu.dasish.annotation.schema.SourceInfo;
@@ -25 +24 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -50 +50 @@
         System.out.println("getExternalID");
         Number internalID = 1;
-        SourceIdentifier result = jdbcSourceDao.getExternalID(internalID);
+        UUID result = jdbcSourceDao.getExternalID(internalID);
         assertEquals(TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.toString());
     }
@@ -60 +60 @@
     public void testGetInternalId() {
         System.out.println("getInternalId");
-        SourceIdentifier externalID = new SourceIdentifier(TestBackendConstants._TEST_SOURCE_1_EXT_ID);
+        UUID externalID = UUID.fromString(TestBackendConstants._TEST_SOURCE_1_EXT_ID);
         Number expResult = 1;
         Number result = jdbcSourceDao.getInternalID(externalID);
@@ -128 +128 @@
         freshSource.setLink(link);
         freshSource.setVersion(TestBackendConstants._TEST_VERSION_1_EXT_ID);
-        freshSource.setURI((new SourceIdentifier()).toString());
+        freshSource.setURI((UUID.randomUUID()).toString());
         freshSource.setTimeSatmp(null);