Backport GridPanelTest update to expect Units field in field dialog (#2730)

Author: cnathe

src/org/labkey/test/tests/component/GridPanelTest.java

@@ -72,6 +72,7 @@ public class GridPanelTest extends GridPanelBaseTest
     private static final FieldInfo FILTER_BOOL_COL = FieldInfo.random("Bool", FieldDefinition.ColumnType.Boolean);
     private static final FieldInfo FILTER_DATE_COL = FieldInfo.random("Date", FieldDefinition.ColumnType.DateAndTime);
     private static final String FILTER_STORED_AMOUNT_COL = "Amount";
+    private static final String FILTER_UNITS_COL = "Units";
 
     // Views and columns used in the views. The views are only applied to the small sample type (Small_SampleType).
     private static final String VIEW_EXTRA_COLUMNS = "Extra_Columns";
@@ -1742,6 +1743,7 @@ public void testFilterDialogWithViews() throws IOException, CommandException
         expectedList.add(FILTER_STRING_COL.getLabel());
         expectedList.add(FILTER_DATE_COL.getLabel());
         expectedList.add(FILTER_STORED_AMOUNT_COL);
+        expectedList.add(FILTER_UNITS_COL);
 
         actualList = filterDialog.getAvailableFieldLabels();
 
@@ -1801,6 +1803,7 @@ public void testFilterDialogWithViews() throws IOException, CommandException
         expectedList.add(FILTER_BOOL_COL.getLabel());
         expectedList.add(FILTER_DATE_COL.getLabel());
         expectedList.add(FILTER_STORED_AMOUNT_COL);
+        expectedList.add(FILTER_UNITS_COL);
 
         filterDialog = grid.getGridBar().openFilterDialog();