Regression coverage for 52245

ms2/test/src/org/labkey/test/ms2/MS2TestBase.java

@@ -82,7 +82,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
 
     protected void createProjectAndFolder()
     {
-        _containerHelper.createProject(getProjectName(), null);
+        _containerHelper.createProject(getProjectName(), "MS2");
         _containerHelper.createSubfolder(getProjectName(), FOLDER_NAME, "MS2");
 
         log("Set bad pipeline root.");

ms2/test/src/org/labkey/test/tests/ms2/MS2Test.java

@@ -41,6 +41,7 @@
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 @Category({MS2.class, Daily.class})
@@ -71,13 +72,11 @@ protected void setupMS2()
     protected void verifyMS2()
     {
         verifyFirstRun();
-
         validateSecondRun();
-
         validateRunGroups();
-
         queryValidationTest();
         pepXMLtest();
+        validateContainerFilter();
     }
 
     private void verifyFirstRun()
@@ -921,7 +920,7 @@ private void validateRunGroups()
         verifyGroupAudit();
     }
 
-        //verify audit trail registers runs added to or removed from groups.
+    //verify audit trail registers runs added to or removed from groups.
     private void verifyGroupAudit()
     {
         List<Map<String, Object>> rows = executeSelectRowCommand("auditLog", "ExperimentAuditEvent").getRows();
@@ -1224,4 +1223,40 @@ public Set<String> getFilters()
         }
         return result;
     }
+
+    /**
+     * Issue 52245 - container filter not getting propagated to run group lookup
+     */
+    private void validateContainerFilter()
+    {
+        // create a run group at the project level
+        goToProjectHome(getProjectName());
+        clickAndWait(Locator.linkWithText("Run Groups"));
+        clickButton("Create Run Group");
+        setFormElement(Locator.name("name"), RUN_GROUP3_NAME);
+        clickButton("Submit");
+
+        navigateToFolder(FOLDER_NAME);
+        DataRegionTable runsTable = new DataRegionTable(REGION_NAME_SEARCH_RUNS, this);
+        runsTable.checkAllOnPage();
+        runsTable.clickHeaderMenu("Add to run group", RUN_GROUP3_NAME);
+
+        goToProjectHome(getProjectName());
+        goToSchemaBrowser();
+        DataRegionTable dataTable = viewQueryData("ms2", "XTandemPeptides");
+        dataTable.setContainerFilter(DataRegionTable.ContainerFilterType.CURRENT_AND_SUBFOLDERS);
+
+        _customizeViewsHelper.openCustomizeViewPanel();
+        _customizeViewsHelper.addColumn(new String[]{"Fraction", "Run", "ExperimentRunLSID", "RunGroups"});
+        _customizeViewsHelper.applyCustomView();
+        assertNotEquals("All rows should have a value for the run group", 0, dataTable.getDataRowCount());
+
+        // validate a single run group with the expected label
+        Set<String> runGroups = new HashSet<>(dataTable.getColumnDataAsText("RunGroups"));
+        assertEquals("Incorrect number of run groups", 1, runGroups.size());
+        assertEquals("Invalid run group label", RUN_GROUP3_NAME, runGroups.iterator().next());
+
+        dataTable.setFilter("Fraction/Run/ExperimentRunLSID/RunGroups", "Is Blank");
+        assertEquals("All rows should have a value for the run group", 0, dataTable.getDataRowCount());
+    }
 }