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

Timestamp:

12/10/13 15:18:42 (10 years ago)

Author:

olhsha

Message:

lintegrity unit test reconstructed so it does not mock any more. getAnnotation works (the others are "ignored"). Needs refactoring (the subdirectory with beans and DummySecurityFilter? class.

File:

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

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

@@ -18 +18 @@
 package eu.dasish.annotation.backend.rest;
 
-import eu.dasish.annotation.backend.dao.DBIntegrityService;
 import com.sun.jersey.api.client.ClientResponse;
-import eu.dasish.annotation.backend.Helpers;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
+import com.sun.jersey.core.util.Base64;
+import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
+import com.sun.jersey.test.framework.JerseyTest;
+import com.sun.jersey.test.framework.WebAppDescriptor;
 import eu.dasish.annotation.backend.TestBackendConstants;
+import eu.dasish.annotation.backend.TestInstances;
+import eu.dasish.annotation.backend.dao.impl.JdbcResourceDaoTest;
 import eu.dasish.annotation.schema.Annotation;
 import eu.dasish.annotation.schema.ObjectFactory;
@@ -27 +34 @@
 import eu.dasish.annotation.schema.TargetInfo;
 import eu.dasish.annotation.schema.TargetInfoList;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Scanner;
 import java.util.UUID;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
-import org.jmock.Expectations;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.request.RequestContextListener;
+
 /**
  *
  * @author olhsha
  */
-public class AnnotationsTest extends ResourcesTest{
-    
-    private DBIntegrityService daoDispatcher;
-    
-    private UriInfo uriInfo;
+@RunWith(value = SpringJUnit4ClassRunner.class)
+@ContextConfiguration({"/spring-integrity-test-config/dataSource.xml"})
+public class AnnotationsTest extends JerseyTest {    
+    
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
     
     public AnnotationsTest() {
-        super(AnnotationResource.class.getPackage().getName());        
-        daoDispatcher = webAppContext.getBean(DBIntegrityService.class);
-        uriInfo = webAppContext.getBean(UriInfo.class);
-    }
-    
-
-     /**
-     * Test of getAnnotation method, of class annotationResource. Get <aid>.
-     * GET api/annotations/<aid>
+        super(new WebAppDescriptor.Builder(AnnotationResource.class.getPackage().getName())
+                .servletClass(SpringServlet.class)
+                .contextParam("contextConfigLocation", "classpath*:spring-integrity-test-config/*.xml")
+                .addFilter(DummySecurityFilter.class, "DummySecurityFilter")
+                .requestListenerClass(RequestContextListener.class)
+                .contextListenerClass(ContextLoaderListener.class)
+                .build());
+        
+    }
+    
+    private String getNormalisedSql() throws FileNotFoundException, URISyntaxException {
+        // remove the unsupported sql for the test
+        final URL sqlUrl = JdbcResourceDaoTest.class.getResource("/sql/DashishAnnotatorCreate.sql");
+        String sqlString = new Scanner(new File(sqlUrl.toURI()), "UTF8").useDelimiter("\\Z").next();
+        for (String unknownToken : new String[]{
+                    "SET client_encoding",
+                    "CREATE DATABASE",
+                    "\\\\connect",
+                    "SET default_with_oids",
+                    "ALTER SEQUENCE",
+                    "ALTER TABLE ONLY",
+                    "ADD CONSTRAINT",
+                    "CREATE INDEX", // "ALTER TABLE ONLY [a-z]* ALTER COLUMN",
+                // "ALTER TABLE ONLY [^A]* ADD CONSTRAINT"
+                }) {
+            sqlString = sqlString.replaceAll(unknownToken, "-- " + unknownToken);
+        }
+        // obsolete(?) Peter's stuff, before body has been decided to be a text with its mimetype: sqlString = sqlString.replaceAll("body_xml xml", "body_xml text");
+        sqlString = sqlString.replaceAll("CACHE 1;", "; -- CACHE 1;");
+        //sqlString = sqlString.replaceAll("UUID", "text");
+        sqlString = sqlString.replaceAll("SERIAL NOT NULL", "INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY");
+        return sqlString;
+    }
+    
+    private String getTestDataInsertSql() throws FileNotFoundException, URISyntaxException {
+        final URL sqlUrl = AnnotationsTest.class.getResource("/test-data/InsertTestData.sql");
+        String sqlString = new Scanner(new File(sqlUrl.toURI()), "UTF8").useDelimiter("\\Z").next();
+        return sqlString;
+    }
+    
+    
+    
+    @Override
+    @Before
+    public void setUp() throws DataAccessException, FileNotFoundException, URISyntaxException, Exception {
+        super.setUp();
+        jdbcTemplate.execute("DROP SCHEMA PUBLIC CASCADE");
+        // consume the DashishAnnotatorCreate sql script to create the database
+        jdbcTemplate.execute(getNormalisedSql());
+        jdbcTemplate.execute(getTestDataInsertSql());
+    }
+
+    
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+    }
+    /**
+     * Test of getAnnotation method, of class annotationResource. Get <aid>. GET
+     * api/annotations/<aid>
+     */
+    @Test
+    public void testGetAnnotation() throws SQLException, DatatypeConfigurationException {
+        System.out.println("testGetAnnotation");
+        final String externalIDstring = TestBackendConstants._TEST_ANNOT_2_EXT;
+        final Annotation testAnnotation = (new TestInstances(resource().getURI().toString())).getAnnotationOne();        
+        
+        final String requestUrl = "annotations/" + externalIDstring;
+        System.out.println("requestUrl: " + requestUrl);
+        
+        Builder responseBuilder = getAuthenticatedResource(resource().path(requestUrl)).accept(MediaType.TEXT_XML);
+        
+        ClientResponse response = responseBuilder.get(ClientResponse.class);        
+        
+        assertEquals(200, response.getStatus());
+        Annotation entity = response.getEntity(Annotation.class);
+        assertEquals(testAnnotation.getBody().getTextBody().getValue(), entity.getBody().getTextBody().getValue());
+        assertEquals(testAnnotation.getHeadline(), entity.getHeadline());
+        assertEquals(testAnnotation.getOwnerRef(), entity.getOwnerRef());
+        assertEquals(3, entity.getPermissions().getUserWithPermission().size());
+        assertEquals("owner", entity.getPermissions().getUserWithPermission().get(0).getPermission().value());        
+        assertEquals(resource().getURI()+"users/"+TestBackendConstants._TEST_USER_3_EXT_ID, entity.getPermissions().getUserWithPermission().get(0).getRef()); 
+        assertEquals("writer", entity.getPermissions().getUserWithPermission().get(1).getPermission().value());
+        assertEquals(resource().getURI()+"users/"+TestBackendConstants._TEST_USER_4_EXT_ID, entity.getPermissions().getUserWithPermission().get(1).getRef()); 
+        assertEquals("reader", entity.getPermissions().getUserWithPermission().get(2).getPermission().value()); 
+        assertEquals(resource().getURI()+"users/"+TestBackendConstants._TEST_USER_5_EXT_ID, entity.getPermissions().getUserWithPermission().get(2).getRef()); 
+        assertEquals(2, entity.getTargets().getTargetInfo().size());
+        assertEquals(resource().getURI().toString()+"targets/"+TestBackendConstants._TEST_Target_1_EXT_ID, entity.getTargets().getTargetInfo().get(0).getRef());
+        assertEquals(resource().getURI().toString()+"targets/"+TestBackendConstants._TEST_Target_2_EXT_ID, entity.getTargets().getTargetInfo().get(1).getRef());
+        assertEquals(testAnnotation.getLastModified(), entity.getLastModified());
+        assertEquals(resource().getURI()+requestUrl, entity.getURI());
+    }
+
+    /**
+     * Test of deleteAnnotation method, of class AnnotationResource. Delete
+     * <nid>. DELETE api/annotations/<aid>
      */
     @Test
     @Ignore
-    public void testGetAnnotation() throws SQLException, DatatypeConfigurationException{
-        System.out.println("testGetAnnotation");
-        final String externalIDstring= TestBackendConstants._TEST_ANNOT_2_EXT;
-        final int annotationID = 2;
-        final Annotation testAnnotation = new Annotation();
-        testAnnotation.setOwnerRef("5");
-        testAnnotation.setURI(externalIDstring);
-        testAnnotation.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP));
-        
+    public void testDeleteAnnotation() throws SQLException {
+        System.out.println("testDeleteAnnotation");
         //final Number annotationID = daoDispatcher.getAnnotationInternalIdentifier(UUID.fromString(UUID));
-        //final Annotation annotation = daoDispatcher.getAnnotation(annotationID);
-        mockeryRest.checking(new Expectations() {
-            {
-                 
-                oneOf(uriInfo).getBaseUri();
-                will(returnValue("http://localhost:8080/annotator-backend/api/"));
-                
-                
-                oneOf(daoDispatcher).setServiceURI(with(any(String.class)));
-                will(doAll());
-                
-                oneOf(daoDispatcher).getAnnotationInternalIdentifier(with(aNonNull(UUID.class)));                
-                will(returnValue(annotationID));                
-                
-                oneOf(daoDispatcher).getAnnotation(annotationID);                
-                will(returnValue(testAnnotation));
-            }
-        });
-        
-        final String requestUrl = "annotations/" + externalIDstring;
-        System.out.println("requestUrl: " + requestUrl);
-        ClientResponse response = resource().path(requestUrl).accept(MediaType.TEXT_XML).get(ClientResponse.class);
-        assertEquals(200, response.getStatus());
-        Annotation entity = response.getEntity(Annotation.class);
-        assertEquals(testAnnotation.getBody(), entity.getBody());
-        assertEquals(testAnnotation.getHeadline(), entity.getHeadline());
-        assertEquals(testAnnotation.getOwnerRef(), entity.getOwnerRef());
-        assertEquals(testAnnotation.getPermissions(), entity.getPermissions());
-        assertEquals(testAnnotation.getTargets(), entity.getTargets());
-        assertEquals(testAnnotation.getLastModified(), entity.getLastModified());
-        assertEquals(testAnnotation.getURI(), entity.getURI());
-    }  
-    
-     /**
-     * Test of deleteAnnotation method, of class AnnotationResource. Delete <nid>.
-     * DELETE api/annotations/<aid>
-     */
-    @Test
-    @Ignore
-    public void testDeleteAnnotation() throws SQLException{
-        System.out.println("testDeleteAnnotation");
-         //final Number annotationID = daoDispatcher.getAnnotationInternalIdentifier(UUID.fromString(UUID));
         //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_Targets, (5,3), (5,4)
-        mockDelete[3]=1; // # deletd Targets, 4
-        mockeryRest.checking(new Expectations() {
-            {  
-                  
-                oneOf(uriInfo).getBaseUri();
-                will(returnValue("http://localhost:8080/annotator-backend/api/"));
-                
-                
-                oneOf(daoDispatcher).setServiceURI(with(any(String.class)));
-                will(doAll());
-                
-                oneOf(daoDispatcher).getAnnotationInternalIdentifier(with(aNonNull(UUID.class)));              
-                will(returnValue(5));     
-                
-                oneOf(daoDispatcher).deleteAnnotation(5);
-                will(returnValue(mockDelete));
-            }
-        });
+        mockDelete[0] = 1; // # deleted annotations
+        mockDelete[3] = 1; // # deleted annotation_prinipal_permissions
+        mockDelete[2] = 2; // # deleted  annotations_target_Targets, (5,3), (5,4)
+        mockDelete[3] = 1; // # deletd Targets, 4
+        
+        final String baseURI = this.getBaseURI().toString();
+        
         final String requestUrl = "annotations/" + TestBackendConstants._TEST_ANNOT_5_EXT;
         System.out.println("requestUrl: " + requestUrl);
@@ -146 +194 @@
         assertEquals("1 annotation(s) deleted.", response.getEntity(String.class));
         
-      
-    }
+        
+    }
+
     /**
-     * Test of createAnnotation method, of class AnnotationResource. 
-     * POST api/annotations/
+     * Test of createAnnotation method, of class AnnotationResource. POST
+     * api/annotations/
      */
     @Test
     @Ignore
-    public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException, DatatypeConfigurationException, Exception{
+    public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException, DatatypeConfigurationException, Exception {
         System.out.println("test createAnnotation");
         // Peter's workaround on absence of "ObjectFactory.create... for annotations        
@@ -160 +209 @@
         
         final String ownerString = "5";
-        final Number ownerID =  5;
+        final Number ownerID = 5;
         final Number newAnnotationID = 6;
         
@@ -173 +222 @@
         addedAnnotation.setTargets(TargetInfoList);
         addedAnnotation.setOwnerRef(ownerString);
-        addedAnnotation.setURI(TestBackendConstants._TEST_SERVLET_URI_annotations+UUID.randomUUID().toString());        
+        addedAnnotation.setURI(TestBackendConstants._TEST_SERVLET_URI_annotations + UUID.randomUUID().toString());        
         addedAnnotation.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP));        
         TargetInfo TargetInfo = new TargetInfo();
@@ -179 +228 @@
         TargetInfo.setRef(UUID.randomUUID().toString());
         TargetInfo.setVersion("vandaag");
-        TargetInfoList.getTargetInfo().add(TargetInfo); 
+        TargetInfoList.getTargetInfo().add(TargetInfo);        
         
         final List<Number> Targets = new ArrayList<Number>();
         Targets.add(6);
         
-        mockeryRest.checking(new Expectations() {
-            {
-                 
-                oneOf(uriInfo).getBaseUri();
-                will(returnValue("http://localhost:8080/annotator-backend/api/"));
-                
-                
-                oneOf(daoDispatcher).setServiceURI(with(any(String.class)));
-                will(doAll());
-                
-                oneOf(daoDispatcher).getUserInternalIdentifier(with(any(UUID.class)));
-                will(returnValue(ownerID));
-                
-                //oneOf(daoDispatcher).addUsersAnnotation(annotToAddJB, ownerID);
-                oneOf(daoDispatcher).addUsersAnnotation(with(aNonNull(Number.class)), with(aNonNull(Annotation.class)));
-                will(returnValue(newAnnotationID));
-                
-                oneOf(daoDispatcher).getAnnotation(newAnnotationID);
-                will(returnValue(addedAnnotation));
-                
-                oneOf(daoDispatcher).getTargetsWithNoCachedRepresentation(newAnnotationID);
-                will(returnValue(Targets));
-            }
-        });
-        
-              
+        final String baseURI = this.getBaseURI().toString();
         
         final String requestUrl = "annotations";
@@ -216 +240 @@
         assertEquals(200, response.getStatus());
         
-        ResponseBody entity = response.getEntity(ResponseBody.class); 
+        ResponseBody entity = response.getEntity(ResponseBody.class);        
         Annotation entityA = entity.getAnnotation();
         assertEquals(addedAnnotation.getBody(), entityA.getBody());
@@ -227 +251 @@
         assertEquals(addedAnnotation.getOwnerRef(), entityA.getOwnerRef());
     }
+    
+    
+   
+    protected Builder getAuthenticatedResource(WebResource resource) {
+        return resource.header(HttpHeaders.AUTHORIZATION, "Basic "  + new String(Base64.encode(DummyPrincipal.DUMMY_PRINCIPAL.getName()+":olhapassword")));
+    }
 }