Changeset 4886 for DASISH

Timestamp:

04/02/14 21:15:22 (10 years ago)

Author:

olhsha@mpi.nl

Message:

updated unit test annotation dao works fully, as a standalone class and inside the whole test

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (2 diffs)

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

@@ -393 +393 @@
 
         String[] body = retrieveBodyComponents(annotation.getBody());
-        //debug
-        System.out.println(annotation.getURI());
+        
         String externalID = this.stringURItoExternalID(annotation.getURI());
         Map<String, Object> params = new HashMap<String, Object>();

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

@@ -276 +276 @@
         // debug
         System.out.println("test Input stringURItoExternalID : "+stringURI);
+        System.out.println("test serviceUri : "+_serviceURI);
         if (stringURI.length() > _serviceURI.length()) {
             return stringURI.substring(_serviceURI.length());

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

@@ -495 +495 @@
 
     @Test
-    @Ignore
     public void testUpdateAnnotation() {
-        System.out.println("KOUKOUK!!!!");
-
+        System.out.println("test UpdateAnnotation");
+        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+        
         Annotation annotation = testInstances.getAnnotationOne();
         annotation.setHeadline("updated headline 1");
@@ -507 +507 @@
         int result = jdbcAnnotationDao.updateAnnotation(annotation,1, 1);
         assertEquals(1, result);
-//        Annotation check = jdbcAnnotationDao.getAnnotationWithoutTargetsAndPemissions(1);
-//        assertEquals("updated some html 1", check.getBody().getTextBody().getBody());
-//        assertEquals("text/plain", check.getBody().getTextBody().getMimeType());
-//        assertEquals("updated headline 1", check.getHeadline());
+        System.out.println(" annotation updated");
+        Annotation check = jdbcAnnotationDao.getAnnotationWithoutTargetsAndPemissions(1);
+        assertEquals("updated some html 1", check.getBody().getTextBody().getBody());
+        assertEquals("text/plain", check.getBody().getTextBody().getMimeType());
+        assertEquals("updated headline 1", check.getHeadline());
 
     }