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

Timestamp:

08/14/13 16:34:29 (11 years ago)

Author:

olhsha

Message:

"put updated body" is implemented and tested. Big refactring: simplifying DAO's and pushing their composition to rest methods. add-methods in DAO return now not the classes but internalID-s of the added resources. Still 2 test errors and 2 test failures.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java (modified) (2 diffs)

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

@@ -40 +40 @@
 @ContextConfiguration({"/spring-test-config/dataSource.xml", "/spring-test-config/mockery.xml", "/spring-test-config/mockAnnotationDao.xml",
     "/spring-test-config/mockUserDao.xml", "/spring-test-config/mockPermissionsDao.xml", "/spring-test-config/mockNotebookDao.xml",
-    "/spring-test-config/mockCachedRepresentationDao.xml", "/spring-config/versionDao.xml"})
+    "/spring-test-config/mockSourceDao.xml", "/spring-test-config/mockCachedRepresentationDao.xml", "/spring-config/versionDao.xml"})
 
 public class JdbcVersionDaoTest extends JdbcResourceDaoTest{
@@ -169 +169 @@
         Version freshVersion = new Version();   
         
-        Version result = jdbcVersionDao.addVersion(freshVersion);
-        assertFalse(null==result.getVersion());
-        
-        // check if it is a good UUID. the program breaks if the string is anot a good UUID
-        assertEquals(result.getVersion(), (new VersionIdentifier(result.getVersion())).toString());
+        Number result = jdbcVersionDao.addVersion(freshVersion);
+        assertEquals(8, result);
+        Version addedVersion = jdbcVersionDao.getVersion(result);
+        assertFalse(null==addedVersion.getVersion());
+        
     }