Merge 19.3.1 into develop

Author: labkey-tchad

LDK/src/org/labkey/ldk/query/IndexStatsTable.java

@@ -1,16 +1,13 @@
 package org.labkey.ldk.query;
 
 import org.jetbrains.annotations.NotNull;
-import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.ContainerFilter;
-import org.labkey.api.data.CrosstabMeasure;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.JdbcType;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.VirtualTable;
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.UserSchema;
-import org.labkey.ldk.LDKSchema;
 
 /**
 

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -40,6 +40,7 @@
 import org.labkey.test.categories.External;
 import org.labkey.test.categories.LabModule;
 import org.labkey.test.components.CustomizeView;
+import org.labkey.test.components.ext4.ComboBox;
 import org.labkey.test.components.ext4.RadioButton;
 import org.labkey.test.util.APIContainerHelper;
 import org.labkey.test.util.AdvancedSqlTest;
@@ -1782,7 +1783,9 @@ private void defaultAssayImportMethodTest()
         waitAndClickAndWait(Locator.linkContainingText("Set Assay Defaults"));
         String defaultVal = "UC Davis STR";
         _helper.waitForField(GENOTYPING_ASSAYNAME);
-        Ext4FieldRef.getForLabel(this, GENOTYPING_ASSAYNAME).setValue(defaultVal);
+        ComboBox.ComboBox(getDriver()).withLabelContaining(GENOTYPING_ASSAYNAME)
+                .find(getDriver())
+                .selectComboBoxItem(defaultVal);
         waitAndClick(Ext4Helper.Locators.ext4Button("Submit"));
 
         waitForElement(Ext4Helper.Locators.window("Success"));