Changeset 3665

Timestamp:

Aug 14, 2007, 2:53:42 PM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #514 Change permissions in Power User

Location:

trunk/src

Files:

• core/net/sf/basedb/core/Install.java (modified) (1 diff)
• test/net/sf/basedb/test/roles/AdminTest.java (modified) (5 diffs)
• test/net/sf/basedb/test/roles/PowerUserTest.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/Install.java

@@ -334 +334 @@
   
       // Reporters
-      createRoleKey(Item.REPORTERTYPE, "Reporter types", "Gives access to reporter types", guests_use_power_users_all);
-      createRoleKey(Item.REPORTER, "Reporters", "Gives access to reporter", guests_use_power_users_all);
+      createRoleKey(Item.REPORTERTYPE, "Reporter types", "Gives access to reporter types", guests_use_administrators_all);
+      createRoleKey(Item.REPORTER, "Reporters", "Gives access to reporter", guests_use_administrators_all);
       createRoleKey(Item.REPORTERLIST, "Reporter lists", "Gives access to reporter lists", users_create);
   

trunk/src/test/net/sf/basedb/test/roles/AdminTest.java

@@ -32 +32 @@
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.Directory;
+import net.sf.basedb.core.File;
+import net.sf.basedb.core.FileType;
 import net.sf.basedb.core.Group;
 import net.sf.basedb.core.MultiPermissions;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.PluginConfiguration;
 import net.sf.basedb.core.PluginDefinition;
 import net.sf.basedb.core.Quota;
@@ -43 +46 @@
 import net.sf.basedb.plugins.PlateFlatFileImporter;
 import net.sf.basedb.plugins.PrintMapFlatFileImporter;
-import net.sf.basedb.plugins.ReporterFlatFileImporter;
 import net.sf.basedb.plugins.ReporterMapFlatFileImporter;
+import net.sf.basedb.test.FileUtil;
+import net.sf.basedb.test.MouseData;
+import net.sf.basedb.test.PluginUtil;
 import net.sf.basedb.test.TestUtil;
 
@@ -55 +60 @@
   <li>Create user: {@link #createPowerUser(DbControl, Group)}
   <li>Create guest: {@link #createGuest(DbControl, Group)}
+  <li>Create fileformat for import:
+  <li>Import reporters:
   </ol>
   
@@ -87 +94 @@
       Set<Permission> USE = EnumSet.of(Permission.USE);
       Set<SharedItem> plugins = new HashSet<SharedItem>();
-      plugins.add(PluginDefinition.getByClassName(dc, ReporterFlatFileImporter.class.getName()));
       plugins.add(PluginDefinition.getByClassName(dc, PlateFlatFileImporter.class.getName()));
       plugins.add(PluginDefinition.getByClassName(dc, ReporterMapFlatFileImporter.class.getName()));
@@ -93 +99 @@
       addPermissions(dc, powerUser, plugins, USE);
       dc.commit();
+      
+      //Configuration to import reporters
+      dc = TestUtil.getDbControl();
+      PluginConfiguration reporterImporter = PluginUtil.createPluginConfiguration(dc, "Reporters for project A", 
+          "net.sf.basedb.plugins.ReporterFlatFileImporter", MouseData.getReporterParameters());
+
+      PluginConfiguration genePixReporterImporter = PluginUtil.createPluginConfiguration(dc, "Reporters from GenePix file",
+          "net.sf.basedb.plugins.ReporterFlatFileImporter", MouseData.getGenePixReporterParameters());
+      dc.commit();
+      
+      //Upload file with reporters
+      dc = TestUtil.getDbControl();
+      File reporters = FileUtil.uploadFile(dc, "plates_and_reporters.mouse.v4.37k.txt", FileType.PLATE);
+      dc.commit();
+      
+      //Import reporters
+      PluginUtil.importReporters(reporterImporter, reporters, "Importing reporters for project A");
       
       TestUtil.logout();

trunk/src/test/net/sf/basedb/test/roles/PowerUserTest.java

@@ -73 +73 @@
   <li>Create plate type: {@link #createPlateType(DbControl, String, int, int)}
   <li>Create file formats for import:
-  <li>Import reporters:
   <li>Import plates:
   <li>Create array design: {@link #createArrayDesign(DbControl, String)}
@@ -133 +132 @@
           "net.sf.basedb.plugins.PlateFlatFileImporter", MouseData.getPlateParameters());
 
-      PluginConfiguration reporterImporter = PluginUtil.createPluginConfiguration(dc, "Reporters for project A", 
-          "net.sf.basedb.plugins.ReporterFlatFileImporter", MouseData.getReporterParameters());
-
-      PluginConfiguration genePixReporterImporter = PluginUtil.createPluginConfiguration(dc, "Reporters from GenePix file",
-          "net.sf.basedb.plugins.ReporterFlatFileImporter", MouseData.getGenePixReporterParameters());
-      
       PluginConfiguration genePixFeatureImporter = PluginUtil.createPluginConfiguration(dc, "Features from GenePix file",
           "net.sf.basedb.plugins.ReporterMapFlatFileImporter", MouseData.getGenePixReporterMapParameters());
@@ -154 +147 @@
       dc = TestUtil.getDbControl();
 
-      File plates = FileUtil.uploadFile(dc, "plates_and_reporters.mouse.v4.37k.txt", FileType.PLATE);
-      File reporters = plates; // Reporter info is found in the plate file
+      File plates = FileUtil.uploadFile(dc, "plates_and_reporters.mouse.v4.37k.txt", FileType.PLATE);     
       File printMap = FileUtil.uploadFile(dc, "printmap.mouse.v4.37k.tam", FileType.PRINT_MAP);
       
       dc.commit();
       
-      PluginUtil.importReporters(reporterImporter, reporters, "Importing reporters for project A");
       importPlates(platesImporter, plates, "Plate A", plateType);