Changeset 5702

Timestamp:

Aug 19, 2011, 2:35:10 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1615: Add test program in BASE 2.17 that create data that need special handling when updating to BASE 3

An extra test program has been added to the 'roles' test program. It is started with:

./test.sh roles extra

The other tests (except the 'guest' test) in the test program must have been executed first:

./test.sh roles root admin power user

Location:

branches/2.17-stable/src/test/net/sf/basedb/test/roles

Files:

• AdminTest.java (modified) (3 diffs)
• ExtraTest.java (added)
• Run.java (modified) (1 diff)
• UserTest.java (modified) (2 diffs)

branches/2.17-stable/src/test/net/sf/basedb/test/roles/AdminTest.java

@@ -70 +70 @@
   <li>Create user: {@link #createPowerUser(DbControl, Group)}
   <li>Create guest: {@link #createGuest(DbControl, Group)}
+  <li>Create extra user: {@link #createExtraUser(DbControl, Group)}
   <li>Create fileformat for import:
   <li>Import reporters:
@@ -98 +99 @@
       User user = createUser(dc, g);
       User guest = createGuest(dc, g);
+      User extra = createExtraUser(dc, g);
       dc.commit();
       
@@ -217 +219 @@
   }
   
+  /**
+    Create "extra" user with power user rights.
+  */
+  public static User createExtraUser(DbControl dc, Group group)
+  {
+    TestUtil.write("--Creating extra user\n");
+    Role powerUser = Role.getById(dc, SystemItems.getId(Role.POWER_USER));
+    Quota quota = Quota.getById(dc, SystemItems.getId(Quota.UNRESTRICTED));
+    User extra = Util.createUser(dc, "Extra user", "extra", "extra", quota, null, 
+        Collections.singleton(powerUser), Collections.singleton(group));
+    Directory.createHomeDirectory(dc, extra, true);
+    return extra;
+  }
+
+  
   public static void addPermissions(DbControl dc, User user, Collection<SharedItem> items, Set<Permission> permissions)
   {

branches/2.17-stable/src/test/net/sf/basedb/test/roles/Run.java

@@ -77 +77 @@
       tests++;
     }
+    if (ok && (all || cmds.contains("extra")))
+    {
+      TestUtil.begin(logMemoryUsage, true);
+      ok = ExtraTest.run();
+      tests++;
+    }
     TestUtil.stop();
     

branches/2.17-stable/src/test/net/sf/basedb/test/roles/UserTest.java

@@ -223 +223 @@
         // Hybridizations, etc.
 //        dc = TestUtil.getDbControl();
-        Hybridization h1 = createHybridization(dc, "Hybridization A.00h", "Array slide A.1", le1, leRef);
-        Hybridization h2 = createHybridization(dc, "Hybridization A.24h", "Array slide A.2", le2, leRef);
-        Hybridization h1DyeSwap = createHybridization(dc, "Hybridization A.00h (dye-swap)", "Array slide A.3", le1DyeSwap, leRefDyeSwap);
-        Hybridization h2DyeSwap = createHybridization(dc, "Hybridization A.24h (dye-swap)", "Array slide A.4", le2DyeSwap, leRefDyeSwap);
+        Hybridization h1 = createHybridization(dc, "Hybridization A.00h", "Array slide A.1", false, le1, leRef);
+        Hybridization h2 = createHybridization(dc, "Hybridization A.24h", "Array slide A.2", false,le2, leRef);
+        Hybridization h1DyeSwap = createHybridization(dc, "Hybridization A.00h (dye-swap)", "Array slide A.3", false,le1DyeSwap, leRefDyeSwap);
+        Hybridization h2DyeSwap = createHybridization(dc, "Hybridization A.24h (dye-swap)", "Array slide A.4", false,le2DyeSwap, leRefDyeSwap);
   
         // Affymetrix
-        Hybridization affyHyb1 = createHybridization(dc, "Affymetrix hyb A.1", "Affymetrix slide A.1", le1);
-        Hybridization affyHyb2 = createHybridization(dc, "Affymetrix hyb A.2", "Affymetrix slide A.2", le2);
-        Hybridization affyHyb3 = createHybridization(dc, "Affymetrix hyb A.3", "Affymetrix slide A.3", leRef);
+        Hybridization affyHyb1 = createHybridization(dc, "Affymetrix hyb A.1", "Affymetrix slide A.1", false,le1);
+        Hybridization affyHyb2 = createHybridization(dc, "Affymetrix hyb A.2", "Affymetrix slide A.2", false,le2);
+        Hybridization affyHyb3 = createHybridization(dc, "Affymetrix hyb A.3", "Affymetrix slide A.3", false,leRef);
         
         sc1 = createScan(dc, "Scan A.00h", h1, 400f, volt);
@@ -436 +436 @@
     Create a hybridization.
   */
-  public static Hybridization createHybridization(DbControl dc, String name, String arraySlideName, LabeledExtract... extracts)
+  public static Hybridization createHybridization(DbControl dc, String name, String arraySlideName, 
+      boolean multiArray, LabeledExtract... extracts)
   {
     TestUtil.write("--Creating hybridization: " + name + "\n");
     Hybridization hyb = Hybridization.getNew(dc);
     hyb.setName(name);
-    hyb.setArraySlide(Util.findArraySlide(dc, arraySlideName));
+    if (multiArray)
+    {
+      hyb.setNumArrays(extracts.length);
+    }
+    if (arraySlideName != null)
+    {
+      hyb.setArraySlide(Util.findArraySlide(dc, arraySlideName));
+    }
     BioMaterialEvent creationEvent = hyb.getCreationEvent();
     creationEvent.setProtocol(Util.findProtocol(dc, "Hybridization A"));
     creationEvent.setHardware(Util.findHardware(dc, "Hybridization station A"));
+    int grp = 1;
     for (LabeledExtract le : extracts)
     {
       creationEvent.addSource(le, 50.0f);
+      if (multiArray)
+      {
+        creationEvent.setSourceGroup(le, grp);
+        grp++;
+      }
     }
     dc.saveItem(hyb);