[Treebase-guts] SF.net SVN: treebase:[408] trunk/treebase-core/src

[<yo...@us...>]

Revision: 408
          http://treebase.svn.sourceforge.net/treebase/?rev=408&view=rev
Author:   youjun
Date:     2010-01-07 19:20:18 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
change test record  that no longer exist etc 

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java
    trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java
    trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/PhyloTreeServiceImplTest.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java	2010-01-06 21:28:32 UTC (rev 407)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java	2010-01-07 19:20:18 UTC (rev 408)
@@ -751,6 +751,7 @@
 	 */
 	// added in implementation where the number of tips is calculated and
 	// stored if the internal boxed member mNtax is null (i.e. unassigned)
+	@Column(name = "ntax")
 	public Integer getnTax() {
 		if ( mNtax == null ) {
 			int ntax = 0;

Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java	2010-01-06 21:28:32 UTC (rev 407)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java	2010-01-07 19:20:18 UTC (rev 408)
@@ -133,7 +133,7 @@
 
 		// Notes: this is important: why?? there are two copies of s in the same session.
 		// how???
-		//s = (Study) hibernateTemplate.merge(s);
+		s = (Study) hibernateTemplate.merge(s);
 
 		Long studyID = s.getId();
 		Long citationID = c.getId();
@@ -499,7 +499,7 @@
 
 		// 1. get a valid nexus file name:
 		String fileName = "wtset.nex";		
-		long studyId = 82L;
+		long studyId = 100L;
 		logger.info("study id: " + studyId);
 		assertTrue(studyId > 0);
 		Study s = (Study) hibernateTemplate.get(Study.class, studyId);

Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/PhyloTreeServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/PhyloTreeServiceImplTest.java	2010-01-06 21:28:32 UTC (rev 407)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/PhyloTreeServiceImplTest.java	2010-01-07 19:20:18 UTC (rev 408)
@@ -172,7 +172,7 @@
 	
 	public void testFindSomethingByRangeExpression() throws MalformedRangeExpression {
 		Collection<PhyloTree> trees = getFixture()
-		.findSomethingByRangeExpression(PhyloTree.class, "nTax", "37..100");
+		.findSomethingByRangeExpression(PhyloTree.class, "nTax", "37..40");
 		assertTrue(trees.size() > 0);
 		for (PhyloTree tree : trees) {
 			int n = tree.getnTax();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.