Changeset 6819


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/test/TestItemList.java

    r6756 r6819  
    6060    int id5 = test_create(Item.BIOSOURCE, "net.sf.basedb.clients.test.bmlist5", true);
    6161    int id6 = test_create(Item.BIOSOURCE, "net.sf.basedb.clients.test.bmlist6", true);
    62     int id7 = test_create(Item.FILE, "net.sf.basedb.clients.test.filelist1", true);
    6362    test_load(id1);
    6463    test_list(-1);
     
    7170    int bs5 = TestBioSource.test_create("bs.5", false);
    7271
    73     int f1 = TestFile.test_create("data/test.upload.txt", false, false);
    74     int f2 = TestFile.test_create("data/test.upload.txt", false, false);
    75     int f3 = TestFile.test_create("data/test.upload.txt", false, false);
    76    
    7772    test_add_members(id1, bs1, bs2, bs3);
    7873    test_list_members(id1, 3);
     
    8479    test_retain(id6, id2, 1, id1); // 'id6' is now the intersection on 'id1' and 'id2'
    8580   
    86     test_add_members(id7, f1, f2, f3);
    87     test_list_members(id7, 3);
    88    
    8981    if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
    9082   
    9183    // Remove an item and check that the size property is correct
    92     TestFile.test_delete(f3);
    93     test_list_members(id7, 2);
     84    TestBioSource.test_delete(bs3);
     85    test_list_members(id1, 2);
    9486   
    9587    test_remove_member(id1, bs1);
    9688    test_remove_member(id1, bs2);
    97     test_list_members(id1, 1);
     89    test_list_members(id1, 0);
    9890    if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
    9991   
     
    10597    test_delete(id5);
    10698    test_delete(id6);
    107     test_delete(id7);
    108     TestFile.test_delete(f1);
    109     TestFile.test_delete(f2);
    11099    TestBioSource.test_delete(bs1);
    111100    TestBioSource.test_delete(bs2);
    112     TestBioSource.test_delete(bs3);
    113101    TestBioSource.test_delete(bs4);
    114102    TestBioSource.test_delete(bs5);
Note: See TracChangeset for help on using the changeset viewer.