Changeset 4616


Ignore:
Timestamp:
03/04/14 11:05:11 (10 years ago)
Author:
olhsha
Message:

adjusting tests after changings in the unit-test data-base

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r4603 r4616  
    110110        System.out.println("test deleteAllAnnotationTargets");
    111111        int result = jdbcAnnotationDao.deleteAnnotationPrincipalPermissions(1);
    112         assertEquals(2, result);
     112        assertEquals(3, result);
    113113        assertEquals(0, jdbcAnnotationDao.deleteAnnotationPrincipalPermissions(1));
    114114    }
    … …  
    364364        System.out.println("test Permissions");
    365365        List<Map<Number, String>> result = jdbcAnnotationDao.getPermissions(1);
    366         assertEquals(2, result.size());
     366        assertEquals(3, result.size());
    367367        assertEquals("writer", result.get(0).get(2));
    368368        assertEquals("reader", result.get(1).get(3));
    369        
     369        assertEquals("reader", result.get(2).get(11));
    370370       
    371371    }

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

    r4603 r4616  
    130130        CachedRepresentationInfo result = jdbcCachedRepresentationDao.getCachedRepresentationInfo(1);
    131131        assertEquals(TestBackendConstants._TEST_SERVLET_URI_cached + "00000000-0000-0000-0000-000000000051", result.getURI());
    132         assertEquals("text/html", result.getMimeType());
    133         assertEquals("latex", result.getTool());
    134         assertEquals("text", result.getType());
     132        assertEquals("image/png", result.getMimeType());
     133        assertEquals("screen-shot", result.getTool());
     134        assertEquals("image", result.getType());
    135135        assertEquals(TestBackendConstants._TEST_SERVLET_URI_cached +"00000000-0000-0000-0000-000000000051", result.getURI());
    136136    }

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

    r4603 r4616  
    120120
    121121        Number result = jdbcUserDao.addUser(freshUser, "secret X");
    122         assertEquals(11, result.intValue());
     122        assertEquals(12, result.intValue());
    123123        User addedUser = jdbcUserDao.getUser(result);
    124124        assertEquals(freshUserName, addedUser.getDisplayName());

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

    r4603 r4616  
    138138        assertEquals(testAnnotation.getHeadline(), entity.getHeadline());
    139139        assertEquals(testAnnotation.getOwnerRef(), entity.getOwnerRef());
    140         assertEquals(2, entity.getPermissions().getUserWithPermission().size());
     140        assertEquals(3, entity.getPermissions().getUserWithPermission().size());
    141141        assertEquals("writer", entity.getPermissions().getUserWithPermission().get(0).getPermission().value());
    142142        assertEquals(resource().getURI()+"users/"+"00000000-0000-0000-0000-000000000112", entity.getPermissions().getUserWithPermission().get(0).getRef());
    143143        assertEquals("reader", entity.getPermissions().getUserWithPermission().get(1).getPermission().value());
    144144        assertEquals(resource().getURI()+"users/"+"00000000-0000-0000-0000-000000000113", entity.getPermissions().getUserWithPermission().get(1).getRef());
     145        assertEquals("reader", entity.getPermissions().getUserWithPermission().get(1).getPermission().value());
     146        assertEquals(resource().getURI()+"users/"+"00000000-0000-0000-0000-000000000221", entity.getPermissions().getUserWithPermission().get(2).getRef());
    145147        assertEquals(2, entity.getTargets().getTargetInfo().size());
    146148        assertEquals(resource().getURI().toString()+"targets/"+"00000000-0000-0000-0000-000000000031", entity.getTargets().getTargetInfo().get(0).getRef());

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

    r4603 r4616  
    3131INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Olof', '00000000-0000-0000-0000-000000000119', 'gusolsol@gu.se', 'olof.olsson.2@gu.se', 'developer'); -- 9
    3232INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Willem', '00000000-0000-0000-0000-000000000220', 'wilelb@mpi.nl', 'Willem.Elbers@mpi.nl', 'developer'); -- 10
     33INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Olaf', '00000000-0000-0000-0000-000000000221', 'olasei@mpi.nl', 'Olaf.Seibert@mpi.nl', 'developer'); -- 11
    3334
    3435
    … …  
    7172
    7273-- HSQL ---
    73 INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000051', 'text/html', 'latex', 'text', X'1001'); --1
     74INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000051', 'image/png', 'screen-shot', 'image', NULL); --1
    7475INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000052', 'text/html', 'vi', 'text', X'1002'); -- 2
    75 INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000053', 'image/png', 'screenshooter', 'image', X'1003'); -- 3
    76 INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000054', 'text/html', 'oxygen', 'text', X'1004'); --4
     76INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000053', 'image/png', 'screenshooter', 'image', NULL); -- 3
     77INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000054', 'image/png', 'screen-shot', 'image', NULL); --4
    7778INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000055', 'image/jpg', 'photomaster', 'image', X'1005'); --5
    7879INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000056', 'text/plain', 'some tool', 'text', X'1006'); --6  not used
    … …  
    106107INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (1, 2, 'writer');
    107108INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (1, 3, 'reader');
     109INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (1, 11, 'reader');
    108110
    109111INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (2, 1, 'reader');
    … …  
    122124INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (1, 4, 'writer');
    123125INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (1, 5, 'reader');
    124 
     126INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (1, 11, 'reader');
    125127
    126128INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (2, 1, 'reader');
    127129INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (2, 3, 'writer');
     130INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (2, 11, 'reader');
     131
    128132
    129133INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (4, 2, 'writer');
    130134INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (4, 1, 'writer');
    131 
     135INSERT INTO notebooks_principals_permissions (notebook_id, principal_id, permission_) VALUES (4, 11, 'reader');
Note: See TracChangeset for help on using the changeset viewer.