Changeset 3255

Timestamp:

08/06/13 13:06:35 (11 years ago)

Author:

olhsha

Message:

VesionDao? toolkit is Dao-tested: get, retrive list, delete, add, purge.

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.java (modified) (3 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java (modified) (10 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/impl/JdbcCachedRepresentationDao.java

@@ -145 +145 @@
       public int deleteCachedRepresentationInfo(Number internalID){
         String sql = "DELETE FROM " + cachedRepresentationTableName + " where "+cached_representation_id + " = ?";
-        String sqlVersionsCachedRepresentations = "DELETE FROM " + versionsCachedRepresentationsTableName + " where "+cached_representation_id + " = ?";        
-        getSimpleJdbcTemplate().update(sqlVersionsCachedRepresentations, internalID);
         return (getSimpleJdbcTemplate().update(sql, internalID));
       };

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

@@ -74 +74 @@
         }
        String sql = "SELECT "+version_id+" FROM "+versionTableName+" WHERE "+external_id  +"= ?";
-       List<Number> sqlResult= getSimpleJdbcTemplate().query(sql, internalIDRowMapper, externalID); 
+       List<Number> sqlResult= getSimpleJdbcTemplate().query(sql, internalIDRowMapper, externalID.toString()); 
        
        if (sqlResult == null) {
@@ -147 +147 @@
     @Override
     public int deleteVersion(Number internalID){
-        String sql = "DELETE FROM " + versionTableName + " where "+version_id + " = ?";
-        String sqlSourcesVersions = "DELETE FROM " + sourcesVersionsTableName + " where "+version_id + " = ?";        
-        getSimpleJdbcTemplate().update(sqlSourcesVersions, internalID);
+        String sql = "DELETE FROM " + versionTableName + " where "+version_id + " = ?"; 
         return (getSimpleJdbcTemplate().update(sql, internalID));
     }
@@ -167 +165 @@
           // TODO change for external identifier when the shcem is fixed
           versionAdded.setVersion(newExternalIdentifier);
-        return null;
+        return versionAdded;
     }
      

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

@@ -126 +126 @@
     public void testDeleteCachedRepresentationInfo() {
         System.out.println("deleteCachedRepresentationInfo");
-        Number internalID = 1;
+        Number internalID = 6; /// safe to deleate becasue no version refers to it
         int result = jdbcCachedRepresentationDao.deleteCachedRepresentationInfo(internalID);
         assertEquals(1, result);

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

@@ -37 +37 @@
 //@ContextConfiguration({"/spring-test-config/dataSource.xml", "/spring-test-config/mockery.xml", "/spring-test-config/mockAnnotationDao.xml",
 //    "/spring-test-config/mockUserDao.xml", "/spring-test-config/mockPermissionsDao.xml", "/spring-test-config/mockNotebookDao.xml", "/spring-config/cachedRepresentationDao.xml"})
-@ContextConfiguration({"/spring-test-config/dataSource.xml", "/spring-config/cachedRepresentationDao.xml"})
+@ContextConfiguration({"/spring-test-config/dataSource.xml", "/spring-config/versionDao.xml"})
 
 public class JdbcVersionDaoTest extends JdbcResourceDaoTest{
@@ -51 +51 @@
         System.out.println("getExternalId");
         Number internalID = 1;
-        VersionIdentifier expResult = null;
         VersionIdentifier result = jdbcVersionDao.getExternalId(internalID);
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.toString());
@@ -60 +59 @@
      */
     @Test
-    @Ignore
     public void testGetInternalId() {
         System.out.println("getInternalId");
-        VersionIdentifier externalID = null;
-        JdbcVersionDao instance = null;
-        Number expResult = null;
-        Number result = instance.getInternalId(externalID);
+        VersionIdentifier externalID = new VersionIdentifier(TestBackendConstants._TEST_VERSION_1_EXT_ID);
+        Number expResult = 1;
+        Number result = jdbcVersionDao.getInternalId(externalID);
         assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
     }
 
@@ -76 +71 @@
      */
     @Test
-    @Ignore
     public void testGetVersion() {
         System.out.println("getVersion");
-        Number internalID = null;
-        JdbcVersionDao instance = null;
-        Version expResult = null;
-        Version result = instance.getVersion(internalID);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        Number internalID = 1;
+        Version result = jdbcVersionDao.getVersion(internalID);
+        assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.getVersion());
+        //TODO: once the schems is fixed, test "version" and "URI/external-id" separately
+        // at the moment "version" corresponds "external_id"
     }
 
@@ -92 +84 @@
      */
     @Test
-    @Ignore
     public void testRetrieveVersionList() {
         System.out.println("retrieveVersionList");
-        Number sourceID = null;
-        JdbcVersionDao instance = null;
-        List expResult = null;
-        List result = instance.retrieveVersionList(sourceID);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        Number sourceID = 1;
+        // INSERT INTO sources_versions (source_id, version_id) VALUES (1, 1);
+        // INSERT INTO sources_versions (source_id, version_id) VALUES (1, 2);
+        List<Number> result = jdbcVersionDao.retrieveVersionList(sourceID);
+        assertEquals(1, result.get(0));
+        assertEquals(2, result.get(1));
     }
 
@@ -108 +98 @@
      */
     @Test
-    @Ignore
     public void testDeleteVersion() {
         System.out.println("deleteVersion");
-        Number internalID = null;
-        JdbcVersionDao instance = null;
-        int expResult = 0;
-        int result = instance.deleteVersion(internalID);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        Number internalID = 5; // there is no sources (in target_source and sources_versions - sibling table) connected to this version in the test table
+        int result = jdbcVersionDao.deleteVersion(internalID);
+        assertEquals(1, result);
+        
+        // try to delete one more time
+        int resultTwo = jdbcVersionDao.deleteVersion(internalID);
+        assertEquals(0, resultTwo);
     }
 
@@ -124 +113 @@
      */
     @Test
-    @Ignore
     public void testAddVersion() {
         System.out.println("addVersion");
-        Version freshVersion = null;
-        JdbcVersionDao instance = null;
-        Version expResult = null;
-        Version result = instance.addVersion(freshVersion);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        
+        Version freshVersion = new Version();   
+        
+        Version result = jdbcVersionDao.addVersion(freshVersion);
+        assertFalse(null==result.getVersion());
+        
+        // check if it is a good UUID. the program breaks if the string is anot a good UUID
+        assertEquals(result.getVersion(), (new VersionIdentifier(result.getVersion())).toString());
     }
 
@@ -140 +129 @@
      */
     @Test
-    @Ignore
     public void testPurge() {
         System.out.println("purge");
-        Number internalID = null;
-        JdbcVersionDao instance = null;
-        int expResult = 0;
-        int result = instance.purge(internalID);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        Number internalID = 5;
+        int result = jdbcVersionDao.purge(internalID);
+        assertEquals(1, result);
+        
+        int resultTwo = jdbcVersionDao.purge(internalID);
+        assertEquals(0, resultTwo);
     }
 
@@ -156 +143 @@
      */
     @Test
-    @Ignore
     public void testVersionIDs() {
         System.out.println("versionIDs");
-        JdbcVersionDao instance = null;
-        List expResult = null;
-        List result = instance.versionIDs();
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        List result = jdbcVersionDao.versionIDs();
+        assertEquals(6, result.size());
+        assertEquals(1, result.get(0));
+        assertEquals(2, result.get(1));
+        assertEquals(3, result.get(2));
+        assertEquals(4, result.get(3));
+        assertEquals(5, result.get(4));
+        assertEquals(6, result.get(5));
     }
 
@@ -171 +159 @@
      */
     @Test
-    @Ignore
     public void testPurgeAll() {
         System.out.println("purgeAll");
-        JdbcVersionDao instance = null;
-        int expResult = 0;
-        int result = instance.purgeAll();
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
+        int result = jdbcVersionDao.purgeAll();
+        assertEquals(2, result);
     }
 }

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

@@ -67 +67 @@
 INSERT INTO version (external_id, version) VALUES ('00000000-0000-0000-0000-000000000043', 'Gaudi wiki -version 2013'); -- 3
 INSERT INTO version (external_id, version) VALUES ('00000000-0000-0000-0000-000000000044', 'Art Nuveau wiki -version 2013'); --4 
-INSERT INTO version (external_id, version) VALUES ('00000000-0000-0000-0000-000000000045', 'Art Nuveau wiki -version 2012'); --5 
+INSERT INTO version (external_id, version) VALUES ('00000000-0000-0000-0000-000000000045', 'Art Nuveau wiki -version 2012'); --5 not used
+INSERT INTO version (external_id, version) VALUES ('00000000-0000-0000-0000-000000000046', 'Art Nuveau wiki -version 2011'); --6  note used
 
 -- CREATE TABLE target_source (