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

Timestamp:

08/23/13 15:20:13 (11 years ago)

Author:

olhsha

Message:

making URI's in JAXB-generated classes fro resources <serviceURI>_<external_id>. Earlier it was just external Id.

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

@@ -73 +73 @@
         System.out.println("getSource");
         Number internalID = 1;
+        jdbcSourceDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         Source result = jdbcSourceDao.getSource(internalID);
-        assertEquals(TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.getURI());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.getURI());
         assertEquals(TestBackendConstants._TEST_SOURCE_1_LINK, result.getLink());
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.getVersion());
-        //TODO: time stamp is not checked: do not know with what to compare 
+        // TODO :add time stamp test
+        
     }
 
@@ -128 +130 @@
         freshSource.setLink(link);
         freshSource.setVersion(TestBackendConstants._TEST_VERSION_1_EXT_ID);
-        freshSource.setURI((UUID.randomUUID()).toString());
         freshSource.setTimeSatmp(null);
         
@@ -137 +138 @@
         assertEquals(link, addedSource.getLink());
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, addedSource.getVersion());
-        assertEquals(freshSource.getURI(), addedSource.getURI());
+        assertTrue(addedSource.getURI().startsWith(TestBackendConstants._TEST_SERVLET_URI));
     }
 
@@ -145 +146 @@
     @Test
     public void testGetSourceInfos() {
-        System.out.println("getSourceInfos");
+        System.out.println("getSourceInfos");        
+        jdbcSourceDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         List<Number> test = new ArrayList<Number>();
         test.add(1);
@@ -151 +153 @@
         List<SourceInfo> result = jdbcSourceDao.getSourceInfos(test);
         assertEquals(2, result.size());
-        assertEquals(TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.get(0).getRef());
-        assertEquals(TestBackendConstants._TEST_SOURCE_2_EXT_ID, result.get(1).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_SOURCE_2_EXT_ID, result.get(1).getRef());
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.get(0).getVersion());
         assertEquals(TestBackendConstants._TEST_VERSION_3_EXT_ID, result.get(1).getVersion());