Changeset 3215


Ignore:
Timestamp:
07/31/13 11:57:12 (11 years ago)
Author:
olhsha
Message:

fixed forgotten stuff from the previous commit: notebookTestDao has been adjusted.

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

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/DashishAnnotatorCreate.sql

    r3214 r3215  
    226226CHECK(permission_ = 'reader' OR permission_='writer' OR permission_='owner'),
    227227-- soundness: owner in this table must be the same as the owner in the annotation table ---
    228 -- check for any pair (annotation, principal) there must be exactly one row in this table -- ???
     228-- ??? check for any pair (annotation, principal) there must be exactly one row in this table:
     229-- impossible because of deleting an nnotation: first we have to remove it from this table
    229230);
    230231

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

    r3211 r3215  
    155155       
    156156        // test three, empty notebook
    157         final List<Number> annotationIDsThree = jdbcNotebookDao.getAnnotationIDs(5);
     157        final List<Number> annotationIDsThree = jdbcNotebookDao.getAnnotationIDs(6);
    158158        assertEquals(0, annotationIDsThree.size());
    159159       
    … …  
    190190        // test Three  "empty"
    191191        setMockeryNotebookThreeEmpty();         
    192         List<ResourceREF> testListThree = jdbcNotebookDao.getAnnotationREFsOfNotebook(5);
     192        List<ResourceREF> testListThree = jdbcNotebookDao.getAnnotationREFsOfNotebook(6);
    193193        assertEquals(0, testListThree.size());
    194194       
    … …  
    224224        // therefore: no annotations in the notebook ==> Annotations-pbject must be null :(
    225225        setMockeryNotebookThreeEmpty();
    226         Annotations annotationsThree = jdbcNotebookDao.getAnnotations(5);
     226        Annotations annotationsThree = jdbcNotebookDao.getAnnotations(6);
    227227        assertEquals(null, annotationsThree);
    228228       

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

    r3214 r3215  
    3939INSERT INTO notebook (title, owner_id, external_id) VALUES ('Notebook 4', 4, '00000000-0000-0000-0000-000000000012'); --4
    4040INSERT INTO notebook (title, owner_id, external_id) VALUES ('Notebook 5', 5, '00000000-0000-0000-0000-000000000013'); --5
     41INSERT INTO notebook (title, owner_id, external_id) VALUES ('Notebook 6', 5, '00000000-0000-0000-0000-000000000014'); --6
    4142
    4243INSERT INTO annotation (owner_id,headline,body_xml, external_id) VALUES (3, 'Sagrada Famiglia','<html><body>some html 1</body></html>', '00000000-0000-0000-0000-000000000021'); --2
Note: See TracChangeset for help on using the changeset viewer.