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

Timestamp:

08/22/13 16:28:29 (11 years ago)

Author:

olhsha

Message:

replacing setURI(externa_id) with setURI(serviceURI_externalId). The implementation idea has been tested on getAnnotation method. Works. Now it must be implemented for get-method of the other resources for the other resources.

File:

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

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

@@ -75 +75 @@
         mockery.checking(new Expectations() {
             {
+                oneOf(daoDispatcher).setServiceURI(with(any(String.class)));
+                will(doAll());
+                
                 oneOf(daoDispatcher).getAnnotationInternalIdentifier(with(any(UUID.class)));                
                 will(returnValue(annotationID));                
@@ -82 +85 @@
             }
         });
+        
+        final MockHttpServletRequest httpServletRequest = new MockHttpServletRequest();
+        httpServletRequest.setServletPath(TestBackendConstants._TEST_SERVLET_URI);        
+        annotationResource.setHttpRequest(httpServletRequest);
          
         JAXBElement<Annotation> result = annotationResource.getAnnotation(externalIDstring);
@@ -141 +148 @@
         mockery.checking(new Expectations() {
             {
+                oneOf(daoDispatcher).setServiceURI(with(any(String.class)));
+                will(doAll());
+                
                 oneOf(daoDispatcher).getUserInternalIdentifier(with(aNonNull(UUID.class)));
                 will(returnValue(ownerID));
@@ -155 +165 @@
         
         final MockHttpServletRequest httpServletRequest = new MockHttpServletRequest();
-        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_USER_5_EXT_ID);        
+        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_USER_5_EXT_ID);         
+        httpServletRequest.setServletPath(TestBackendConstants._TEST_SERVLET_URI);     
         annotationResource.setHttpRequest(httpServletRequest);