Changeset 5690

Timestamp:

Aug 11, 2011, 12:01:32 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1153: Handling short read transcript sequence data

Fixed 'set owner' test so that it now uses a Tag instead of a Label.

File:

• trunk/src/test/TestUser.java (modified) (4 diffs)

trunk/src/test/TestUser.java

@@ -55 +55 @@
     test_duplicate(id);
 
+    // Extra test: create an item and change the owner
+    int tag_id = TestTag.test_create("Test tag for setting owner", 0, false);
+    test_set_owner(id, Item.TAG, tag_id);
+    
     // Extra tests: add, list and remove groups
     int groupId = TestGroup.test_create(true);
@@ -85 +89 @@
     TestProject.test_delete(projectId);
 
-    // Extra test: create an item and change the owner
-//    TODO (#1153)
-//    int label_id = TestLabel.test_create();
-//    test_set_owner(id, label_id);
-//    TestLabel.test_delete(label_id);
-
     // Standard test: Delete
+    TestTag.test_delete(tag_id);
     test_delete(base1Id);
     test_delete(id);
@@ -444 +443 @@
   }
 
-/*
-  TODO (#1153)
-  static void test_set_owner(int id, int label_id)
-  {
-    if (id == 0 || label_id == 0) return;
-    BaseControl bc = null;
-    try
-    {
-      bc = TestUtil.getBaseControl();
-      User u = User.getById(bc, id);
-      Label l = Label.getById(bc, label_id);
-      l.setOwner(u);
-      l.save();
-      bc.commit();
+  static void test_set_owner(int id, Item itemType, int item_id)
+  {
+    if (id == 0 || item_id == 0) return;
+    DbControl dc = null;
+    try
+    {
+      dc = TestUtil.getDbControl();
+      User u = User.getById(dc, id);
+      Ownable o = (Ownable)itemType.getById(dc, item_id);
+      o.setOwner(u);
+      dc.commit();
       write("--Set owner OK");
     }
@@ -468 +464 @@
     finally
     {
-      if (bc != null) bc.close();
-    }
-  }
-  */
+      if (dc != null) dc.close();
+    }
+  }
 
 }