Changeset 6063 for DASISH


Ignore:
Timestamp:
02/25/15 21:20:50 (10 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:
5 edited

Legend:

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

    r6021 r6063  
    12991299        mockeryDao.checking(new Expectations() {
    13001300            {
    1301                 oneOf(principalDao).principalExists("olhsha@mpi.nl");
     1301                oneOf(principalDao).principalExists("alice@mail.domain");
    13021302                will(returnValue(true));
    13031303
     
    13071307        PrincipalExists ex = null;
    13081308        try {
    1309             dbDispatcher.addPrincipal(principal, "olhsha@mpi.nl");
     1309            dbDispatcher.addPrincipal(principal, "alice@mail.domain");
    13101310        } catch (PrincipalExists e) {
    13111311            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

    r5468 r6063  
    153153        System.out.println("test principalExists");     
    154154        assertEquals(false,jdbcPrincipalDao.principalExists("guisil@mpi.nl"));       
    155         assertTrue(jdbcPrincipalDao.principalExists("olhsha@mpi.nl"));
     155        assertTrue(jdbcPrincipalDao.principalExists("alice@mail.domain"));
    156156    }
    157157   
     
    184184//        System.out.println("*****");
    185185//        System.out.println("generate hashes");
    186 //        System.out.println(Helpers.hashPswd("1234", 512, "olhsha@mpi.nl"));
     186//        System.out.println(Helpers.hashPswd("1234", 512, "alice@mail.domain"));
    187187//        System.out.println(Helpers.hashPswd("5678", 512, "olasei@mpi.nl"));
    188188//        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

    r5850 r6063  
    9292        final Annotation expectedAnnotation = (new TestInstances("/api")).getAnnotationOne();
    9393        annotationResource.setHttpServletRequest(mockRequest);
    94         mockRequest.setRemoteUser("olhsha@mpi.nl");
     94        mockRequest.setRemoteUser("alice@mail.domain");
    9595        mockRequest.setContextPath("/backend");
    9696        mockRequest.setServletPath("/api");
     
    100100                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
    101101
    102                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
     102                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("alice@mail.domain");
    103103                will(returnValue(3));
    104104
     
    134134
    135135        annotationResource.setHttpServletRequest(mockRequest);
    136         mockRequest.setRemoteUser("olhsha@mpi.nl");
     136        mockRequest.setRemoteUser("alice@mail.domain");
    137137        mockRequest.setContextPath("/backend");
    138138        mockRequest.setServletPath("/api");
     
    142142                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
    143143
    144                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
     144                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("alice@mail.domain");
    145145                will(returnValue(3));
    146146
     
    192192
    193193        annotationResource.setHttpServletRequest(mockRequest);
    194         mockRequest.setRemoteUser("olhsha@mpi.nl");
     194        mockRequest.setRemoteUser("alice@mail.domain");
    195195         mockRequest.setContextPath("/backend");
    196196        mockRequest.setServletPath("/api");
     
    200200                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
    201201
    202                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
     202                oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("alice@mail.domain");
    203203                will(returnValue(3));
    204204
  • DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

    r5850 r6063  
    334334   
    335335    protected Builder getAuthenticatedResource(WebResource resource) {
    336         return resource.header(HttpHeaders.AUTHORIZATION, "Basic "  + new String(Base64.encode(DummyPrincipal.DUMMY_PRINCIPAL.getName()+":olhapassword")));
     336        return resource.header(HttpHeaders.AUTHORIZATION, "Basic "  + new String(Base64.encode(DummyPrincipal.DUMMY_PRINCIPAL.getName()+":alicepassword")));
    337337    }
    338338}
  • DASISH/t5.6/backend/annotator-backend/tags/git-copy-censored/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/DummyPrincipal.java

    r4800 r6063  
    2929
    3030    public static final DummyPrincipal DUMMY_ADMIN_PRINCIPAL = new DummyPrincipal("JUnit.Admin@test.com");
    31     public static final DummyPrincipal DUMMY_PRINCIPAL = new DummyPrincipal("olhsha@mpi.nl");
     31    public static final DummyPrincipal DUMMY_PRINCIPAL = new DummyPrincipal("alice@mail.domain");
    3232    public static final PrincipalCredentials DUMMY_CREDENTIALS = new PrincipalCredentials(DUMMY_PRINCIPAL) {
    3333
Note: See TracChangeset for help on using the changeset viewer.