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

Timestamp:

12/11/13 15:59:54 (10 years ago)

Author:

olhsha

Message:

a fragments (of a target) is now a part of the attribute link. The Dao's and unit tests are updated and work. Fixed corrupted pom (there was ill glass-fish dependency that spoiled authentication)

File:

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

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

@@ -119 +119 @@
         Target result = jdbcTargetDao.getTarget(1);
         assertEquals(TestBackendConstants._TEST_SERVLET_URI_Targets+TestBackendConstants._TEST_Target_1_EXT_ID, result.getURI());
-        assertEquals(TestBackendConstants._TEST_Target_1_LINK, result.getLink());
+        assertEquals(TestBackendConstants._TEST_Target_1_LINK+"#"+TestBackendConstants._TEST_Target_1_FRAGMENT, result.getLink());
         assertEquals(TestBackendConstants._TEST_Target_1_VERSION, result.getVersion());
-        assertEquals("#de_Opdracht", result.getFragmentDescriptor());
         // TODO :add time stamp test
         
@@ -164 +163 @@
         System.out.println("addTarget");
 
-        String link = "http://www.sagradafamilia.cat/";
         Target freshTarget = new Target();
-        freshTarget.setLink(link);
+        freshTarget.setLink(TestBackendConstants._TEST_Target_1_LINK+"#Het_ontwerp");
         freshTarget.setVersion(TestBackendConstants._TEST_Target_1_VERSION);
         freshTarget.setLastModified(null);
@@ -174 +172 @@
         // detailed checking
         Target addedTarget = jdbcTargetDao.getTarget(result);
-        assertEquals(link, addedTarget.getLink());
+        assertEquals(TestBackendConstants._TEST_Target_1_LINK+"#Het_ontwerp", addedTarget.getLink());
         assertEquals(TestBackendConstants._TEST_Target_1_VERSION, addedTarget.getVersion());
         assertTrue(addedTarget.getURI().startsWith(TestBackendConstants._TEST_SERVLET_URI_Targets));
@@ -195 +193 @@
         assertEquals(TestBackendConstants._TEST_Target_1_VERSION, result.get(0).getVersion());
         assertEquals(TestBackendConstants._TEST_Target_2_VERSION, result.get(1).getVersion());
-        assertEquals(TestBackendConstants._TEST_Target_1_LINK, result.get(0).getLink());
-        assertEquals(TestBackendConstants._TEST_Target_2_LINK, result.get(1).getLink());
+        assertEquals(TestBackendConstants._TEST_Target_1_LINK+"#"+TestBackendConstants._TEST_Target_1_FRAGMENT, result.get(0).getLink());
+        assertEquals(TestBackendConstants._TEST_Target_2_LINK+"#Vroege_werk", result.get(1).getLink());
 
     }