Changeset 3190

Timestamp:

07/25/13 09:19:47 (11 years ago)

Author:

olhsha

Message:

getting getAllNotebooks is tested fully. Serialization works well for the output list of annotation identifiers.

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified) (2 diffs)
• test/java/eu/dasish/annotation/backend/rest/NotebooksTest.java (modified) (4 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java

@@ -135 +135 @@
             @DefaultValue("0") @QueryParam(value = "orderingMode") final int orderingMode) { 
         List<AnnotationIdentifier> annotationIds  = notebookDao.getAnnotationExternalIDs(new NotebookIdentifier(notebookId));                
+        
         return annotationIds;
         // TODO implement optional parameters!!

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

@@ -25 +25 @@
 import eu.dasish.annotation.backend.identifiers.AnnotationIdentifier;
 import eu.dasish.annotation.schema.Annotation;
-import eu.dasish.annotation.schema.Annotation;
 import eu.dasish.annotation.schema.ObjectFactory;
 import java.sql.SQLException;
 import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.MediaType;
-import javax.xml.bind.JAXBElement;
 import org.jmock.Expectations;
 import org.junit.Test;

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

@@ -54 +54 @@
     @Autowired
     private NotebookDao notebookDao;
-    @Autowired
-    private AnnotationDao annotationDao;    
     @Autowired
     private NotebookResource notebookResource;
@@ -167 +165 @@
     
     @Test
-    public void testAllAnnotations() {
+    public void testGetAllAnnotations() {
         System.out.println("test getAllAnnotations");        
         final String notebookIdentifier= TestBackendConstants._TEST_NOTEBOOK_1_EXT; 

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

@@ -26 +26 @@
 import eu.dasish.annotation.backend.identifiers.NotebookIdentifier;
 import eu.dasish.annotation.backend.identifiers.UserIdentifier;
-import eu.dasish.annotation.schema.Annotation;
 import eu.dasish.annotation.schema.Notebook;
 import eu.dasish.annotation.schema.NotebookInfo;
@@ -36 +35 @@
 import java.util.List;
 import java.util.UUID;
+import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.MediaType;
 import javax.xml.bind.JAXBElement;
@@ -175 +175 @@
      */
     @Test
-    @Ignore
     public void testGetAllAnnotations() {
-        System.out.println("testGetAllAnnotations");
-        
-        System.out.println("test GetMetadata");
-        
-        final String notebookIdentifier= TestBackendConstants._TEST_NOTEBOOK_1_EXT;
-        /*final int notebookID = TestBackendConstants._TEST_NOTEBOOK_1_INT;
-        final NotebookInfo testInfo = new ObjectFactory().createNotebookInfo();
-        
-        mockery.checking(new Expectations() {
-            {
-                oneOf(notebookDao).getNotebookID(new NotebookIdentifier(notebookIdentifier));                
-                will(returnValue(notebookID));
+        System.out.println("test GetMetadata");       
+        final String notebookIdentifier= TestBackendConstants._TEST_NOTEBOOK_1_EXT; 
+        final AnnotationIdentifier aIdOne= new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_1_EXT);
+        final AnnotationIdentifier aIdTwo= new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_2_EXT);
+        final List<AnnotationIdentifier> annotationIds = new ArrayList<AnnotationIdentifier>();
+        annotationIds.add(aIdOne);
+        annotationIds.add(aIdTwo);
+        
+        mockery.checking(new Expectations() {
+            {
+                oneOf(notebookDao).getAnnotationExternalIDs(new NotebookIdentifier(notebookIdentifier));                
+                will(returnValue(annotationIds));
                 
-                oneOf(notebookDao).getNotebookInfo(notebookID); 
-               will(returnValue(testInfo)); 
-            }
-        });*/
+            }
+        });
         
         final String requestUrl = "notebooks/"+notebookIdentifier;
-        
-        
         ClientResponse response = resource().path(requestUrl)
                 .queryParam("maximumAnnotations", "123")
@@ -205 +200 @@
                 .get(ClientResponse.class);
         System.out.println("requestUrl: " + requestUrl);
-        
-        
-        assertEquals(200, response.getStatus());
-        
+        assertEquals(200, response.getStatus());
+        List<AnnotationIdentifier> result = response.getEntity(new GenericType<List<AnnotationIdentifier>>() {});
+        assertEquals(aIdOne, result.get(0));
+        assertEquals(aIdTwo, result.get(1));
     }