Changeset 3413


Ignore:
Timestamp:
08/19/13 09:35:12 (11 years ago)
Author:
olhsha
Message:

all basic Dao for CachedRepresentation?, Version, Source, Annotation, User and Notebooks are tested well. However, JdbcUserDao? and JdbcNotebookDao? are obsolete.

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

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java

    r3408 r3413  
    2323import eu.dasish.annotation.schema.Permission;
    2424import eu.dasish.annotation.schema.ResourceREF;
    25 import eu.dasish.annotation.schema.UserWithPermission;
    2625import java.sql.SQLException;
    2726import java.sql.Timestamp;

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

    r3408 r3413  
    2525import eu.dasish.annotation.schema.Permission;
    2626import eu.dasish.annotation.schema.ResourceREF;
    27 import eu.dasish.annotation.schema.UserWithPermission;
    2827import java.lang.String;
    2928import java.sql.ResultSet;
    … …  
    282281    public int updateBody(Number annotationID, String serializedNewBody) {
    283282        StringBuilder sql = new StringBuilder("UPDATE ");
    284         sql.append(annotationTableName).append(" SET ").append(body_xml).append("= ").append(serializedNewBody).append(" WHERE ").append(annotation_id).append("= ?");
     283        sql.append(annotationTableName).append(" SET ").append(body_xml).append("= '").append(serializedNewBody).append("' WHERE ").append(annotation_id).append("= ?");
    285284        return getSimpleJdbcTemplate().update(sql.toString(), annotationID);
    286285    }
    … …  
    342341        paramsPermissions.put("principalId", userID);
    343342        paramsPermissions.put("status", permission.value());
    344         String sqlUpdatePermissionTable = "INSERT INTO " + permissionsTableName + " (" + annotation_id + "," + principal_id + "," + permission + ") VALUES (:annotationId, :principalId, :status)";
     343        String sqlUpdatePermissionTable = "INSERT INTO " + permissionsTableName + " (" + annotation_id + "," + principal_id + "," + this.permission + ") VALUES (:annotationId, :principalId, :status)";
    345344        final int affectedPermissions = getSimpleJdbcTemplate().update(sqlUpdatePermissionTable, paramsPermissions);
    346345        return affectedPermissions;

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

    r3411 r3413  
    8282            return 0;
    8383        }
    84         String sqlSourcesVersions = "DELETE FROM " + sourceTableName + " WHERE " + source_id + " = ? LIMIT 1";
     84        String sqlSourcesVersions = "DELETE FROM " + sourceTableName + " WHERE " + source_id + " = ? ";
    8585        int result = getSimpleJdbcTemplate().update(sqlSourcesVersions, internalID);
    8686        return result;

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

    r3408 r3413  
    235235        assertFalse(null == addedAnnotation.getURI());
    236236        assertFalse(null == addedAnnotation.getTimeStamp());
    237         assertEquals(5, addedAnnotation.getOwner().getRef());
     237        assertEquals(Integer.toString(5), addedAnnotation.getOwner().getRef());
    238238        assertEquals(annotationToAdd.getBody().getAny().get(0), addedAnnotation.getBody().getAny().get(0)); // TODO: to be changed after serialization is fixed
    239239        assertEquals(annotationToAdd.getHeadline(), addedAnnotation.getHeadline());
    … …  
    304304       
    305305       
    306         List<Number> result_3 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 1, null, null);       
     306        List<Number> result_3 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 3, null, null);       
    307307        assertEquals(1, result_3.size());
    308308        assertEquals(2, result_3.get(0));
    … …  
    311311        Timestamp after = new Timestamp(0);
    312312        Timestamp before = new Timestamp(System.currentTimeMillis()); 
    313         List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 1, after, before);       
     313        List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 3, after, before);       
    314314        assertEquals(1, result_4.size());
    315315        assertEquals(2, result_4.get(0));
    316316       
    317317       
    318         Timestamp after_1 = new Timestamp(System.currentTimeMillis());        
    319         List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 1, after_1, null);       
    320         assertEquals(1, result_5.size());
     318        Timestamp after_1 = new Timestamp(System.currentTimeMillis()); // no annotations added after "now"       
     319        List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, 3, after_1, null);       
     320        assertEquals(0, result_5.size());
    321321       
    322322       
    … …  
    344344        System.out.println("test Permissions");
    345345        List<Map<Number, String>> result = jdbcAnnotationDao.retrievePermissions(2);
    346         assertEquals(2, result.size());
     346        assertEquals(3, result.size());
    347347        assertEquals("owner", result.get(0).get(3));
    348         assertEquals("writer", result.get(0).get(4));
    349         assertEquals("reader", result.get(0).get(5));
     348        assertEquals("writer", result.get(1).get(4));
     349        assertEquals("reader", result.get(2).get(5));
    350350       
    351351       

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

    r3408 r3413  
    8181        System.out.println("getCachedRepresentationInfo");
    8282       
    83         CachedRepresentationInfo result = jdbcCachedRepresentationDao.getCachedRepresentationInfo(1);
     83        CachedRepresentationInfo result = jdbcCachedRepresentationDao.getCachedRepresentationInfo(1);       
     84        assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_EXT_ID_, result.getRef());
    8485        assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_MIME_TYPE_, result.getMimeType());
    85         assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_EXT_ID_, result.getType());
    8686        assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_TOOL_, result.getTool());
    87         assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_TYPE_, result.getRef());
     87        assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_TYPE_, result.getType());
    8888    }
    8989

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

    r3380 r3413  
    4848 * @author Peter Withers <peter.withers@mpi.nl>
    4949 */
     50// TODO: Move integrating methods from JdbcNotebookDao to DaoDispatcher, and move corresponding tests to DaoDistatcherTest.class, 
     51//remove from here all the  mockery and retest.
    5052@RunWith(SpringJUnit4ClassRunner.class)
    51 @ContextConfiguration({"/spring-test-config/mockery.xml", "/spring-test-config/mockAnnotationDao.xml", "/spring-test-config/mockSourceDao.xml", "/spring-test-config/mockUserDao.xml", "/spring-test-config/mockPermissionsDao.xml",
     53@ContextConfiguration({"/spring-test-config/mockery.xml", "/spring-test-config/mockAnnotationDao.xml",
     54    "/spring-test-config/mockSourceDao.xml", "/spring-test-config/mockUserDao.xml",
     55    "/spring-test-config/mockCachedRepresentationDao.xml", "/spring-test-config/mockVersionDao.xml",
    5256    "/spring-test-config/dataSource.xml", "/spring-config/notebookDao.xml"})
    5357public class JdbcNotebookDaoTest extends JdbcResourceDaoTest{

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

    r3408 r3413  
    2020import eu.dasish.annotation.backend.TestBackendConstants;
    2121import eu.dasish.annotation.backend.identifiers.SourceIdentifier;
    22 import eu.dasish.annotation.backend.identifiers.VersionIdentifier;
    2322import eu.dasish.annotation.schema.Source;
    2423import eu.dasish.annotation.schema.SourceInfo;
    … …  
    2827import org.junit.Test;
    2928import static org.junit.Assert.*;
    30 import org.junit.Ignore;
    3129import org.junit.runner.RunWith;
    3230import org.springframework.beans.factory.annotation.Autowired;
    … …  
    8886    public void testDeleteSource() {
    8987        System.out.println("deleteSource");
    90        
     88        // test 1
    9189        // remove the rows from the joint table to keep integrity
    92         jdbcSourceDao.deleteAllSourceVersion(1);
    93 
    94         // test 1
    9590        int result = jdbcSourceDao.deleteSource(1); //the source is in use, should not be deleted
    9691        assertEquals(0, result);
    9792
    9893        // test 2
     94        jdbcSourceDao.deleteAllSourceVersion(5);
    9995        int resultTwo = jdbcSourceDao.deleteSource(5);// the source will be deleted because it is not referred by any annotation
    10096        assertEquals(1, resultTwo);
    … …  
    129125
    130126        String link = "http://www.sagradafamilia.cat/";
    131         // test 1: existing version
    132127        Source freshSource = new Source();
    133128        freshSource.setLink(link);
    134129        freshSource.setVersion(TestBackendConstants._TEST_VERSION_1_EXT_ID);
    135         freshSource.setURI(null);
     130        freshSource.setURI((new SourceIdentifier()).toString());
    136131        freshSource.setTimeSatmp(null);
    137132       
    … …  
    141136        assertEquals(link, addedSource.getLink());
    142137        assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, addedSource.getVersion());
    143         assertFalse(null == addedSource.getURI());
    144 
    145         ////////// test 2 non-existing version
    146         freshSource.setVersion(TestBackendConstants._TEST_VERSION_NONEXIST_EXT_ID);
    147         Number resultTwo = jdbcSourceDao.addSource(freshSource);
    148         assertEquals(-1, resultTwo); // addversion (preferably with cached representation
    149 
     138        assertEquals(freshSource.getURI(), addedSource.getURI());
    150139    }
    151140

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

    r3408 r3413  
    2525import org.junit.Test;
    2626import static org.junit.Assert.*;
    27 import org.junit.Ignore;
    2827import org.junit.runner.RunWith;
    2928import org.springframework.beans.factory.annotation.Autowired;

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

    r3407 r3413  
    5151INSERT INTO notebooks_annotations (notebook_id,annotation_id) VALUES (3,3);
    5252INSERT INTO notebooks_annotations (notebook_id,annotation_id) VALUES (4,4);
    53 INSERT INTO notebooks_annotations (notebook_id,annotation_id) VALUES (5,5);
     53INSERT INTO notebooks_annotations (notebook_id,annotation_id) VALUES (5,4);
    5454
    5555
Note: See TracChangeset for help on using the changeset viewer.