Changeset 3452 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

Timestamp:

08/21/13 09:47:33 (11 years ago)

Author:

olhsha

Message:

making interface and bean for DaoDispatcher?. AnnotationResourceTest? passed with 3 methods: get, add and delete annotations. AnnotationsTest? still have problems.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified) (9 diffs)

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

@@ -18 +18 @@
 package eu.dasish.annotation.backend.rest;
 
+import eu.dasish.annotation.backend.dao.DaoDispatcher;
 import com.sun.jersey.api.client.GenericType;
+import eu.dasish.annotation.backend.Helpers;
 import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
@@ -24 +26 @@
 import eu.dasish.annotation.backend.identifiers.UserIdentifier;
 import eu.dasish.annotation.schema.Annotation;
+import eu.dasish.annotation.schema.ResourceREF;
 import java.sql.SQLException;
 import javax.xml.bind.JAXBElement;
@@ -35 +38 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import java.lang.InstantiationException;
+import java.sql.Timestamp;
 import javax.servlet.ServletException;
+import javax.xml.datatype.DatatypeConfigurationException;
+import org.junit.Ignore;
 import org.springframework.mock.web.MockHttpServletRequest;
 /**
@@ -43 +49 @@
 
 @RunWith(value = SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"/spring-test-config/dataSource.xml", "/spring-test-config/mockDaoDispatcher.xml", 
-    "/spring-test-config/mockery.xml", })
+@ContextConfiguration(locations = { "/spring-test-config/mockery.xml", "/spring-test-config/mockDaoDispatcher.xml", 
+"/spring-test-config/mockAnnotationDao.xml","/spring-test-config/mockUserDao.xml", "/spring-test-config/mockNotebookDao.xml",
+"/spring-test-config/mockSourceDao.xml", "/spring-test-config/mockVersionDao.xml", "/spring-test-config/mockCachedRepresentationDao.xml"})
 public class AnnotationResourceTest {
     
@@ -93 +100 @@
         //int[] resultDelete = daoDispatcher.deleteAnnotation(annotationID);
        
+        final int[] mockDelete = new int[4];
+        mockDelete[0]=1; // # deleted annotations
+        mockDelete[3]=1; // # deleted annotation_prinipal_permissions
+        mockDelete[2]=2; // # deleted  annotations_target_sources, (5,3), (5,4)
+        mockDelete[3]=1; // # deletd sources, 4
         mockery.checking(new Expectations() {
             {  
@@ -99 +111 @@
                 
                 oneOf(daoDispatcher).deleteAnnotation(5);
-                will(returnValue(1));
+                will(returnValue(mockDelete));
             }
         });
@@ -111 +123 @@
      */
     @Test
-    public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException, ServletException {
+    public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException, ServletException, DatatypeConfigurationException {
         System.out.println("test createAnnotation");
         final Annotation annotationToAdd = new GenericType<Annotation>(){}.getRawClass().newInstance();
@@ -121 +133 @@
 //        Number newAnnotationID =  daoDispatcher.addUsersAnnotation(annotation, userID);
 //        Annotation newAnnotation = daoDispatcher.getAnnotation(newAnnotationID);
+        final String ownerString = "5";
+        final Number ownerID =  5;
+        final Number newAnnotationID = 6;
+        final Annotation addedAnnotation = annotationToAdd;
+        ResourceREF owner = new ResourceREF();
+        owner.setRef(ownerString);
+        addedAnnotation.setOwner(owner);
+        addedAnnotation.setURI((new AnnotationIdentifier()).toString());
         
+        addedAnnotation.setTimeStamp(Helpers.setXMLGregorianCalendar(Timestamp.valueOf("2013-08-12 11:25:00.383000")));
         mockery.checking(new Expectations() {
             {
                 oneOf(daoDispatcher).getUserInternalIdentifier(with(aNonNull(UserIdentifier.class)));
-                will(returnValue(5));
+                will(returnValue(ownerID));
                 
-                oneOf(daoDispatcher).addUsersAnnotation(annotationToAdd, 5);
-                will(returnValue(1));
+                oneOf(daoDispatcher).addUsersAnnotation(annotationToAdd, ownerID);
+                will(returnValue(newAnnotationID));
+                
+                oneOf(daoDispatcher).getAnnotation(newAnnotationID);
+                will(returnValue(addedAnnotation));
             }
         });
@@ -139 +163 @@
         
         JAXBElement<Annotation> result = annotationResource.createAnnotation(annotationToAdd); 
-        assertEquals(String.valueOf(5), result.getValue().getOwner().getRef());
-        assertFalse(null == result.getValue().getURI());
+        assertEquals(addedAnnotation.getOwner().getRef(), result.getValue().getOwner().getRef());
+        assertEquals(addedAnnotation.getURI(), result.getValue().getURI());
+        assertEquals(addedAnnotation.getHeadline(), result.getValue().getHeadline());
+        assertEquals(addedAnnotation.getPermissions(), result.getValue().getPermissions());
+        assertEquals(addedAnnotation.getTargetSources(), result.getValue().getTargetSources()); 
+        assertEquals(addedAnnotation.getTimeStamp(), result.getValue().getTimeStamp());
+        assertEquals(addedAnnotation.getBody(), result.getValue().getBody());
         
     }