Merge remote-tracking branch 'origin/develop' into fb_mail_transport_via_graph

Author: labkey-bpatel

src/org/labkey/test/params/FieldDefinition.java

@@ -606,7 +606,6 @@ public boolean isMeasureByDefault()
             }
         };
         ColumnType File = new ColumnTypeImpl("File", "http://cpas.fhcrc.org/exp/xml#fileLink");
-        ColumnType Flag = new ColumnTypeImpl("Flag", "string", "http://www.labkey.org/exp/xml#flag", null);
         ColumnType Attachment = new ColumnTypeImpl("Attachment", "http://www.labkey.org/exp/xml#attachment");
         ColumnType User = new ColumnTypeImpl("User", "int", null, new IntLookup("core", "users"));
         @Deprecated(since = "22.10") // 'Lookup' isn't a type outside of the UI

src/org/labkey/test/tests/AbstractAssayTest.java

@@ -388,7 +388,7 @@ protected void defineAssay()
                 .setType(TEST_ASSAY_DATA_PROP_TYPES[i - TEST_ASSAY_DATA_PREDEFINED_PROP_COUNT])
                 .setLabel(TEST_ASSAY_DATA_PROP_NAME + i);
         }
-        propertiesPanel.addField("Flags").setType(FieldDefinition.ColumnType.Flag);
+
         // Set some to required
         propertiesPanel.getField(0).setRequiredField(true);
         propertiesPanel.getField(TEST_ASSAY_DATA_PREDEFINED_PROP_COUNT + 2).setRequiredField(true);

src/org/labkey/test/tests/DataClassTest.java

@@ -420,7 +420,8 @@ private void verifyTableIndices(String prefix, List<String> indexSuffixes)
     {
         List<String> suffixes  = new ArrayList<>();
         suffixes.add("lsid");
-        suffixes.add("name_classid");
+        suffixes.add("name");
+        suffixes.add("rowid");
         suffixes.addAll(indexSuffixes);
 
         for (String suffix : suffixes)

src/org/labkey/test/tests/DataViewsTest.java

@@ -471,7 +471,9 @@ public void sortDataViewsTest()
 
         // check if top category sorts Alphabetical
         openCustomizePanel(ORIGINAL_WEBPART_TITLE);
-        RadioButton().withLabel("Alphabetical").find(getDriver()).check();
+        var alphabeticalRadio = RadioButton().withLabel("Alphabetical").find(getDriver());
+        alphabeticalRadio.check();
+        waitFor(alphabeticalRadio::isChecked, "Radio button 'Alphabetical' did not become checked after clicking.", 2000);
         clickButton("Save", 0);
         _ext4Helper.waitForMaskToDisappear();
         assertTextPresentInThisOrder(CATEGORIES[0], "Abbreviated Demographics", "Alt ID mapping", "APX-1: Abbreviated Physical Exam",

src/org/labkey/test/tests/FlagColumnTest.java

@@ -64,6 +64,7 @@
 import org.labkey.test.util.EscapeUtil;
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.Maps;
+import org.labkey.test.util.OptionalFeatureHelper;
 import org.labkey.test.util.PortalHelper;
 import org.labkey.test.util.TestDataGenerator;
 import org.labkey.test.util.TextSearcher;
@@ -1693,6 +1694,7 @@ public void testAutoIncrementKeyEncoded()
     @Test
     public void testMultiChoiceValues()
     {
+        OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
         Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
         // setup a list with an auto-increment key and multi text choice field
         String encodedListName = TestDataGenerator.randomDomainName("multiChoiceList", DomainUtils.DomainKind.IntList);