Additional tests

Author: labkey-nicka

src/org/labkey/remoteapi/plate/PlateParams.java

@@ -2,12 +2,14 @@
 
 import org.json.JSONObject;
 
+import java.util.List;
 import java.util.Map;
 
 public class PlateParams
 {
     private boolean _archived;
     private String _assayType;
+    private String _barcode;
     private int _columns;
     private String _description;
     private String _name;
@@ -50,13 +52,19 @@ public PlateParams(JSONObject json)
 
         if (json.has("archived"))
             _archived = json.getBoolean("archived");
+
+        if (json.has("barcode"))
+            _barcode = json.getString("barcode");
     }
 
+    public static final List<String> QUERY_COLUMNS = List.of("Archived", "AssayType", "Barcode", "Description", "Name", "PlateId", "PlateSet", "PlateType", "PlateType/Columns", "PlateType/Rows", "RowId", "Template");
+
     public static PlateParams fromQueryRow(Map<String, Object> row)
     {
         var params = new PlateParams();
         params._archived = (Boolean) row.get("Archived");
         params._assayType = (String) row.get("AssayType");
+        params._barcode = (String) row.get("Barcode");
         params._columns = (Integer) row.get("PlateType/Columns");
         params._description = (String) row.get("Description");
         params._name = (String) row.get("Name");
@@ -70,6 +78,11 @@ public static PlateParams fromQueryRow(Map<String, Object> row)
         return params;
     }
 
+    public String getBarcode()
+    {
+        return _barcode;
+    }
+
     public String getName()
     {
         return _name;

src/org/labkey/remoteapi/plate/PlateSetParams.java

@@ -2,7 +2,7 @@
 
 import org.json.JSONObject;
 
-import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 public class PlateSetParams
@@ -65,6 +65,8 @@ public PlateSetParams(JSONObject json)
             _plateSetType = CreatePlateSetParams.PlateSetType.fromName(json.getString("type"));
     }
 
+    public static final List<String> QUERY_COLUMNS = List.of("Archived", "Created", "CreatedBy", "Description", "Folder/EntityId", "Folder/Name", "Folder/Path", "Modified", "ModifiedBy", "Name", "PlateCount", "PlateSetId", "PrimaryPlateSetId", "RootPlateSetId", "RowId", "Template", "Type");
+
     public static PlateSetParams fromQueryRow(Map<String, Object> row)
     {
         var params = new PlateSetParams();

src/org/labkey/test/LabKeySiteWrapper.java

@@ -1530,26 +1530,26 @@ protected SelectRowsResponse executeSelectRowCommand(String schemaName, String q
     protected SelectRowsResponse executeSelectRowCommand(String schemaName, String queryName, ContainerFilter containerFilter,
                                                          String path, @Nullable List<Filter> filters, @Nullable List<String> requestedColumns)
     {
-        Connection cn = createDefaultConnection();
         SelectRowsCommand selectCmd = new SelectRowsCommand(schemaName, queryName);
         selectCmd.setMaxRows(-1);
         selectCmd.setContainerFilter(containerFilter);
         selectCmd.setColumns(requestedColumns);
         if (filters != null)
             selectCmd.setFilters(filters);
 
-        SelectRowsResponse selectResp;
+        return executeSelectRowCommand(path, selectCmd);
+    }
 
+    protected SelectRowsResponse executeSelectRowCommand(String containerPath, SelectRowsCommand command)
+    {
         try
         {
-            selectResp = selectCmd.execute(cn, path);
+            return command.execute(createDefaultConnection(), containerPath);
         }
         catch (CommandException | IOException e)
         {
             throw new RuntimeException(e);
         }
-
-        return selectResp;
     }
 
     // Returns the text contents of every "Status" cell in the pipeline StatusFiles grid