Changeset 3774

Timestamp:

Sep 25, 2007, 9:35:09 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #782: Create test case that calls AnnotationSet?.getAllInheritedAnnotations()

File:

• branches/2.4-stable/src/test/TestAnnotation.java (modified) (3 diffs)

branches/2.4-stable/src/test/TestAnnotation.java

@@ -26 +26 @@
 
 import net.sf.basedb.core.*;
+import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Orders;
 
 import java.util.Date;
@@ -81 +83 @@
     // Test: list inherited annotations and annotation sets
     test_list_inherited_annotations(rawBioAssayId, 2);
+    test_list_allinherited_annotations(rawBioAssayId, 9);
     test_list_inherited_annotationsets(rawBioAssayId, 1);
     test_list_inheriting_annotationsets(arrayDesignId, 1);
@@ -342 +345 @@
     }
   }
+  
+  static void test_list_allinherited_annotations(int rawBioAssayId, int expectedResults)
+  {
+    if (rawBioAssayId == 0) return;
+    DbControl dc = null;
+    try
+    {
+      dc = TestUtil.getDbControl();
+      RawBioAssay rba = RawBioAssay.getById(dc, rawBioAssayId);
+      ItemQuery<Annotation> query = rba.getAnnotationSet().getAllInheritedAnnotations();
+      query.join(Hql.innerJoin(null, "annotationType", "at", true));
+      query.order(Orders.asc(Hql.property("at", "name")));
+      List<Annotation> l = query.list(dc);
+      for (int i = 0; i<l.size(); i++)
+      {
+        write_item(i, l.get(i));
+      }
+      if (expectedResults >= 0 && expectedResults != l.size())
+      {
+        throw new BaseException("Expected "+expectedResults+" results, not "+l.size());
+      }
+      write("--List all inherited annotations OK ("+l.size()+")");
+    }
+    catch (Throwable ex)
+    {
+      write("--List all inherited annotations FAILED");
+      ex.printStackTrace();
+      ok = false;
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+  }
 
   static void test_list_inherited_annotationsets(int rawBioAssayId, int expectedResults)