Changeset 3154

Timestamp:

07/18/13 15:35:59 (11 years ago)

Author:

olhsha

Message:

adding and testing AnnotationResource? class with getAnnotation(String externalID). So, all the vertical for annotations is walked through.

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/NotebookDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (added)
• test/java/eu/dasish/annotation/backend/TestInstances.java (added)
• test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (added)
• test/java/eu/dasish/annotation/backend/rest/AnnotationsURLTest.java (added)
• test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified) (1 diff)
• test/resources/spring-test-config/mockAnnotationDao.xml (modified) (1 diff)

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

@@ -21 +21 @@
 import eu.dasish.annotation.backend.identifiers.NotebookIdentifier;
 import eu.dasish.annotation.backend.identifiers.UserIdentifier;
-import eu.dasish.annotation.schema.AnnotationInfo;
 import eu.dasish.annotation.schema.Annotations;
 import eu.dasish.annotation.schema.Notebook;

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

@@ -171 +171 @@
            // TODO: add source, also to the database
            
+           // TODO add external reference 
+           
            result.setBody(convertToAnnotationBody(rs.getString("body_xml")));
            return result;

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

@@ -44 +44 @@
  */
 @RunWith(value = SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"/spring-test-config/dataSource.xml", "/spring-test-config/mockNotebookDao.xml", "/spring-test-config/mockery.xml"})
+@ContextConfiguration(locations = {"/spring-test-config/dataSource.xml", "/spring-test-config/mockAnnotationDao.xml", "/spring-test-config/mockNotebookDao.xml", "/spring-test-config/mockery.xml"})
 public class NotebookResourceTest {
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/spring-test-config/mockAnnotationDao.xml

@@ -26 +26 @@
           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
 ">
-
+    <!-- Context for testing the annotations service with mock implementations -->
+           
+    <!-- Mocked annotations -->
     <bean id="annotationDao" factory-bean="mockObjectsFactory" factory-method="newAnnotationDao" />