Changeset 5385 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java

Timestamp:

06/24/14 17:43:30 (10 years ago)

Author:

olhsha@mpi.nl

Message:

ref --> href
+ xml:id for instances
refactoring

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (modified) (11 diffs)

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

@@ -18 +18 @@
 package eu.dasish.annotation.backend.dao.impl;
 
-import eu.dasish.annotation.backend.Helpers;
+
 import eu.dasish.annotation.backend.NotInDataBaseException;
 import eu.dasish.annotation.backend.PrincipalCannotBeDeleted;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
 import eu.dasish.annotation.schema.Access;
@@ -45 +44 @@
     @Autowired
     JdbcPrincipalDao jdbcPrincipalDao;
-    TestInstances testInstances = new TestInstances(TestBackendConstants._TEST_SERVLET_URI);
     
      /**
@@ -52 +50 @@
      */
     @Test
-    public void testStringURItoExternalID() {
-        System.out.println("test stringURItoExternalID");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+    public void testHrefToExternalID() {
+        System.out.println("test hrefToExternalID");
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_principals + randomUUID;
-        String externalID = jdbcPrincipalDao.stringURItoExternalID(uri);
+        String uri = "/api/principals/" + randomUUID;
+        String externalID = jdbcPrincipalDao.hrefToExternalID(uri).toString();
         assertEquals(randomUUID, externalID);
     }
@@ -68 +66 @@
     public void testExternalIDtoURI() {
         System.out.println("test stringURItoExternalID");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_principals+randomUUID;
-        String uriResult = jdbcPrincipalDao.externalIDtoURI(randomUUID);
+        String uri = "/api/principals/"+randomUUID;
+        String uriResult = jdbcPrincipalDao.externalIDtoHref(randomUUID);
         assertEquals(uri, uriResult);
     }
@@ -98 +96 @@
     @Test
     public void testGetExternalID() {
-        UUID testOne = jdbcPrincipalDao.getExternalID(3);
-        assertEquals("00000000-0000-0000-0000-000000000113", testOne.toString());
+        assertEquals("00000000-0000-0000-0000-000000000113", jdbcPrincipalDao.getExternalID(3).toString());
 
     }
@@ -106 +103 @@
     public void testGetPrincipal() {
         System.out.println("test getPrincipal");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         Principal result = jdbcPrincipalDao.getPrincipal(1);
         assertEquals("Twan", result.getDisplayName());
         assertEquals("Twan.Goosen@mpi.nl", result.getEMail());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_principals+"00000000-0000-0000-0000-000000000111", result.getURI());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000111", result.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000111", result.getId());
     }
 
@@ -116 +114 @@
     public void testAddPrincipal() throws NotInDataBaseException{
         System.out.println("test addPrincipal");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         String freshPrincipalName = "Guilherme";
         String freshPrincipalEmail = "guisil@mpi.nl";
@@ -129 +127 @@
         assertEquals(freshPrincipalName, addedPrincipal.getDisplayName());
         assertEquals(freshPrincipalEmail, addedPrincipal.getEMail());
-        assertFalse(null == jdbcPrincipalDao.stringURItoExternalID(addedPrincipal.getURI()));
+        assertEquals(addedPrincipal.getHref(), "/api/principals/"+addedPrincipal.getId());
+        
     }
 
@@ -135 +134 @@
     public void testDeletePrincipal() throws PrincipalCannotBeDeleted{
         System.out.println("test deletePrincipal");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
 
         int result = jdbcPrincipalDao.deletePrincipal(10);
@@ -152 +151 @@
     @Test
     public void tesPrincipalExists() {
-        System.out.println("test principalExists");
-        //jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);        
+        System.out.println("test principalExists");      
         assertEquals(false,jdbcPrincipalDao.principalExists("guisil@mpi.nl"));       
         assertTrue(jdbcPrincipalDao.principalExists("olhsha@mpi.nl"));
@@ -170 +168 @@
         assertEquals(expResult, result);
     }
-    
-   @Test
-   public void generateHashes() {
-        System.out.println("*****"); 
-        System.out.println("generate hashes");
-        System.out.println(Helpers.hashPswd("1234", 512, "olhsha@mpi.nl"));
-        System.out.println(Helpers.hashPswd("5678", 512, "olasei@mpi.nl"));
-        System.out.println("*****");
-        
-    }
+//    
+//   @Test
+//   public void generateHashes() {
+//        System.out.println("*****"); 
+//        System.out.println("generate hashes");
+//        System.out.println(Helpers.hashPswd("1234", 512, "olhsha@mpi.nl"));
+//        System.out.println(Helpers.hashPswd("5678", 512, "olasei@mpi.nl"));
+//        System.out.println("*****");
+//        
+//    }
 
 }