Changeset 6063

Timestamp:

02/25/15 21:20:50 (9 years ago)

Author:

olhsha@mpi.nl

Message:

replacing ​olhsha@mpi.nl with ​alice@mail.domain in the code

Location:

DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend

Files:

• dao/impl/DBDispatcherTest.java (modified) (2 diffs)
• dao/impl/JdbcPrincipalDaoTest.java (modified) (2 diffs)
• rest/AnnotationResourceTest.java (modified) (6 diffs)
• rest/AnnotationsTest.java (modified) (1 diff)
• rest/DummyPrincipal.java (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java

@@ -1299 +1299 @@
         mockeryDao.checking(new Expectations() {
             {
-                oneOf(principalDao).principalExists("olhsha@mpi.nl");
+                oneOf(principalDao).principalExists("alice@mail.domain");
                 will(returnValue(true));
 
@@ -1307 +1307 @@
         PrincipalExists ex = null;
         try {
-            dbDispatcher.addPrincipal(principal, "olhsha@mpi.nl");
+            dbDispatcher.addPrincipal(principal, "alice@mail.domain");
         } catch (PrincipalExists e) {
             ex = e;

DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java

@@ -153 +153 @@
         System.out.println("test principalExists");      
         assertEquals(false,jdbcPrincipalDao.principalExists("guisil@mpi.nl"));       
-        assertTrue(jdbcPrincipalDao.principalExists("olhsha@mpi.nl"));
+        assertTrue(jdbcPrincipalDao.principalExists("alice@mail.domain"));
     }
     
@@ -184 +184 @@
 //        System.out.println("*****"); 
 //        System.out.println("generate hashes");
-//        System.out.println(Helpers.hashPswd("1234", 512, "olhsha@mpi.nl"));
+//        System.out.println(Helpers.hashPswd("1234", 512, "alice@mail.domain"));
 //        System.out.println(Helpers.hashPswd("5678", 512, "olasei@mpi.nl"));
 //        System.out.println("*****");

DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

@@ -92 +92 @@
         final Annotation expectedAnnotation = (new TestInstances("/api")).getAnnotationOne();
         annotationResource.setHttpServletRequest(mockRequest);
-        mockRequest.setRemoteUser("olhsha@mpi.nl");
+        mockRequest.setRemoteUser("alice@mail.domain");
         mockRequest.setContextPath("/backend");
         mockRequest.setServletPath("/api");
@@ -100 +100 @@
                 oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
-                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
+                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("alice@mail.domain");
                 will(returnValue(3));
 
@@ -134 +134 @@
 
         annotationResource.setHttpServletRequest(mockRequest);
-        mockRequest.setRemoteUser("olhsha@mpi.nl");
+        mockRequest.setRemoteUser("alice@mail.domain");
         mockRequest.setContextPath("/backend");
         mockRequest.setServletPath("/api");
@@ -142 +142 @@
                 oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
-                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
+                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("alice@mail.domain");
                 will(returnValue(3));
 
@@ -192 +192 @@
 
         annotationResource.setHttpServletRequest(mockRequest);
-        mockRequest.setRemoteUser("olhsha@mpi.nl");
+        mockRequest.setRemoteUser("alice@mail.domain");
          mockRequest.setContextPath("/backend");
         mockRequest.setServletPath("/api");
@@ -200 +200 @@
                 oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
-                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
+                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("alice@mail.domain");
                 will(returnValue(3));
 

DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

@@ -334 +334 @@
    
     protected Builder getAuthenticatedResource(WebResource resource) {
-        return resource.header(HttpHeaders.AUTHORIZATION, "Basic "  + new String(Base64.encode(DummyPrincipal.DUMMY_PRINCIPAL.getName()+":olhapassword")));
+        return resource.header(HttpHeaders.AUTHORIZATION, "Basic "  + new String(Base64.encode(DummyPrincipal.DUMMY_PRINCIPAL.getName()+":alicepassword")));
     }
 }

DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/DummyPrincipal.java

@@ -29 +29 @@
 
     public static final DummyPrincipal DUMMY_ADMIN_PRINCIPAL = new DummyPrincipal("JUnit.Admin@test.com");
-    public static final DummyPrincipal DUMMY_PRINCIPAL = new DummyPrincipal("olhsha@mpi.nl");
+    public static final DummyPrincipal DUMMY_PRINCIPAL = new DummyPrincipal("alice@mail.domain");
     public static final PrincipalCredentials DUMMY_CREDENTIALS = new PrincipalCredentials(DUMMY_PRINCIPAL) {