Changeset 6819

Timestamp:

Mar 31, 2015, 9:43:13 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1325: Lists of items

Updating test code since FILE is no longer possible to use in item lists.

File:

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

trunk/src/test/TestItemList.java

@@ -60 +60 @@
     int id5 = test_create(Item.BIOSOURCE, "net.sf.basedb.clients.test.bmlist5", true);
     int id6 = test_create(Item.BIOSOURCE, "net.sf.basedb.clients.test.bmlist6", true);
-    int id7 = test_create(Item.FILE, "net.sf.basedb.clients.test.filelist1", true);
     test_load(id1);
     test_list(-1);
@@ -71 +70 @@
     int bs5 = TestBioSource.test_create("bs.5", false);
 
-    int f1 = TestFile.test_create("data/test.upload.txt", false, false);
-    int f2 = TestFile.test_create("data/test.upload.txt", false, false);
-    int f3 = TestFile.test_create("data/test.upload.txt", false, false);
-    
     test_add_members(id1, bs1, bs2, bs3);
     test_list_members(id1, 3);
@@ -84 +79 @@
     test_retain(id6, id2, 1, id1); // 'id6' is now the intersection on 'id1' and 'id2'
     
-    test_add_members(id7, f1, f2, f3);
-    test_list_members(id7, 3);
-    
     if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
     
     // Remove an item and check that the size property is correct
-    TestFile.test_delete(f3);
-    test_list_members(id7, 2);
+    TestBioSource.test_delete(bs3);
+    test_list_members(id1, 2);
     
     test_remove_member(id1, bs1);
     test_remove_member(id1, bs2);
-    test_list_members(id1, 1);
+    test_list_members(id1, 0);
     if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
     
@@ -105 +97 @@
     test_delete(id5);
     test_delete(id6);
-    test_delete(id7);
-    TestFile.test_delete(f1);
-    TestFile.test_delete(f2);
     TestBioSource.test_delete(bs1);
     TestBioSource.test_delete(bs2);
-    TestBioSource.test_delete(bs3);
     TestBioSource.test_delete(bs4);
     TestBioSource.test_delete(bs5);