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

Timestamp:

08/19/13 09:35:12 (11 years ago)

Author:

olhsha

Message:

all basic Dao for CachedRepresentation?, Version, Source, Annotation, User and Notebooks are tested well. However, JdbcUserDao? and JdbcNotebookDao? are obsolete.

File:

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

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

@@ -235 +235 @@
         assertFalse(null == addedAnnotation.getURI());
         assertFalse(null == addedAnnotation.getTimeStamp());
-        assertEquals(5, addedAnnotation.getOwner().getRef());
+        assertEquals(Integer.toString(5), addedAnnotation.getOwner().getRef());
         assertEquals(annotationToAdd.getBody().getAny().get(0), addedAnnotation.getBody().getAny().get(0)); // TODO: to be changed after serialization is fixed
         assertEquals(annotationToAdd.getHeadline(), addedAnnotation.getHeadline());
@@ -304 +304 @@
         
        
-        List<Number> result_3 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 1, null, null);        
+        List<Number> result_3 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 3, null, null);        
         assertEquals(1, result_3.size());
         assertEquals(2, result_3.get(0));
@@ -311 +311 @@
         Timestamp after = new Timestamp(0); 
         Timestamp before = new Timestamp(System.currentTimeMillis());  
-        List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 1, after, before);        
+        List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 3, after, before);        
         assertEquals(1, result_4.size());
         assertEquals(2, result_4.get(0));
         
         
-        Timestamp after_1 = new Timestamp(System.currentTimeMillis());        
-        List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 1, after_1, null);        
-        assertEquals(1, result_5.size());
+        Timestamp after_1 = new Timestamp(System.currentTimeMillis()); // no annotations added after "now"       
+        List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 3, after_1, null);        
+        assertEquals(0, result_5.size());
         
         
@@ -344 +344 @@
         System.out.println("test Permissions");
         List<Map<Number, String>> result = jdbcAnnotationDao.retrievePermissions(2);
-        assertEquals(2, result.size());
+        assertEquals(3, result.size());
         assertEquals("owner", result.get(0).get(3));
-        assertEquals("writer", result.get(0).get(4));
-        assertEquals("reader", result.get(0).get(5));
+        assertEquals("writer", result.get(1).get(4));
+        assertEquals("reader", result.get(2).get(5));