Changeset 3450

Timestamp:

08/20/13 15:54:35 (11 years ago)

Author:

olhsha

Message:

AnnotationResource? and its test are adjusted, however: there must an interface for DaoDispatcher? to be able to mock it. Moreover make a bean for it as well, and remove comnent annotation, so it can be autowired.

Location:

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

Files:

• nb-configuration.xml (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/MockObjectsFactory.java (modified) (2 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDaoTest.java (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified) (10 diffs)
• src/test/resources/spring-test-config/mockDaoDispatcher.xml (added)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml

@@ -20 +20 @@
         <config-files>
             <config-file>src/main/resources/spring-config/sourceDao.xml</config-file>
-            <config-file>src/main/resources/spring-config/VersionDao.xml</config-file>
-            <config-file>src/main/resources/spring-config/CachedRepresentationDao.xml</config-file>
+            <config-file>src/main/resources/spring-config/versionDao.xml</config-file>
+            <config-file>src/main/resources/spring-config/cachedRepresentationDao.xml</config-file>
             <config-file>src/test/resources/spring-test-config/mockVersionDao.xml</config-file>
-            <config-file>src/test/resources/spring-test-config/mockCachedRepresenationDao.xml</config-file>
+            <config-file>src/test/resources/spring-test-config/mockDaoDispatcher.xml</config-file>
         </config-files>
         <config-file-groups/>

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

@@ -24 +24 @@
 import eu.dasish.annotation.backend.dao.UserDao;
 import eu.dasish.annotation.backend.dao.VersionDao;
+import eu.dasish.annotation.backend.rest.DaoDispatcher;
 import org.jmock.Mockery;
 
@@ -63 +64 @@
         return context.mock(VersionDao.class);
     }
+    
+    public DaoDispatcher newDaoDispatcher() {
+        return context.mock(DaoDispatcher.class);
+    }
 }

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

@@ -232 +232 @@
         assertEquals(6, newAnnotationID);
         
+        // checking
         Annotation addedAnnotation= jdbcAnnotationDao.getAnnotationWithoutSources(6);
         assertFalse(null == addedAnnotation.getURI());

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

@@ -123 +123 @@
         
         Number result = jdbcCachedRepresentationDao.addCachedRepresentationInfo(cached);
+        // checking
         CachedRepresentationInfo addedCached = jdbcCachedRepresentationDao.getCachedRepresentationInfo(result);
         assertEquals(8, result.intValue());

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

@@ -133 +133 @@
         Number result = jdbcSourceDao.addSource(freshSource);
         assertEquals(6, result);
+        // detailed checking
         Source addedSource = jdbcSourceDao.getSource(result);
         assertEquals(link, addedSource.getLink());

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

@@ -109 +109 @@
         Number result = jdbcVersionDao.addVersion(freshVersion);
         assertEquals(8, result);
+        // detailed checking
         Version addedVersion = jdbcVersionDao.getVersion(result);
         assertFalse(null == addedVersion.getVersion()); // extend once "version" information is fixed, and becomes different from externalID

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

@@ -21 +21 @@
 import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
-import eu.dasish.annotation.backend.dao.AnnotationDao;
-import eu.dasish.annotation.backend.dao.NotebookDao;
-import eu.dasish.annotation.backend.dao.SourceDao;
-import eu.dasish.annotation.backend.dao.UserDao;
 import eu.dasish.annotation.backend.identifiers.AnnotationIdentifier;
 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;
@@ -41 +36 @@
 import java.lang.InstantiationException;
 import javax.servlet.ServletException;
-import org.junit.Ignore;
 import org.springframework.mock.web.MockHttpServletRequest;
 /**
@@ -49 +43 @@
 
 @RunWith(value = SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"/spring-test-config/dataSource.xml", "/spring-test-config/mockAnnotationDao.xml", 
-    "/spring-test-config/mockSourceDao.xml",
-    "/spring-test-config/mockUserDao.xml", "/spring-test-config/mockNotebookDao.xml", "/spring-test-config/mockery.xml"})
+@ContextConfiguration(locations = {"/spring-test-config/dataSource.xml", "/spring-test-config/mockDaoDispatcher.xml", 
+    "/spring-test-config/mockery.xml", })
 public class AnnotationResourceTest {
     
@@ -57 +50 @@
     private Mockery mockery;
     @Autowired
-    private AnnotationDao annotationDao;
-    @Autowired
-    private UserDao userDao;
-    @Autowired
-    private NotebookDao notebookDao;  
-    @Autowired
-    private SourceDao sourceDao;
-    
+    private DaoDispatcher daoDispatcher;
     @Autowired
     private AnnotationResource annotationResource;
@@ -76 +62 @@
      */
     @Test
-    @Ignore
     public void testGetAnnotation() throws SQLException {
         System.out.println("getAnnotation");
@@ -82 +67 @@
         final int annotationID = 2;        
         final Annotation expectedAnnotation = (new TestInstances()).getAnnotationOne();
-        // the result of the mocking chain is the same as the expected annotation.        
-//        mockery.checking(new Expectations() {
-//            {
-//                oneOf(annotationDao).getInternalID(new AnnotationIdentifier(annotationIdentifier));                
-//                will(returnValue(annotationID));                
-//                
-//                oneOf(annotationDao).getAnnotation(annotationID);                
-//                will(returnValue(expectedAnnotation));
-//            }
-//        });
+        
+        //final Number annotationID = daoDispatcher.getAnnotationInternalIdentifier(new AnnotationIdentifier(annotationIdentifier));
+        //final Annotation annotation = daoDispatcher.getAnnotation(annotationID);
+        mockery.checking(new Expectations() {
+            {
+                oneOf(daoDispatcher).getAnnotationInternalIdentifier(with(aNonNull(AnnotationIdentifier.class)));                
+                will(returnValue(annotationID));                
+                
+                oneOf(daoDispatcher).getAnnotation(annotationID);                
+                will(returnValue(expectedAnnotation));
+            }
+        });
          
         JAXBElement<Annotation> result = annotationResource.getAnnotation(annotationIdentifier);
@@ -103 +90 @@
     public void testDeleteAnnotation() throws SQLException {
         System.out.println("deleteAnnotation");
-        
+        //final Number annotationID = daoDispatcher.getAnnotationInternalIdentifier(new AnnotationIdentifier(annotationIdentifier));
+        //int[] resultDelete = daoDispatcher.deleteAnnotation(annotationID);
        
         mockery.checking(new Expectations() {
             {  
-                oneOf(annotationDao).getInternalID(new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_5_EXT));                
+                oneOf(daoDispatcher).getAnnotationInternalIdentifier(with(aNonNull(AnnotationIdentifier.class)));              
                 will(returnValue(5));     
                 
-                oneOf(annotationDao).deleteAnnotation(5);
+                oneOf(daoDispatcher).deleteAnnotation(5);
                 will(returnValue(1));
             }
@@ -117 +105 @@
         String result = annotationResource.deleteAnnotation(TestBackendConstants._TEST_ANNOT_5_EXT);
         assertEquals("1", result);
-        
-         // now, try to delete the same annotation one more time
-        // if it has been already deleted then the method under testing should return 0
-        mockery.checking(new Expectations() {
-            {
-                oneOf(annotationDao).getInternalID(new AnnotationIdentifier(TestBackendConstants._TEST_ANNOT_5_EXT));                
-                will(returnValue(5));
-                
-                oneOf(annotationDao).deleteAnnotation(5);
-                will(returnValue(0));
-            }
-        });
-        
-        result = annotationResource.deleteAnnotation(TestBackendConstants._TEST_ANNOT_5_EXT);
-        assertEquals("0", result);
     }
     
@@ -138 +111 @@
      */
     @Test
-    @Ignore
     public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException, ServletException {
         System.out.println("test createAnnotation");
         final Annotation annotationToAdd = new GenericType<Annotation>(){}.getRawClass().newInstance();
         
-        final Annotation addedAnnotation = annotationToAdd;
-        final AnnotationIdentifier annotationIdentifier = new GenericType<AnnotationIdentifier>(){}.getRawClass().newInstance();
-        addedAnnotation.setURI(annotationIdentifier.toString());
-        ResourceREF ownerRef = new ResourceREF();
-        ownerRef.setRef(String.valueOf(5));
-        addedAnnotation.setOwner(ownerRef);
-       
-        final UserIdentifier owner = new UserIdentifier(TestBackendConstants._TEST_USER_5_EXT_ID);
+//        Number userID = null;
+//        if (remoteUser != null) {
+//            userID = daoDispatcher.getUserInternalIdentifier(new UserIdentifier(remoteUser));
+//        }
+//        Number newAnnotationID =  daoDispatcher.addUsersAnnotation(annotation, userID);
+//        Annotation newAnnotation = daoDispatcher.getAnnotation(newAnnotationID);
         
-//        mockery.checking(new Expectations() {
-//            {
-//                oneOf(userDao).getInternalID(owner);
-//                will(returnValue(5));
-//                
-//                oneOf(annotationDao).addAnnotation(annotationToAdd, 5);
-//                will(returnValue(addedAnnotation));
-//            
-//                oneOf(permissionsDao).addAnnotationPrincipalPermission(annotationIdentifier, owner, Permission.OWNER);
-//                will(returnValue(1));
-//            }
-//        });
+        mockery.checking(new Expectations() {
+            {
+                oneOf(daoDispatcher).getUserInternalIdentifier(with(aNonNull(UserIdentifier.class)));
+                will(returnValue(5));
+                
+                oneOf(daoDispatcher).addUsersAnnotation(annotationToAdd, 5);
+                will(returnValue(1));
+            }
+        });
         
         
@@ -173 +140 @@
         JAXBElement<Annotation> result = annotationResource.createAnnotation(annotationToAdd); 
         assertEquals(String.valueOf(5), result.getValue().getOwner().getRef());
-        assertEquals(annotationIdentifier.toString(), result.getValue().getURI());
-        
+        assertFalse(null == result.getValue().getURI());
         
     }