Skip to content

Commit c9c63d0

Browse files
labkey-tchadlabkey-tchad
committed
Stop using more deprecated methods
1 parent 13f3c69 commit c9c63d0

12 files changed

Lines changed: 38 additions & 37 deletions

‎src/org/labkey/test/pages/query/UpdateQueryRowPage.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,21 @@ public void setFields(Map<String, ?> fields)
5959
for (Map.Entry<String, ?> entry : fields.entrySet())
6060
{
6161
Object value = entry.getValue();
62-
if (value instanceof String)
62+
if (value instanceof String s)
6363
{
64-
setField(entry.getKey(), (String) value);
64+
setField(entry.getKey(), s);
6565
}
66-
else if (value instanceof Boolean)
66+
else if (value instanceof Boolean b)
6767
{
68-
setField(entry.getKey(), (Boolean) value);
68+
setField(entry.getKey(), b);
6969
}
70-
else if (value instanceof Integer)
70+
else if (value instanceof Integer i)
7171
{
72-
setField(entry.getKey(), (Integer) value);
72+
setField(entry.getKey(), i);
7373
}
74-
else if (value instanceof File)
74+
else if (value instanceof File f)
7575
{
76-
setField(entry.getKey(), (File) value);
76+
setField(entry.getKey(), f);
7777
}
7878
else
7979
{

‎src/org/labkey/test/tests/AbstractExportTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void preTest()
103103
exportHelper = new DataRegionExportHelper(dataRegion);
104104

105105
if (hasSelectors())
106-
dataRegion.uncheckAll();
106+
dataRegion.uncheckAllOnPage();
107107
}
108108

109109
@Test

‎src/org/labkey/test/tests/ButtonCustomizationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
import org.labkey.test.params.FieldDefinition;
2626
import org.labkey.test.params.FieldDefinition.ColumnType;
2727
import org.labkey.test.util.DataRegionTable;
28+
import org.labkey.test.util.DataRegionTable.DataRegionFinder;
2829
import org.labkey.test.util.PortalHelper;
2930
import org.labkey.test.util.WikiHelper;
3031

3132
import java.util.Arrays;
3233
import java.util.List;
34+
import java.util.Map;
3335

3436
import static org.junit.Assert.assertTrue;
3537

@@ -101,12 +103,10 @@ public void testSteps()
101103
goToManageLists();
102104
clickAndWait(Locator.linkWithText(LIST_NAME));
103105
assertButtonNotPresent(METADATA_OVERRIDE_BUTTON);
104-
DataRegionTable.findDataRegion(this).clickInsertNewRow();
105-
setFormElement(Locator.name("quf_name"), "Seattle");
106-
clickButton("Submit");
107-
DataRegionTable.findDataRegion(this).clickInsertNewRow();
108-
setFormElement(Locator.name("quf_name"), "Portland");
109-
clickButton("Submit");
106+
new DataRegionFinder(getDriver()).find().clickInsertNewRow()
107+
.update(Map.of("name", "Seattle"));
108+
new DataRegionFinder(getDriver()).find().clickInsertNewRow()
109+
.update(Map.of("name", "Portland"));
110110

111111
// assert custom buttons can be added to the standard set:
112112
beginAt("/query/" + PROJECT_NAME + "/schema.view?schemaName=lists");

‎src/org/labkey/test/tests/DatasetExportTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void setupDataset() throws Exception
108108
clickAndWait(Locator.linkWithText(ASSAY_RUN_FILE.getName()));
109109

110110
DataRegionTable assayResults = new DataRegionTable(super.getDataRegionId(), this);
111-
assayResults.checkAll();
111+
assayResults.checkAllOnPage();
112112
clickButton("Link to Study");
113113
selectOptionByText(Locator.name("targetStudy"), "/" + getProjectName() + "/" + getFolderName() + " (" + getFolderName() + " Study)");
114114
clickButton("Next");

‎src/org/labkey/test/tests/DatasetPublishTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.ArrayList;
3030
import java.util.Arrays;
3131
import java.util.List;
32+
import java.util.Map;
3233

3334
@Category({Daily.class})
3435
@BaseWebDriverTest.ClassTimeout(minutes = 6)
@@ -90,12 +91,12 @@ private void addRowToSourceDataset()
9091
{
9192
goToProjectHome();
9293
goToDataset("Demographics");
93-
DataRegionTable.findDataRegion(this).clickInsertNewRow();
94-
waitForElement(Locator.name("quf_ParticipantId"));
95-
setFormElement(Locator.name("quf_ParticipantId"), "addedParticipant67676");
96-
setFormElement(Locator.name("quf_date"), "1/1/2001");
97-
setFormElement(Locator.name("quf_Comments"), "Comment on added participant");
98-
clickButton("Submit");
94+
new DataRegionTable.DataRegionFinder(getDriver()).find()
95+
.clickInsertNewRow()
96+
.update(Map.of(
97+
"ParticipantId", "addedParticipant67676",
98+
"date", "1/1/2001",
99+
"Comments", "Comment on added participant"));
99100
}
100101

101102
@LogMethod

‎src/org/labkey/test/tests/UniprotAnnotationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public void testSteps()
6868
if (alreadyLoaded)
6969
{
7070
annotInsertions.setFilter("FileName", "Contains", UNIPROT_FILENAME);
71-
annotInsertions.checkAll();
71+
annotInsertions.checkAllOnPage();
7272
doAndWaitForPageToLoad(() ->
7373
{
74-
annotInsertions.clickHeaderButtonByText("Delete");
74+
annotInsertions.clickHeaderButton("Delete");
7575
acceptAlert();
7676
});
7777
}

‎src/org/labkey/test/tests/UserDetailsPermissionTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.labkey.test.pages.query.ExecuteQueryPage;
3232
import org.labkey.test.params.FieldDefinition;
3333
import org.labkey.test.util.ApiPermissionsHelper;
34-
import org.labkey.test.util.DataRegionTable;
34+
import org.labkey.test.util.DataRegionTable.DataRegionFinder;
3535
import org.labkey.test.util.LogMethod;
3636
import org.labkey.test.util.PasswordUtil;
3737
import org.labkey.test.util.PortalHelper;
@@ -145,7 +145,7 @@ public void testUserVisibilityViaLookup()
145145

146146
log("Verify that emails cannot be seen in list via lookup");
147147
clickAndWait(Locator.linkWithText(EMAIL_TEST_LIST));
148-
DataRegionTable.findDataRegion(this).goToView(HIDDEN_COL_VIEW);
148+
new DataRegionFinder(getDriver()).find().goToView(HIDDEN_COL_VIEW);
149149
assertTextPresent(displayName);
150150
// This user does not have permission to see user details, so no link
151151
assertElementNotPresent(Locator.linkWithText(displayName));
@@ -157,7 +157,7 @@ public void testUserVisibilityViaLookup()
157157

158158
log("Verify that user table info can be seen with permission");
159159
clickAndWait(Locator.linkWithText(EMAIL_TEST_LIST));
160-
DataRegionTable.findDataRegion(this).goToView(HIDDEN_COL_VIEW);
160+
new DataRegionFinder(getDriver()).find().goToView(HIDDEN_COL_VIEW);
161161
assertTextPresent(CHECKED_USER, ADMIN_USER, HIDDEN_STRING);
162162
}
163163

@@ -171,7 +171,7 @@ public void testUserVisibilityViaQuery()
171171
ExecuteQueryPage.beginAt(this, "core", "Users");
172172

173173
log("Verify that emails cannot be seen in query webpart");
174-
DataRegionTable.findDataRegion(this).goToView(HIDDEN_COL_VIEW);
174+
new DataRegionFinder(getDriver()).find().goToView(HIDDEN_COL_VIEW);
175175
assertElementPresent(Locator.linkWithText(displayName));
176176
assertTextNotPresent(CHECKED_USER, ADMIN_USER, HIDDEN_STRING);
177177

@@ -180,7 +180,7 @@ public void testUserVisibilityViaQuery()
180180
ExecuteQueryPage.beginAt(this, "core", "Users");
181181

182182
log("Verify that user table info can be seen with permission");
183-
DataRegionTable.findDataRegion(this).goToView(HIDDEN_COL_VIEW);
183+
new DataRegionFinder(getDriver()).find().goToView(HIDDEN_COL_VIEW);
184184
assertTextPresent(CHECKED_USER, ADMIN_USER, HIDDEN_STRING);
185185
}
186186

@@ -249,10 +249,10 @@ private void createHiddenEmailList()
249249
_listHelper.createList(getProjectName(), EMAIL_TEST_LIST, "Key", userColumn);
250250
goToManageLists();
251251
clickAndWait(Locator.linkWithText(EMAIL_TEST_LIST));
252-
DataRegionTable.findDataRegion(this).clickInsertNewRow();
252+
new DataRegionFinder(getDriver()).find().clickInsertNewRow();
253253
selectOptionByText(Locator.name("quf_user"), _userHelper.getDisplayNameForEmail(CHECKED_USER));
254254
clickButton("Submit");
255-
DataRegionTable.findDataRegion(this).clickInsertNewRow();
255+
new DataRegionFinder(getDriver()).find().clickInsertNewRow();
256256
selectOptionByText(Locator.name("quf_user"), _userHelper.getDisplayNameForEmail(ADMIN_USER));
257257
clickButton("Submit");
258258
_customizeViewsHelper.openCustomizeViewPanel();

‎src/org/labkey/test/tests/issues/IssuesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void returnToProject()
199199
DataRegionTable issuesTable = new DataRegionTable(ISSUE_LIST_REGION_NAME, getDriver());
200200

201201
// clear region selection and filters
202-
issuesTable.uncheckAll();
202+
issuesTable.uncheckAllOnPage();
203203
issuesTable.clearAllFilters();
204204

205205
// reset folder filter
@@ -599,7 +599,7 @@ public void viewSelectedDetailsTest()
599599
DataRegionTable issuesTable = new DataRegionTable(ISSUE_LIST_REGION_NAME, getDriver());
600600

601601
issuesTable.setFilter("Status", "Has Any Value", null);
602-
issuesTable.checkAll();
602+
issuesTable.checkAllOnPage();
603603
clickButton("View Details");
604604
assertTextPresent(
605605
ISSUE_0.get("comment"),

‎src/org/labkey/test/tests/list/ListTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ public void testCustomViews()
753753
assertTextPresent(TEST_DATA[TD_DESC][1], 2);
754754

755755
log("Test deleting rows");
756-
dataRegionTable.checkAll();
756+
dataRegionTable.checkAllOnPage();
757757
doAndWaitForPageToLoad(() ->
758758
{
759759
dt.clickHeaderButton("Delete");

‎src/org/labkey/test/tests/remoteapi/BulkUpdateGroupApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private void deleteTestUsers(String suffix)
8080

8181
if (usersTable.getDataRowCount() > 0)
8282
{
83-
usersTable.checkAll();
83+
usersTable.checkAllOnPage();
8484
clickButton("Delete");
8585
clickButton("Permanently Delete");
8686
}

0 commit comments

Comments
 (0)