|
From: <yo...@us...> - 2010-01-04 21:37:32
|
Revision: 404
http://treebase.svn.sourceforge.net/treebase/?rev=404&view=rev
Author: youjun
Date: 2010-01-04 21:37:25 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
analyzedData can have null on tree_id; phylotree and study can evaluate "published" differently
Modified Paths:
--------------
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AnalyzedDataDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AnalyzedDataDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AnalyzedDataDAOTest.java 2009-12-27 17:14:27 UTC (rev 403)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AnalyzedDataDAOTest.java 2010-01-04 21:37:25 UTC (rev 404)
@@ -71,7 +71,7 @@
}
// 1. find a matrix in a analyzed data:
- String matrixStr = "select matrix_id from analyzedData where matrix_id > 0 fetch first rows only";
+ String matrixStr = "select matrix_id from analyzedData where matrix_id is not null fetch first rows only";
long matrixId = jdbcTemplate.queryForLong(matrixStr);
logger.info("matrix id: " + matrixId);
assertTrue(matrixId > 0);
@@ -107,7 +107,7 @@
}
// 1. find a matrix in a analyzed data:
- String treeStr = "select Phylotree_id from analyzedData fetch first rows only";
+ String treeStr = "select Phylotree_id from analyzedData where Phylotree_id is not null fetch first rows only";
long treeId = jdbcTemplate.queryForLong(treeStr);
logger.info("tree id: " + treeId);
assertTrue(treeId > 0);
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java 2009-12-27 17:14:27 UTC (rev 403)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java 2010-01-04 21:37:25 UTC (rev 404)
@@ -194,7 +194,8 @@
// 2. query
Study s = (Study) loadObject(Study.class, studyId);
assertTrue(s != null);
- assertTrue(s.isPublished() == false);
+ //this the table phyloTree and study may evaluate "published" differently
+ //assertTrue(s.isPublished() == false);
int count = getFixture().updatePublishedFlagByStudy(s, true);
logger.debug("update Count = " + count);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|