Get rid of more CustomizeView methods

Author: labkey-tchad

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

@@ -26,6 +26,7 @@
 import org.labkey.test.categories.MS2;
 import org.labkey.test.components.CustomizeView;
 import org.labkey.test.ms2.MS2TestBase;
+import org.labkey.test.params.FieldKey;
 import org.labkey.test.util.DataRegionExportHelper;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.TextSearcher;
@@ -127,9 +128,9 @@ private void spectraCountTest()
         // Customize view to pull in other columns
         _customizeViewsHelper.openCustomizeViewPanel();
         _customizeViewsHelper.addColumn("TrimmedPeptide");
-        _customizeViewsHelper.addColumn(new String[] {"Protein", "ProtSequence"});
-        _customizeViewsHelper.addColumn(new String[] {"Protein", "BestName"});
-        _customizeViewsHelper.addColumn(new String[] {"Protein", "Mass"});
+        _customizeViewsHelper.addColumn(FieldKey.fromParts("Protein", "ProtSequence"));
+        _customizeViewsHelper.addColumn(FieldKey.fromParts("Protein", "BestName"));
+        _customizeViewsHelper.addColumn(FieldKey.fromParts("Protein", "Mass"));
         _customizeViewsHelper.saveDefaultView();
         assertTextPresent("84731", "MPEETQAQDQPMEEEEVETFAFQAEIAQLM");
 

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

@@ -1249,7 +1249,7 @@ private void validateContainerFilter()
         dataTable.setContainerFilter(DataRegionTable.ContainerFilterType.CURRENT_AND_SUBFOLDERS);
 
         _customizeViewsHelper.openCustomizeViewPanel();
-        _customizeViewsHelper.addColumn(new String[]{"Fraction", "Run", "ExperimentRunLSID", "RunGroups"});
+        _customizeViewsHelper.addColumn(FieldKey.fromParts("Fraction", "Run", "ExperimentRunLSID", "RunGroups"));
         _customizeViewsHelper.applyCustomView();
         assertNotEquals("All rows should have a value for the run group", 0, dataTable.getDataRowCount());
 

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

@@ -24,6 +24,7 @@
 import org.labkey.test.categories.Daily;
 import org.labkey.test.categories.MS2;
 import org.labkey.test.components.CustomizeView;
+import org.labkey.test.params.FieldKey;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.FileBrowserHelper;
 import org.labkey.test.util.LogMethod;
@@ -38,8 +39,8 @@ public class SequestImportTest extends BaseWebDriverTest
 {
     private static final String PROJECT_NAME = "SequestImport" + TRICKY_CHARACTERS_FOR_PROJECT_NAMES;
 
-    private static final String[] TOTAL_PEPTIDES_FIELD_KEY = {"PeptideCounts", "TotalPeptides"};
-    private static final String[] UNIQUE_PEPTIDES_FIELD_KEY = {"PeptideCounts", "DistinctPeptides"};
+    private static final FieldKey TOTAL_PEPTIDES_FIELD_KEY = FieldKey.fromParts("PeptideCounts", "TotalPeptides");
+    private static final FieldKey UNIQUE_PEPTIDES_FIELD_KEY = FieldKey.fromParts("PeptideCounts", "DistinctPeptides");
 
     @Override
     protected String getProjectName()