Changeset 3239

Timestamp:

08/05/13 15:30:24 (11 years ago)

Author:

olhsha

Message:

making a bit more funny test for purgeAll for cached.

adding signatures for the main methods of Version: get, retrieve, delete, add, purge, purgeAll

Location:

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

Files:

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

@@ -80 +80 @@
      * @return the amount of removed rows
      */
-    public int purgeVersions(Number internalID);
+    public int purge(Number internalID);
+    
+    /**
+     * 
+     * @return the list of all the internal-ids of all the versions
+     */
+    public List<Number> versionIDs();
+    
+    /**
+     * removes all the versions which are not referred from the sources_versions table
+     * @return 
+     */
+    public int purgeAll();
 }

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

@@ -141 +141 @@
      
     @Override
-    public int purgeVersions(Number internalID){
+    public int purge(Number internalID){
+        return -1;
+    }
+    
+    @Override 
+    public List<Number> versionIDs(){
+       return null; 
+    }
+    
+    @Override
+    public int purgeAll(){
         return -1;
     }

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

@@ -172 +172 @@
         System.out.println(" test cachedRepresentationIDs");
         List<Number>  result = jdbcCachedRepresentationDao.cachedRepresentationIDs();
-        assertEquals(6, result.size());
+        assertEquals(7, result.size());
         assertEquals(1, result.get(0));
         assertEquals(2, result.get(1));
@@ -178 +178 @@
         assertEquals(4, result.get(3));
         assertEquals(5, result.get(4));
-        assertEquals(6, result.get(5));
+        assertEquals(6, result.get(5));        
+        assertEquals(7, result.get(6));
     }
     
@@ -189 +190 @@
         System.out.println("test purge All");
         int result = jdbcCachedRepresentationDao.purgeAll();
-        assertEquals(1, result);
+        assertEquals(2, result);
     }
 }

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

@@ -125 +125 @@
 INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000055', 'image/jpg', 'photomaster', 'image', 'TLAscratch'); --5 
 INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000056', 'text/plain', 'some tool', 'text', 'TLAscratch'); --6 
+INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000057', 'text/html', 'some tool 2', 'text', 'TLAscratch'); --7 
 
 --------------------------------------------------------------