fix tests

Author: XingY

api/src/org/labkey/api/audit/SampleTimelineAuditEvent.java

@@ -251,10 +251,14 @@ private String withResolvedLabels(String recordMap, Container container)
         EXCLUDED_DETAIL_FIELDS.forEach(row::remove);
 
         String statusLabel = getStatusLabel(row, container);
-        row.put("samplestatelabel", statusLabel);
+        if (row.containsKey("samplestate"))
+            row.put("samplestatelabel", statusLabel);
 
-        String colorLabel = getColorLabel(row, container);
-        row.put("expmaterialcolorlabel", colorLabel);
+        if (row.containsKey(ExpMaterialColor.name()))
+        {
+            String colorLabel = getColorLabel(row, container);
+            row.put("expmaterialcolorlabel", colorLabel);
+        }
 
         return AbstractAuditTypeProvider.encodeForDataMap(row);
     }

api/src/org/labkey/api/data/ContainerManager.java

@@ -1951,13 +1951,6 @@ private static boolean delete(final Container c, User user, @Nullable String com
             // and delete all container-based sequences
             DbSequenceManager.deleteAll(c);
 
-            ExperimentService experimentService = ExperimentService.get();
-            if (experimentService != null)
-            {
-                experimentService.removeContainerDataTypeExclusions(c.getId());
-                experimentService.removeContainerDataColorExclusions(c.getId());
-            }
-
             // Issue 17015: After we've committed the transaction, be sure that we remove this container from the cache
             tx.addCommitTask(() ->
             {

api/src/org/labkey/api/exp/api/ExperimentService.java

@@ -1160,7 +1160,7 @@ List<? extends ExpProtocol> getExpProtocolsWithParameterValue(
 
     void removeDataColorExclusionsForDataType(long dataTypeId, DataTypeForExclusion dataType);
 
-    void removeContainerDataColorExclusions(String containerId);
+    void removeContainerDataColors(String containerId);
 
     void registerRunInputsViewProvider(QueryViewProvider<ExpRun> provider);
 

experiment/src/org/labkey/experiment/api/DataColorTable.java

@@ -466,34 +466,10 @@ public void testArchivedNonExcludedColorCanBeImported() throws Exception
             assertNull("an archived non-excluded color should still be insertable", saveSample(st, sampleRow("s1", gray), false));
         }
 
-        @Test
-        public void testCannotInsertSampleWithBadColor() throws Exception
-        {
-
-            ExpSampleType st = createSampleType("ColorCaseST");
-            insertColor("Red", "#ff0000", false);
-
-            Map<String, Object> exactCase = new CaseInsensitiveHashMap<>();
-            exactCase.put("Name", "exactCase");
-            exactCase.put("ExpMaterialColor", "Red");
-            assertNull("a sample referencing the color by its exact label should import", saveSample(st, exactCase, false));
-
-            // cannot insert sample with colr differing by case
-            Map<String, Object> wrongCase = new CaseInsensitiveHashMap<>();
-            wrongCase.put("Name", "wrongCase");
-            wrongCase.put("ExpMaterialColor", "red");
-            String err = saveSample(st, wrongCase, false);
-            assertNotNull("a color label differing only by case should not resolve to the existing color", err);
-            assertTrue("Unexpected error: " + err, err.toLowerCase().contains("not found"));
-
-            // cannot insert sample with non-existent color
-            Map<String, Object> unknown = new CaseInsensitiveHashMap<>();
-            unknown.put("Name", "unknownColor");
-            unknown.put("ExpMaterialColor", "Purple"); // no such color exists
-            err = saveSample(st, unknown, false);
-            assertNotNull("a sample referencing a nonexistent color should be rejected", err);
-            assertTrue("Unexpected error: " + err, err.toLowerCase().contains("not found"));
-        }
+        // Note: resolving a color by its Label (and rejecting a wrong-case or nonexistent label) is an import-path
+        // concern — the label -> rowId remap happens in the ETL/import DataIterator, not in a direct QUS insertRows
+        // (which expects the ExpMaterialColor key). That coverage lives in the remoteapi SMSampleColorsApiTest, which
+        // imports by label via QueryApiHelper.importData.
 
         // ---- exclusion service methods --------------------------------------
 

experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java

@@ -5622,6 +5622,9 @@ public void deleteAllExpObjInContainer(Container c, User user) throws Experiment
             LOG.debug("Deleting objects from container {}", c);
             OntologyManager.deleteAllObjects(c, user);
 
+            removeContainerDataTypeExclusions(c.getId());
+            removeContainerDataColors(c.getId());
+
             transaction.commit();
         }
         catch (ValidationException e)
@@ -9260,7 +9263,7 @@ public void removeDataColorExclusionsForDataType(long dataTypeId, DataTypeForExc
     }
 
     @Override
-    public void removeContainerDataColorExclusions(String containerId)
+    public void removeContainerDataColors(String containerId)
     {
         SqlExecutor executor = new SqlExecutor(getExpSchema());
         SQLFragment delExclusions = new SQLFragment("DELETE FROM ")