Changeset 3300

Timestamp:

08/08/13 08:08:26 (11 years ago)

Author:

olhsha

Message:

the leftovers of yesterday's testing work is done: contructNewOrExistingSourceInfos, getSourceInfos(annotation) Dao's are tested

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src

Files:

• main/java/eu/dasish/annotation/backend/dao/SourceDao.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/TestBackendConstants.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDaoTest.java (modified) (2 diffs)
• test/resources/test-data/InsertTestData.sql (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/SourceDao.java

@@ -83 +83 @@
     * @return the list of NewOrExistingSourceo objects in such a way  that an element of the sourceInfoList is injected into an element of the return list
     */
-   
+   //TODO: add non-existing sources!! now is implemented only for existing sources
     public NewOrExistingSourceInfos contructNewOrExistingSourceInfo(List<SourceInfo> sourceInfoList);
     

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

@@ -91 +91 @@
     public static final String _TEST_VERSION_2_EXT_ID = "00000000-0000-0000-0000-000000000042";
     public static final String _TEST_VERSION_3_EXT_ID = "00000000-0000-0000-0000-000000000043";
+    
+   
 }
 

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

@@ -200 +200 @@
         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_VERSION_1_EXT_ID, result.get(0).getVersion());
+        assertEquals(TestBackendConstants._TEST_VERSION_3_EXT_ID, result.get(1).getVersion());
+        assertEquals(TestBackendConstants._TEST_SOURCE_1_LINK, result.get(0).getLink());
+        assertEquals(TestBackendConstants._TEST_SOURCE_2_LINK, result.get(1).getLink());
         
     }
@@ -207 +211 @@
      */
     @Test
-    @Ignore
     public void testContructNewOrExistingSourceInfo() {
         System.out.println("contructNewOrExistingSourceInfo");
-        List<SourceInfo> sourceInfoList = null;
-        JdbcSourceDao instance = null;
-        NewOrExistingSourceInfos expResult = null;
-        NewOrExistingSourceInfos result = instance.contructNewOrExistingSourceInfo(sourceInfoList);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        
+        List<SourceInfo> sourceInfoList = new ArrayList<SourceInfo>();
+        
+        SourceInfo sourceInfoOne = new SourceInfo();
+        sourceInfoOne.setLink(TestBackendConstants._TEST_SOURCE_1_LINK);
+        sourceInfoOne.setRef(TestBackendConstants._TEST_SOURCE_1_EXT_ID);
+        sourceInfoOne.setRef(TestBackendConstants._TEST_VERSION_1_EXT_ID);
+        
+        SourceInfo sourceInfoTwo = new SourceInfo();
+        sourceInfoTwo.setLink(TestBackendConstants._TEST_SOURCE_2_LINK);
+        sourceInfoTwo.setRef(TestBackendConstants._TEST_SOURCE_2_EXT_ID);
+        sourceInfoTwo.setRef(TestBackendConstants._TEST_VERSION_3_EXT_ID);
+        
+        sourceInfoList.add(sourceInfoOne);
+        sourceInfoList.add(sourceInfoTwo);
+        
+        NewOrExistingSourceInfos result = jdbcSourceDao.contructNewOrExistingSourceInfo(sourceInfoList);
+        assertEquals(2, result.getTarget().size());
+        assertEquals(sourceInfoOne, result.getTarget().get(0).getSource());
+        assertEquals(sourceInfoTwo, result.getTarget().get(1).getSource());
+        
     }
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

@@ -145 +145 @@
 INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (4, 4);
 INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (1, 5);
+INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (5, 5);
 INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (6, 5);