From cab535497e3291fc70cc78698f3481b368493e8b Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sun, 8 Jun 2025 15:00:50 -0700 Subject: [PATCH 1/5] Minor auto-refactor code cleanup on a massive scale --- .../CommunityArtifactsController.java | 2 +- .../StarterArtifactsController.java | 2 +- .../org/labkey/AbstractAssayValidator.java | 6 +-- .../qc/src/org/labkey/AssayTransformNoOp.java | 9 ----- data/qc/src/org/labkey/AssayValidator.java | 4 +- .../crawlertest/CrawlerTestController.java | 2 +- .../com/dumbster/smtp/SimpleSmtpServer.java | 3 +- .../EditableModuleController.java | 5 ++- .../TestLinkedSchemaCustomizer.java | 2 +- .../linkedschematest/TestTableCustomizer.java | 1 - src/org/labkey/junit/rules/TestWatcher.java | 2 +- .../junit/runner/WebTestProperties.java | 4 +- .../remoteapi/admin/GetModulesResponse.java | 2 +- .../labkey/remoteapi/issues/IssueModel.java | 2 - .../remoteapi/issues/IssueResponseModel.java | 1 - .../remoteapi/plate/CreatePlateParams.java | 6 +-- .../remoteapi/plate/CreatePlateSetParams.java | 4 +- .../puppeteer/PuppeteerSettings.java | 1 - .../query/InsertExternalSchemaCommand.java | 4 +- .../remoteapi/security/GetRolesResponse.java | 2 +- .../serverapi/collections/ArrayListMap.java | 12 +++--- .../reader/AbstractDataLoaderFactory.java | 3 +- .../labkey/serverapi/reader/DataLoader.java | 5 +-- src/org/labkey/serverapi/reader/FileType.java | 12 +++--- .../labkey/serverapi/reader/TabFileType.java | 4 +- .../labkey/serverapi/reader/TabLoader.java | 14 +++---- src/org/labkey/test/AssayAPITest.java | 4 +- src/org/labkey/test/BaseWebDriverTest.java | 2 +- src/org/labkey/test/Cleanable.java | 2 +- src/org/labkey/test/Locator.java | 10 ++--- src/org/labkey/test/Runner.java | 27 +++++++------ src/org/labkey/test/SortDirection.java | 2 +- src/org/labkey/test/TestFileUtils.java | 2 - src/org/labkey/test/WebDriverWrapper.java | 12 +++--- .../test/aspects/MethodLoggingAspect.java | 18 ++++----- .../labkey/test/aspects/TestPerfAspect.java | 2 +- .../test/components/ChartTypeDialog.java | 4 +- .../test/components/ColumnChartComponent.java | 7 ++-- .../labkey/test/components/CustomizeView.java | 13 +++---- .../test/components/DomainDesignerPage.java | 2 +- .../test/components/LookAndFeelPieChart.java | 2 +- .../components/SummaryStatisticsDialog.java | 3 +- .../labkey/test/components/WebPartPanel.java | 4 +- .../components/bootstrap/LoggedOutDialog.java | 2 - .../domain/ConditionalFormatDialog.java | 2 +- .../domain/ConditionalFormatPanel.java | 2 +- .../test/components/domain/DetailPopover.java | 2 +- .../components/domain/DomainFieldRow.java | 2 +- .../components/domain/DomainFormPanel.java | 4 +- .../domain/RangeValidatorDialog.java | 2 +- .../domain/RangeValidatorPanel.java | 2 +- .../domain/RegexValidatorDialog.java | 2 +- .../domain/RegexValidatorPanel.java | 2 +- .../domain/TextChoiceValueDialog.java | 2 +- .../labkey/test/components/ext4/ComboBox.java | 4 +- .../test/components/html/BootstrapMenu.java | 1 - .../labkey/test/components/html/Checkbox.java | 2 +- .../test/components/html/RadioButton.java | 2 +- .../test/components/html/SelectWrapper.java | 4 +- .../test/components/html/SiteNavBar.java | 4 +- .../labkey/test/components/html/Table.java | 2 +- .../components/labkey/FormItemFinder.java | 3 +- .../components/labkey/ReadOnlyFormItem.java | 4 +- .../list/AdvancedListSettingsDialog.java | 4 +- .../labkey/test/components/react/Card.java | 6 --- .../components/react/DropdownButtonGroup.java | 4 +- .../react/FilteringReactSelect.java | 2 +- .../test/components/react/MultiMenu.java | 3 -- .../components/react/QueryChartDialog.java | 8 ++-- .../components/react/QueryChartPanel.java | 2 +- .../test/components/react/ReactCheckBox.java | 2 +- .../components/react/SelectInputOption.java | 9 +---- .../labkey/test/components/react/Tabs.java | 2 +- .../studydesigner/AssayScheduleWebpart.java | 14 +++---- .../BaseManageVaccineDesignPage.java | 8 ++-- .../BaseManageVaccineDesignVisitPage.java | 10 ++--- .../ImmunizationScheduleWebpart.java | 14 +++---- .../ManageAssaySchedulePage.java | 4 +- .../ManageTreatmentsSingleTablePage.java | 2 - .../studydesigner/VaccineDesignWebpart.java | 20 +++++----- .../test/components/ui/CollapsiblePanel.java | 2 +- .../test/components/ui/DetailTableRow.java | 2 +- .../components/ui/assay/RunDataPanel.java | 7 ---- .../domainproperties/EntityTypeDesigner.java | 2 +- .../ui/entities/EntityInsertPanel.java | 2 - .../components/ui/files/AttachmentCard.java | 2 +- .../ui/files/FileAttachmentContainer.java | 2 +- .../ui/files/FileAttachmentEntry.java | 2 +- .../components/ui/files/FileSelectTree.java | 2 +- .../test/components/ui/files/FileTree.java | 4 +- .../components/ui/grids/DetailDataPanel.java | 1 - .../test/components/ui/grids/GridBar.java | 6 --- .../ui/grids/ParentDetailPanel.java | 4 +- .../ui/navigation/FindByIdsDialog.java | 1 - .../components/ui/navigation/SubNavBar.java | 2 +- .../apps/ChangeTargetFolderDialog.java | 2 +- .../ui/navigation/apps/LKSNavContainer.java | 2 +- .../navigation/apps/ProductsNavContainer.java | 2 +- .../ui/ontology/ConceptPickerDialog.java | 1 - .../ui/ontology/OntologyTreeSearch.java | 4 +- .../test/components/ui/ontology/TreeNode.java | 3 -- .../ui/permissions/GroupDetailsPanel.java | 1 - .../components/ui/pipeline/StatusPage.java | 2 +- .../components/ui/search/SampleFinder.java | 8 ++-- .../pages/FolderManagementFolderTree.java | 10 ++--- src/org/labkey/test/pages/ImportDataPage.java | 2 +- src/org/labkey/test/pages/InsertPage.java | 3 +- src/org/labkey/test/pages/OlapTestJson.java | 2 +- .../labkey/test/pages/StartImportPage.java | 2 +- .../labkey/test/pages/TimeChartWizard.java | 4 +- .../test/pages/ViewDatasetDataPage.java | 1 - .../test/pages/admin/CreateProjectPage.java | 4 +- .../test/pages/admin/ReorderFoldersPage.java | 2 - .../test/pages/admin/UsageStatisticsPage.java | 2 - .../test/pages/announcements/AdminPage.java | 2 +- .../pages/announcements/EmailPrefsPage.java | 4 +- .../test/pages/assay/AssayUploadJobsPage.java | 2 - .../assay/ExclusionConfirmationPage.java | 2 +- .../assay/elisa/ElisaRunDetailsPage.java | 4 -- .../pages/core/UserNotificationsPage.java | 4 +- .../admin/FileTransferConfigurationPage.java | 1 - .../pages/core/admin/FolderTypePages.java | 2 +- .../pages/core/admin/logger/ManagerPage.java | 7 ++-- .../dataintegration/ETLSchedulerPage.java | 2 - .../test/pages/files/FileContentPage.java | 4 +- .../test/pages/issues/EmailPrefsPage.java | 2 - .../pages/issues/IssuesFormItemFinder.java | 3 +- .../pages/issues/IssuesReadOnlyFormItem.java | 2 +- .../pages/list/SetDefaultValuesListPage.java | 2 +- .../pipeline/PipelineStatusDetailsPage.java | 1 - .../test/pages/search/SearchResultsPage.java | 2 +- .../test/pages/study/DatasetDesignerPage.java | 4 +- .../study/ManageStudyNotificationPage.java | 4 +- .../pages/test/CoreComponentsTestPage.java | 3 -- .../experiment/SampleTypeDefinition.java | 2 +- .../labkey/test/pipeline/ExperimentGraph.java | 2 +- .../labkey/test/pipeline/PipelineFolder.java | 2 +- .../test/pipeline/PipelineTestsBase.java | 8 ++-- .../test/pipeline/PipelineWebTestBase.java | 2 +- .../test/selenium/ReclickingWebElement.java | 6 +-- .../labkey/test/stress/AbstractScenario.java | 2 +- src/org/labkey/test/studysampler/Runner.java | 4 +- .../labkey/test/teamcity/TeamCityUtils.java | 2 +- .../labkey/test/testpicker/TestHelper.java | 27 +++++++------ .../test/tests/AbstractAdminConsoleTest.java | 5 --- .../test/tests/AbstractKnitrReportTest.java | 2 +- .../test/tests/ActiveUserLimitationTest.java | 2 +- .../tests/AdminConsoleNavigationTest.java | 3 +- .../test/tests/AssayExportImportTest.java | 2 +- .../test/tests/AssayResultsExportTest.java | 2 +- .../test/tests/AttachmentFieldTest.java | 2 +- .../labkey/test/tests/BaseTermsOfUseTest.java | 4 +- .../labkey/test/tests/ChartingAPITest.java | 2 +- src/org/labkey/test/tests/ClientAPITest.java | 8 ++-- .../test/tests/ContainerContextTest.java | 4 +- src/org/labkey/test/tests/CrawlerTest.java | 2 +- .../CrossSiteScriptingForDeleteTest.java | 2 +- .../labkey/test/tests/CustomizeViewTest.java | 2 +- .../DataClassFolderExportImportTest.java | 6 +-- src/org/labkey/test/tests/DataClassTest.java | 2 +- .../labkey/test/tests/DataReportsTest.java | 2 +- .../tests/DataViewsReportOrderingTest.java | 2 +- .../test/tests/DatabaseDiagnosticsTest.java | 4 -- .../labkey/test/tests/DatasetExportTest.java | 2 +- .../labkey/test/tests/DomainDesignerTest.java | 10 +---- .../test/tests/DomainFieldTypeChangeTest.java | 2 +- .../test/tests/EditMetadataDomainTest.java | 2 +- .../tests/ExportOptionsMetadataOnlyTest.java | 2 +- .../labkey/test/tests/ExternalSchemaTest.java | 6 +-- .../test/tests/FacetedFilterCutoffTest.java | 2 +- .../FieldEditorRowSelectionActionTest.java | 2 +- .../test/tests/FileAttachmentColumnTest.java | 2 +- .../test/tests/FileBasedPipelineTest.java | 2 +- .../tests/FiltersOnMultipleGridsTest.java | 2 +- src/org/labkey/test/tests/FlagColumnTest.java | 2 +- .../labkey/test/tests/FolderExportTest.java | 2 +- src/org/labkey/test/tests/FolderTest.java | 5 +-- .../test/tests/FolderTreeEncodingTest.java | 2 +- .../test/tests/GenericMeasurePickerTest.java | 2 +- src/org/labkey/test/tests/GpatAssayTest.java | 2 +- src/org/labkey/test/tests/HTTPApiTest.java | 2 +- .../test/tests/InlineImagesAssayTest.java | 2 +- .../test/tests/InlineImagesListTest.java | 2 +- .../labkey/test/tests/JavaClientApiTest.java | 2 +- .../labkey/test/tests/LinkedReportTest.java | 2 +- .../labkey/test/tests/LinkedSchemaTest.java | 4 +- .../test/tests/LookupToSampleIDTest.java | 2 +- .../labkey/test/tests/MessagesLongTest.java | 8 ++-- .../labkey/test/tests/ModuleAssayTest.java | 4 +- .../test/tests/ModuleAssayTransformTest.java | 1 - .../test/tests/MultiplePKUploadAssayTest.java | 2 +- .../NonStandardDateAndTimeFormatTest.java | 2 +- ...PermissionsTestForJavascriptExecution.java | 2 +- src/org/labkey/test/tests/PortalTest.java | 7 ++-- .../test/tests/ProjectCreatorUserTest.java | 2 +- .../test/tests/ProjectSettingsTest.java | 2 +- .../test/tests/ProjectTermsOfUseTest.java | 1 - .../labkey/test/tests/QueryExportTest.java | 2 +- src/org/labkey/test/tests/RConfigTest.java | 6 +-- .../tests/RenameFolderJavaClientApiTest.java | 2 +- .../labkey/test/tests/ReportSharingTest.java | 2 +- src/org/labkey/test/tests/RlabkeyTest.java | 4 +- .../test/tests/SampleTypeExportTest.java | 2 +- .../SampleTypeFolderExportImportTest.java | 17 ++++----- .../test/tests/SampleTypeLimitsTest.java | 4 +- .../test/tests/SampleTypeLineageTest.java | 4 +- .../test/tests/SampleTypeLinkToStudyTest.java | 2 +- .../SampleTypeLinkedStudyExportTest.java | 2 +- .../tests/SampleTypeNameExpressionTest.java | 2 +- .../tests/SampleTypeParentColumnTest.java | 4 +- .../test/tests/SampleTypeRemoteAPITest.java | 11 +----- .../test/tests/SampleTypeRenameTest.java | 2 +- src/org/labkey/test/tests/SampleTypeTest.java | 6 +-- .../test/tests/ScriptValidationTest.java | 2 +- .../labkey/test/tests/SecurityApiTest.java | 2 +- .../labkey/test/tests/SimpleModuleTest.java | 4 +- .../test/tests/SpecimenCustomizeTest.java | 2 +- .../test/tests/SpecimenGridExportTest.java | 2 +- .../labkey/test/tests/SpecimenImportTest.java | 2 +- src/org/labkey/test/tests/SpecimenTest.java | 4 +- .../labkey/test/tests/StudySurveyTest.java | 6 +-- .../test/tests/SubfolderWebPartTest.java | 2 +- src/org/labkey/test/tests/SurveyTest.java | 2 +- .../test/tests/SystemMaintenanceTest.java | 1 - src/org/labkey/test/tests/TabTest.java | 5 +-- .../test/tests/TextChoiceAssayTest.java | 6 +-- ...ChoiceImportExportAndOtherDomainsTest.java | 6 +-- .../test/tests/TextChoiceSampleTypeTest.java | 3 +- .../labkey/test/tests/TimeChartAPITest.java | 9 +++-- .../test/tests/TimeChartImportTest.java | 12 +++--- src/org/labkey/test/tests/TourTest.java | 2 +- .../labkey/test/tests/TriggerScriptTest.java | 2 +- .../test/tests/UserClonePermissionTest.java | 2 +- .../test/tests/UserDetailsPermissionTest.java | 2 +- .../test/tests/UserPermissionsTest.java | 3 -- .../tests/UserTableCustomFieldUpdateTest.java | 2 +- src/org/labkey/test/tests/UserTest.java | 2 +- src/org/labkey/test/tests/WebDavTest.java | 2 +- .../test/tests/WebpartPermissionsTest.java | 1 - src/org/labkey/test/tests/WorkbookTest.java | 2 +- .../announcements/AnnouncementAPITest.java | 2 +- .../AnnouncementsPermissionTest.java | 6 +-- .../announcements/DiscussionLinkTest.java | 2 +- .../announcements/MessagesAttachmentTest.java | 2 +- .../api/CustomizeGridPermissionsTest.java | 2 +- .../tests/assay/AssayMissingValuesTest.java | 2 +- .../assay/AssayRenameExportImportTest.java | 8 ++-- .../assay/AssayTransformWarningTest.java | 3 +- .../tests/component/GridPanelViewTest.java | 7 +--- .../test/tests/core/admin/ShortUrlTest.java | 1 - .../test/tests/core/login/PasswordTest.java | 1 - .../tests/core/security/AppAdminRoleTest.java | 2 +- .../GetReadableContainersAPITest.java | 4 +- .../core/security/TroubleshooterRoleTest.java | 2 +- .../tests/core/webdav/WebDavPerfTest.java | 2 +- .../tests/elisa/ElisaMultiPlateAssayTest.java | 2 +- .../tests/elispotassay/ElispotAssayTest.java | 18 ++++----- .../SampleTypeLookupDisplayColumnTest.java | 2 +- .../filecontent/FileBrowserIconsTest.java | 2 +- .../FileContentActionButtonsTest.java | 4 +- .../filecontent/FileContentUploadTest.java | 2 +- .../filecontent/FileRootMigrationTest.java | 6 +-- .../tests/filecontent/FilesQueryTest.java | 2 +- .../filecontent/FilesWebpartFileRootTest.java | 2 +- .../labkey/test/tests/flow/BaseFlowTest.java | 8 ++-- .../tests/flow/FlowDuplicateSamplesTest.java | 1 + .../test/tests/flow/FlowImportTest.java | 14 +++---- .../test/tests/flow/FlowSpecimenTest.java | 2 +- src/org/labkey/test/tests/flow/FlowTest.java | 2 +- .../test/tests/issues/IssueAPITest.java | 2 +- .../tests/issues/IssueDomainSharingTest.java | 6 +-- .../test/tests/issues/IssueDomainTest.java | 4 +- .../test/tests/issues/IssuesAdminTest.java | 7 ++-- .../tests/issues/IssuesAttachmentTest.java | 4 +- .../labkey/test/tests/issues/IssuesTest.java | 7 ++-- .../test/tests/list/ColumnResizeTest.java | 2 +- .../test/tests/list/ListDateAndTimeTest.java | 2 +- .../test/tests/list/ListIndexingTest.java | 2 +- .../tests/list/ListMissingValuesTest.java | 2 +- src/org/labkey/test/tests/list/ListTest.java | 4 -- .../microarray/BaseExpressionMatrixTest.java | 2 +- .../test/tests/nab/NAbResultCalcTest.java | 2 +- .../labkey/test/tests/nab/NabAssayTest.java | 2 +- .../test/tests/nab/NabAssayThawListTest.java | 2 +- .../tests/nab/NabHighThroughputAssayTest.java | 2 +- .../tests/nab/NabMultiVirusPlateTest.java | 2 +- .../test/tests/perf/StudyImportPerfTest.java | 2 - .../pipeline/PipelineProtocolArchiveTest.java | 2 +- .../test/tests/query/QueryMetadataTest.java | 2 +- .../remoteapi/BulkUpdateGroupApiTest.java | 2 +- .../tests/visualization/ColumnChartTest.java | 2 +- .../visualization/GenericChartsTest.java | 4 +- .../tests/visualization/TimeChartTest.java | 2 +- .../test/tests/wiki/EmbeddedWebPartTest.java | 1 - .../test/tests/wiki/WikiAliasesTest.java | 10 ++--- src/org/labkey/test/tests/wiki/WikiTest.java | 1 - src/org/labkey/test/util/APIAssayHelper.java | 2 +- .../labkey/test/util/AbstractAssayHelper.java | 2 +- .../AbstractDataRegionExportOrSignHelper.java | 4 +- .../test/util/ApiPermissionsHelper.java | 2 +- .../labkey/test/util/AssayImportOptions.java | 38 +++++++++---------- src/org/labkey/test/util/AssayImporter.java | 4 +- .../labkey/test/util/BaseSearchHelper.java | 2 +- src/org/labkey/test/util/ChartHelper.java | 1 - src/org/labkey/test/util/DataClassHelper.java | 2 - .../test/util/DataRegionExportHelper.java | 2 +- src/org/labkey/test/util/DataRegionTable.java | 2 +- .../labkey/test/util/DilutionAssayHelper.java | 2 +- src/org/labkey/test/util/Ext4Helper.java | 4 +- .../test/util/LabKeyExpectedConditions.java | 11 ++++-- src/org/labkey/test/util/LogMethod.java | 2 +- .../test/util/MetadataEditorHelper.java | 2 +- src/org/labkey/test/util/OlapHelper.java | 11 ++---- src/org/labkey/test/util/PageFactory.java | 2 +- src/org/labkey/test/util/PasswordUtil.java | 4 +- src/org/labkey/test/util/PortalHelper.java | 10 +---- src/org/labkey/test/util/PythonHelper.java | 2 +- .../test/util/QuickBootstrapPseudoTest.java | 4 -- src/org/labkey/test/util/RReportHelper.java | 7 +--- .../labkey/test/util/SimpleHttpRequest.java | 2 +- src/org/labkey/test/util/StudyHelper.java | 4 +- .../test/util/SummaryStatisticsHelper.java | 4 +- .../labkey/test/util/TestDataGenerator.java | 2 +- .../labkey/test/util/TestDataValidator.java | 2 +- .../labkey/test/util/UIPermissionsHelper.java | 2 +- src/org/labkey/test/util/VagrantUtil.java | 2 +- src/org/labkey/test/util/WebServicesUtil.java | 4 +- src/org/labkey/test/util/WikiHelper.java | 4 +- .../test/util/core/webdav/WebDavUtils.java | 1 - .../test/util/di/DataIntegrationHelper.java | 12 +++--- .../test/util/exp/SampleTypeAPIHelper.java | 2 - .../util/perf/JsonPerfScenarioHelper.java | 3 -- 332 files changed, 559 insertions(+), 724 deletions(-) diff --git a/buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/CommunityArtifactsController.java b/buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/CommunityArtifactsController.java index a3c898eef1..31dbbc087a 100644 --- a/buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/CommunityArtifactsController.java +++ b/buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/CommunityArtifactsController.java @@ -40,7 +40,7 @@ public class BeginAction extends SimpleViewAction { public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/communityartifacts/view/hello.jsp"); + return new JspView<>("/org/labkey/communityartifacts/view/hello.jsp"); } @Override diff --git a/buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/StarterArtifactsController.java b/buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/StarterArtifactsController.java index 88950a7413..0da00968cd 100644 --- a/buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/StarterArtifactsController.java +++ b/buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/StarterArtifactsController.java @@ -40,7 +40,7 @@ public class BeginAction extends SimpleViewAction { public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/starterartifacts/view/hello.jsp"); + return new JspView<>("/org/labkey/starterartifacts/view/hello.jsp"); } @Override diff --git a/data/qc/src/org/labkey/AbstractAssayValidator.java b/data/qc/src/org/labkey/AbstractAssayValidator.java index d29adcfe21..203db0c61b 100644 --- a/data/qc/src/org/labkey/AbstractAssayValidator.java +++ b/data/qc/src/org/labkey/AbstractAssayValidator.java @@ -31,9 +31,9 @@ public abstract class AbstractAssayValidator private String _email; private String _password; private File _errorFile; - private Map _runProperties = new HashMap<>(); - private Map _transformFile = new HashMap<>(); - private List _errors = new ArrayList<>(); + private final Map _runProperties = new HashMap<>(); + private final Map _transformFile = new HashMap<>(); + private final List _errors = new ArrayList<>(); private String _host; public enum Props { diff --git a/data/qc/src/org/labkey/AssayTransformNoOp.java b/data/qc/src/org/labkey/AssayTransformNoOp.java index a356c306be..fd95606eb9 100644 --- a/data/qc/src/org/labkey/AssayTransformNoOp.java +++ b/data/qc/src/org/labkey/AssayTransformNoOp.java @@ -15,16 +15,7 @@ */ package org.labkey; -import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; public class AssayTransformNoOp extends AbstractAssayValidator { diff --git a/data/qc/src/org/labkey/AssayValidator.java b/data/qc/src/org/labkey/AssayValidator.java index ab84a0038c..aa8f5b24d7 100644 --- a/data/qc/src/org/labkey/AssayValidator.java +++ b/data/qc/src/org/labkey/AssayValidator.java @@ -51,8 +51,8 @@ public void runQC(File inputFile, String username, String password, String host) if (getRunProperties().containsKey(Props.runDataFile.name())) { List> dataMap = parseRunData(new File(getRunProperties().get(Props.runDataFile.name()))); - Map ptidMap = new HashMap(); - Map animalMap = new HashMap(); + Map ptidMap = new HashMap<>(); + Map animalMap = new HashMap<>(); for (Map row : dataMap) { diff --git a/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java b/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java index 71459f643b..3335f647af 100644 --- a/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java +++ b/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java @@ -38,7 +38,7 @@ public CrawlerTestController() } @RequiresPermission(ReadPermission.class) - public class InjectJspAction extends SimpleViewAction + public static class InjectJspAction extends SimpleViewAction { @Override public void validate(InjectForm form, BindException errors) diff --git a/modules/dumbster/src/com/dumbster/smtp/SimpleSmtpServer.java b/modules/dumbster/src/com/dumbster/smtp/SimpleSmtpServer.java index 54dc3f920c..ba2916934b 100644 --- a/modules/dumbster/src/com/dumbster/smtp/SimpleSmtpServer.java +++ b/modules/dumbster/src/com/dumbster/smtp/SimpleSmtpServer.java @@ -59,7 +59,7 @@ public class SimpleSmtpServer implements Runnable { /** * Port the server listens on - set to the default SMTP port initially. */ - private int port = DEFAULT_SMTP_PORT; + private final int port; /** * Timeout listening on server socket. @@ -166,7 +166,6 @@ public synchronized void stop() { * @param out output stream * @param input input stream * @return List of SmtpMessage - * @throws IOException */ private List handleTransaction(PrintWriter out, BufferedReader input) throws IOException { // Initialize the state machine diff --git a/modules/editableModule/src/org/labkey/editablemodule/EditableModuleController.java b/modules/editableModule/src/org/labkey/editablemodule/EditableModuleController.java index db03fe0f8d..e2fc20e23e 100644 --- a/modules/editableModule/src/org/labkey/editablemodule/EditableModuleController.java +++ b/modules/editableModule/src/org/labkey/editablemodule/EditableModuleController.java @@ -36,11 +36,12 @@ public EditableModuleController() } @RequiresPermission(ReadPermission.class) - public class HelloAction extends SimpleViewAction + public static class HelloAction extends SimpleViewAction { + @Override public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/editablemodule/view/hello.jsp"); + return new JspView<>("/org/labkey/editablemodule/view/hello.jsp"); } @Override diff --git a/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java b/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java index 54567ede1f..37f802b3c2 100644 --- a/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java +++ b/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java @@ -42,7 +42,7 @@ */ public class TestLinkedSchemaCustomizer implements LinkedSchemaCustomizer { - private static Logger LOG = LogManager.getLogger(TestLinkedSchemaCustomizer.class); + private static final Logger LOG = LogManager.getLogger(TestLinkedSchemaCustomizer.class); // Name of the parameter declaration private static final String PARAM_FAMILY = "PARAM_FAMILY"; diff --git a/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java b/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java index a59e997d5b..b0d86657bc 100644 --- a/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java +++ b/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java @@ -23,7 +23,6 @@ import org.labkey.api.data.TableInfo; import java.util.Collection; -import java.util.List; public class TestTableCustomizer implements TableCustomizer { diff --git a/src/org/labkey/junit/rules/TestWatcher.java b/src/org/labkey/junit/rules/TestWatcher.java index 5047cb9bc8..d5ee64db05 100644 --- a/src/org/labkey/junit/rules/TestWatcher.java +++ b/src/org/labkey/junit/rules/TestWatcher.java @@ -20,7 +20,7 @@ public Statement apply(final Statement base, final Description description) { return new Statement() { @Override public void evaluate() throws Throwable { - List errors = new ArrayList(); + List errors = new ArrayList<>(); try { starting(description); diff --git a/src/org/labkey/junit/runner/WebTestProperties.java b/src/org/labkey/junit/runner/WebTestProperties.java index a5b4277194..43f9340798 100644 --- a/src/org/labkey/junit/runner/WebTestProperties.java +++ b/src/org/labkey/junit/runner/WebTestProperties.java @@ -30,8 +30,8 @@ public abstract class WebTestProperties { - private static TestMap associatedTests = new TestMap(); // Stores Tests, keyed by associated module. - private static ModuleMap associatedModules = new ModuleMap(); + private static final TestMap associatedTests = new TestMap(); // Stores Tests, keyed by associated module. + private static final ModuleMap associatedModules = new ModuleMap(); private static final List installedModules = getInstalledModules(); private static void loadTestProperties(Class testClass) diff --git a/src/org/labkey/remoteapi/admin/GetModulesResponse.java b/src/org/labkey/remoteapi/admin/GetModulesResponse.java index 6af90a549e..ea96288301 100644 --- a/src/org/labkey/remoteapi/admin/GetModulesResponse.java +++ b/src/org/labkey/remoteapi/admin/GetModulesResponse.java @@ -54,7 +54,7 @@ public Set getModules() return _modules; } - public class Module extends ResponseObject implements Comparable + public static class Module extends ResponseObject implements Comparable { String _tabName; String _name; diff --git a/src/org/labkey/remoteapi/issues/IssueModel.java b/src/org/labkey/remoteapi/issues/IssueModel.java index a336fe7c17..c5bd31648f 100644 --- a/src/org/labkey/remoteapi/issues/IssueModel.java +++ b/src/org/labkey/remoteapi/issues/IssueModel.java @@ -81,8 +81,6 @@ public String getNotify() /** * when notify is just 1 user, you can provide their email - * @param notify - * @return */ public IssueModel setNotify(String notify) { diff --git a/src/org/labkey/remoteapi/issues/IssueResponseModel.java b/src/org/labkey/remoteapi/issues/IssueResponseModel.java index dbc2da3ab6..e6b9725df6 100644 --- a/src/org/labkey/remoteapi/issues/IssueResponseModel.java +++ b/src/org/labkey/remoteapi/issues/IssueResponseModel.java @@ -94,7 +94,6 @@ public List getComments() /** * for ad-hoc querying of _serverProps - * @param key * @return the object at that key */ public Object getProperties(String key) diff --git a/src/org/labkey/remoteapi/plate/CreatePlateParams.java b/src/org/labkey/remoteapi/plate/CreatePlateParams.java index d585e10b20..6075a1781d 100644 --- a/src/org/labkey/remoteapi/plate/CreatePlateParams.java +++ b/src/org/labkey/remoteapi/plate/CreatePlateParams.java @@ -11,8 +11,8 @@ public class CreatePlateParams private String _assayType; // blank or Standard private List> _data = new ArrayList<>(); private String _description; - private String _name; - private Integer _plateSetId; + private final String _name; + private final Integer _plateSetId; private Integer _plateType; // 1- 3x4(12), 2- 4x6(24), 3-6x8(48), 4-8x12(96), 5-16x24(384) private boolean _template; @@ -55,8 +55,6 @@ public String getName() /** * Sets the plate type for plate creation * // 1- 3x4(12), 2- 4x6(24), 3-6x8(48), 4-8x12(96), 5-16x24(384) - * @param plateType - * @return */ public CreatePlateParams setPlateType(PlateTypes plateType) { diff --git a/src/org/labkey/remoteapi/plate/CreatePlateSetParams.java b/src/org/labkey/remoteapi/plate/CreatePlateSetParams.java index b8b648fd2e..03eec59d6b 100644 --- a/src/org/labkey/remoteapi/plate/CreatePlateSetParams.java +++ b/src/org/labkey/remoteapi/plate/CreatePlateSetParams.java @@ -12,7 +12,7 @@ public class CreatePlateSetParams // This will match PlateController.CreatePlateSetForm private String _name; private String _description; - private List _plates = new ArrayList(); + private List _plates = new ArrayList<>(); private PlateSetType _type; private String _plateSetId; // optional private Integer _rowId; @@ -33,7 +33,7 @@ public JSONObject toJSON() json.put("parentPlateSetId", _parentPlateSetId); if (_plateSetId != null) json.put("plateSetId", _plateSetId); - if (_plates.size() > 0) + if (!_plates.isEmpty()) { JSONArray plates = new JSONArray(); for (CreatePlateSetPlate plate : _plates) diff --git a/src/org/labkey/remoteapi/puppeteer/PuppeteerSettings.java b/src/org/labkey/remoteapi/puppeteer/PuppeteerSettings.java index dcd18cc9d3..77f4430c48 100644 --- a/src/org/labkey/remoteapi/puppeteer/PuppeteerSettings.java +++ b/src/org/labkey/remoteapi/puppeteer/PuppeteerSettings.java @@ -17,7 +17,6 @@ import org.json.JSONObject; import org.labkey.remoteapi.CommandResponse; -import org.labkey.test.util.TestLogger; import java.util.Map; diff --git a/src/org/labkey/remoteapi/query/InsertExternalSchemaCommand.java b/src/org/labkey/remoteapi/query/InsertExternalSchemaCommand.java index f85d83156c..3bfeb19e87 100644 --- a/src/org/labkey/remoteapi/query/InsertExternalSchemaCommand.java +++ b/src/org/labkey/remoteapi/query/InsertExternalSchemaCommand.java @@ -75,9 +75,9 @@ public static class Params private List tables = new ArrayList<>(); private String dataSource = "labkeyDataSource"; private boolean includeSystem = true; - private boolean editable = false; + private final boolean editable = false; private boolean indexable = true; - private boolean fastCacheRefresh = true; // Enable fast refresh by default for tests + private final boolean fastCacheRefresh = true; // Enable fast refresh by default for tests private String metaData = ""; public Params(String userSchemaName, String sourceSchemaName) diff --git a/src/org/labkey/remoteapi/security/GetRolesResponse.java b/src/org/labkey/remoteapi/security/GetRolesResponse.java index 4865cbfd3e..7c25b2f241 100644 --- a/src/org/labkey/remoteapi/security/GetRolesResponse.java +++ b/src/org/labkey/remoteapi/security/GetRolesResponse.java @@ -45,7 +45,7 @@ public List getRoles() return _roles; } - public class Role extends ResponseObject + public static class Role extends ResponseObject { String _uniqueName; String _name; diff --git a/src/org/labkey/serverapi/collections/ArrayListMap.java b/src/org/labkey/serverapi/collections/ArrayListMap.java index d661ebe9fd..158f3103f2 100644 --- a/src/org/labkey/serverapi/collections/ArrayListMap.java +++ b/src/org/labkey/serverapi/collections/ArrayListMap.java @@ -143,13 +143,13 @@ public Set> entrySet() public ArrayListMap() { - this(new FindMap<>(new HashMap()), new ArrayList()); + this(new FindMap<>(new HashMap<>()), new ArrayList<>()); } public ArrayListMap(int columnCount) { - this(new FindMap<>(new HashMap(columnCount * 2)), new ArrayList(columnCount)); + this(new FindMap<>(new HashMap<>(columnCount * 2)), new ArrayList<>(columnCount)); } @@ -161,7 +161,7 @@ public ArrayListMap(ArrayListMap m, List row) public ArrayListMap(FindMap findMap) { - this(findMap, new ArrayList(findMap.size())); + this(findMap, new ArrayList<>(findMap.size())); } @@ -378,14 +378,14 @@ public void test() a.put("C", "three"); a.put("D", "four"); - ArrayListMap b = new ArrayListMap<>(a, new ArrayList()); + ArrayListMap b = new ArrayListMap<>(a, new ArrayList<>()); b.put("A", "ONE"); b.put("E", "FIVE"); a.put("F", "six"); b.put("G", "SEVEN"); - assertEquals(a.get("A"), "one"); - assertEquals(b.get("A"), "ONE"); + assertEquals("one", a.get("A")); + assertEquals("ONE", b.get("A")); assertTrue(a.containsKey("E")); assertNull(a.get("E")); diff --git a/src/org/labkey/serverapi/reader/AbstractDataLoaderFactory.java b/src/org/labkey/serverapi/reader/AbstractDataLoaderFactory.java index 031f296b91..102c9e8fff 100644 --- a/src/org/labkey/serverapi/reader/AbstractDataLoaderFactory.java +++ b/src/org/labkey/serverapi/reader/AbstractDataLoaderFactory.java @@ -75,9 +75,8 @@ public void parseContent(InputStream stream, ContentHandler h) throws IOExceptio Object value = row.get(cd.name); if (value != null) { - if (value instanceof String) + if (value instanceof String str) { - String str = (String)value; write(h, str); } else diff --git a/src/org/labkey/serverapi/reader/DataLoader.java b/src/org/labkey/serverapi/reader/DataLoader.java index b9c34803ad..a44278a553 100644 --- a/src/org/labkey/serverapi/reader/DataLoader.java +++ b/src/org/labkey/serverapi/reader/DataLoader.java @@ -176,7 +176,6 @@ public void setPreserveEmptyString(boolean preserveEmptyString) * Most useful if maps are being returned, otherwise use inferColumnInfo(reader, clazz) to * use properties of a bean instead. * - * @throws java.io.IOException */ @SuppressWarnings({"ConstantConditions"}) private void inferColumnInfo() throws IOException @@ -321,7 +320,7 @@ protected abstract class DataLoaderIterator implements CloseableIterator _values = null; - private int _lineNum = 0; + private int _lineNum; private boolean _closed = false; @@ -337,7 +336,7 @@ protected DataLoaderIterator(int lineNum) throws IOException if (column.load) active.add(column); - _activeColumns = active.toArray(new ColumnDescriptor[active.size()]); + _activeColumns = active.toArray(new ColumnDescriptor[0]); ArrayListMap.FindMap colMap = new ArrayListMap.FindMap<>(new CaseInsensitiveHashMap<>()); for (int i = 0; i < _activeColumns.length; i++) diff --git a/src/org/labkey/serverapi/reader/FileType.java b/src/org/labkey/serverapi/reader/FileType.java index 1692529246..ad0b3e2874 100644 --- a/src/org/labkey/serverapi/reader/FileType.java +++ b/src/org/labkey/serverapi/reader/FileType.java @@ -49,23 +49,23 @@ public enum gzSupportLevel /** * A list of possible suffixes in priority order. Later suffixes may also match earlier suffixes */ - private List _suffixes; + private final List _suffixes; /** * a list of filetypes to reject - handles the scenario where old pepxml files are "foo.xml" and * we have to avoid grabbing "foo.pep-prot.xml" */ - private List _antiTypes; + private final List _antiTypes; /** * The canonical suffix, will be used when creating new files from scratch */ - private String _defaultSuffix; + private final String _defaultSuffix; /** * Mime content type. */ - private List _contentTypes; + private final List _contentTypes; - private Boolean _dir; + private final Boolean _dir; /** * If _preferGZ is true, assume suffix.gz for new files to support TPP's transparent .xml.gz useage. * When dealing with existing files, non-gz version is still assumed to be the target if found @@ -75,7 +75,7 @@ public enum gzSupportLevel * If _supportGZ is true, accept .suffix.gz as the equivalent of .suffix **/ private Boolean _supportGZ; - private boolean _caseSensitiveOnCaseSensitiveFileSystems = false; + private final boolean _caseSensitiveOnCaseSensitiveFileSystems = false; /** * @param suffixes list of what are usually the file extensions (but may be some other suffix to diff --git a/src/org/labkey/serverapi/reader/TabFileType.java b/src/org/labkey/serverapi/reader/TabFileType.java index d571e2861e..31374ae46b 100644 --- a/src/org/labkey/serverapi/reader/TabFileType.java +++ b/src/org/labkey/serverapi/reader/TabFileType.java @@ -55,7 +55,7 @@ public boolean isHeaderMatch(@NotNull byte[] header) int fieldLen = -1; for (String line : lines) { - if (line.length() == 0 || line.charAt(0) == TabLoader.COMMENT_CHAR) + if (line.isEmpty() || line.charAt(0) == TabLoader.COMMENT_CHAR) continue; String[] fields = line.split(delim, -1); @@ -96,7 +96,7 @@ else if (fields.length > fieldLen) /*package*/ boolean isHeader(@NotNull String cs) { - if (cs.length() == 0) + if (cs.isEmpty()) return false; return HEADER.matcher(cs).matches(); diff --git a/src/org/labkey/serverapi/reader/TabLoader.java b/src/org/labkey/serverapi/reader/TabLoader.java index 00edaa8af7..2e9d3b6226 100644 --- a/src/org/labkey/serverapi/reader/TabLoader.java +++ b/src/org/labkey/serverapi/reader/TabLoader.java @@ -133,7 +133,7 @@ public DataLoader createLoader(InputStream is, boolean hasColumnHeaders) throws private BufferedReader _reader = null; private int _commentLines = 0; - private Map _comments = new HashMap<>(); + private final Map _comments = new HashMap<>(); private char _chDelimiter = '\t'; private String _strDelimiter = new String(new char[]{_chDelimiter}); private String _lineDelimiter = null; @@ -141,7 +141,7 @@ public DataLoader createLoader(InputStream is, boolean hasColumnHeaders) throws private String _strQuote = null; private String _strQuoteQuote = null; private boolean _parseQuotes = true; - private boolean _unescapeBackslashes = true; + private final boolean _unescapeBackslashes = true; private Filter> _mapFilter; // Infer whether there are headers @@ -290,7 +290,7 @@ protected String parseValue(String value) return value; } - private ArrayList listParse = new ArrayList<>(30); + private final ArrayList listParse = new ArrayList<>(30); private CharSequence readLine(BufferedReader r, boolean skipComments, boolean skipBlankLines) @@ -326,7 +326,7 @@ private String readOneTextLine(BufferedReader r, boolean skipComments, boolean s if (line == null) return null; } - while ((skipComments && line.length() > 0 && line.charAt(0) == COMMENT_CHAR) || (skipBlankLines && null == StringUtils.trimToNull(line))); + while ((skipComments && !line.isEmpty() && line.charAt(0) == COMMENT_CHAR) || (skipBlankLines && null == StringUtils.trimToNull(line))); return line; } catch (Exception e) @@ -462,7 +462,7 @@ else if (ch == chQuote) start = end; } - return listParse.toArray(new String[listParse.size()]); + return listParse.toArray(new String[0]); } @Deprecated // Just use a CloseableFilteredIterator. TODO: Remove @@ -545,7 +545,7 @@ private void readComments() throws IOException if (null == s) break; - if (s.length() == 0 || s.charAt(0) == COMMENT_CHAR) + if (s.isEmpty() || s.charAt(0) == COMMENT_CHAR) { _commentLines++; @@ -554,7 +554,7 @@ private void readComments() throws IOException { String key = s.substring(1, eq).trim(); String value = s.substring(eq + 1).trim(); - if (key.length() > 0 || value.length() > 0) + if (!key.isEmpty() || !value.isEmpty()) _comments.put(key, value); } } diff --git a/src/org/labkey/test/AssayAPITest.java b/src/org/labkey/test/AssayAPITest.java index b550cb51c1..c3b9a3f6db 100644 --- a/src/org/labkey/test/AssayAPITest.java +++ b/src/org/labkey/test/AssayAPITest.java @@ -70,10 +70,10 @@ protected String getProjectName() @BeforeClass public static void doSetup() throws Exception { - AssayAPITest initTest = (AssayAPITest) getCurrentTest(); + AssayAPITest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), "Assay"); initTest._containerHelper.createSubfolder(initTest.getProjectName(), SUBFOLDER_1, "Assay"); - initTest.goToProjectHome();; + initTest.goToProjectHome(); initTest.log("upload inline files to the pipeline root"); initTest.goToModule("FileContent"); diff --git a/src/org/labkey/test/BaseWebDriverTest.java b/src/org/labkey/test/BaseWebDriverTest.java index 7c8fb20608..77603bbc85 100644 --- a/src/org/labkey/test/BaseWebDriverTest.java +++ b/src/org/labkey/test/BaseWebDriverTest.java @@ -2606,7 +2606,7 @@ public String waitForWikiDivPopulation(String testDivId, int waitSeconds) if (isElementPresent(Locator.id(testDivId))) { String divHtml = (String)executeScript("return document.getElementById('" + testDivId + "').innerHTML;"); - if (divHtml.length() > 0) + if (!divHtml.isEmpty()) return divHtml; } sleep(1000); diff --git a/src/org/labkey/test/Cleanable.java b/src/org/labkey/test/Cleanable.java index 496244d0dc..eecb10dc36 100644 --- a/src/org/labkey/test/Cleanable.java +++ b/src/org/labkey/test/Cleanable.java @@ -18,5 +18,5 @@ public interface Cleanable { - public void cleanup() throws Exception; + void cleanup() throws Exception; } diff --git a/src/org/labkey/test/Locator.java b/src/org/labkey/test/Locator.java index 2bf353fa6c..8bcf8b532a 100644 --- a/src/org/labkey/test/Locator.java +++ b/src/org/labkey/test/Locator.java @@ -576,7 +576,7 @@ public void waitForElementToDisappear(FluentWait wait) @Override public Boolean apply(SearchContext context) { - return findElements(context).size() == 0; + return findElements(context).isEmpty(); } @Override @@ -1672,7 +1672,7 @@ public static Locator union(CssLocator... locators) @Override public Locator containing(String contains) { - if (_text != null && _text.length() > 0 || _contains != null && _contains.length() > 0) + if (_text != null && !_text.isEmpty() || _contains != null && !_contains.isEmpty()) throw new IllegalStateException("Text content already been specified for this Locator"); return new CssLocator(getLoc(), _index, contains, _text); @@ -1681,7 +1681,7 @@ public Locator containing(String contains) @Override public Locator withText(String text) { - if (_text != null && _text.length() > 0 || _contains != null && _contains.length() > 0) + if (_text != null && !_text.isEmpty() || _contains != null && !_contains.isEmpty()) throw new IllegalStateException("Text content already been specified for this Locator"); return new CssLocator(getLoc(), _index, _contains, text); @@ -1820,7 +1820,7 @@ protected By getBy() public static class LinkLocator extends XPathLocator { - private String _linkText; + private final String _linkText; public LinkLocator(@NotNull String linkText) { @@ -1845,7 +1845,7 @@ public List findElements(SearchContext context) // By.linkText doesn't allow all possible link texts. e.g. "[All]" return new XPathLocator(getLoc()).findElements(context); } - if (elements.size() == 0 && !_linkText.equals(_linkText.toUpperCase())) + if (elements.isEmpty() && !_linkText.equals(_linkText.toUpperCase())) return (new LinkLocator(_linkText.toUpperCase())).findElements(context); else return elements; diff --git a/src/org/labkey/test/Runner.java b/src/org/labkey/test/Runner.java index b60a6a241a..fa66122575 100644 --- a/src/org/labkey/test/Runner.java +++ b/src/org/labkey/test/Runner.java @@ -97,16 +97,16 @@ public class Runner extends TestSuite private static final Logger LOG = LogManager.getLogger(Runner.class); private static final int DEFAULT_MAX_TEST_FAILURES = 10; - private static SuiteFactory _suites = SuiteFactory.getInstance(); - private static Map _testStats = new LinkedHashMap<>(); + private static final SuiteFactory _suites = SuiteFactory.getInstance(); + private static final Map _testStats = new LinkedHashMap<>(); private static int _testCount; private static List> _remainingTests; - private static List _passedTests = new ArrayList<>(); - private static List _failedTests = new ArrayList<>(); - private static List _erroredTests = new ArrayList<>(); + private static final List _passedTests = new ArrayList<>(); + private static final List _failedTests = new ArrayList<>(); + private static final List _erroredTests = new ArrayList<>(); - private Set _failures = new HashSet<>(); - private boolean _cleanOnly; + private final Set _failures = new HashSet<>(); + private final boolean _cleanOnly; private Runner(boolean cleanOnly) { @@ -237,9 +237,8 @@ public synchronized void runTest(final Test test, final TestResult testResult) } else if (test instanceof Cleanable) ((Cleanable) test).cleanup(); - else if (test instanceof JUnit4TestAdapter) + else if (test instanceof JUnit4TestAdapter adapter) { - JUnit4TestAdapter adapter = (JUnit4TestAdapter) test; if (Cleanable.class.isAssignableFrom(adapter.getTestClass())) { Cleanable cleanable = (Cleanable) adapter.getTestClass().getDeclaredConstructor().newInstance(); @@ -356,7 +355,7 @@ private void dumpFailures(Enumeration failures) } } - private static Map, List> specifiedTestMethods = new HashMap<>(); + private static final Map, List> specifiedTestMethods = new HashMap<>(); // Set up only the requested tests private static List> getTestClasses(List testNames) { @@ -510,7 +509,7 @@ public String describe() } catch (NoTestsRemainException ignore) {} - if (unfoundTests.size() > 0) + if (!unfoundTests.isEmpty()) { LOG.error("Test(s) do not exist in class " + testClass.getSimpleName()); LOG.error("Specified:"); @@ -523,7 +522,7 @@ public String describe() { LOG.error(" " + foundTest); } - if (ignoredTests.size() > 0) + if (!ignoredTests.isEmpty()) LOG.error("Disabled:"); for (String ignoredTest : ignoredTests) { @@ -977,7 +976,7 @@ else if (testNames.isEmpty()) { frontLoadTestsOfModifiedModules(set); } - if (testRecentlyFailed && 0[] recentlyFailedTests = readClasses(new File(recentlyFailedTestsFile), set.getTestList()); @@ -1029,7 +1028,7 @@ private static void frontLoadTestsOfModifiedModules(TestSet set) Collection modifiedModules = getModifiedModules(); // If changedFilesFile exists where TeamCity indicates then order the tests starting from most recently modified - if (modifiedModules.size() > 0) + if (!modifiedModules.isEmpty()) { LOG.info("Prioritizing tests for modified modules:"); for (String module : modifiedModules) diff --git a/src/org/labkey/test/SortDirection.java b/src/org/labkey/test/SortDirection.java index 3369a74a86..40fb76011c 100644 --- a/src/org/labkey/test/SortDirection.java +++ b/src/org/labkey/test/SortDirection.java @@ -20,7 +20,7 @@ public enum SortDirection ASC("Ascending"), DESC("Descending"); - private String _string; + private final String _string; SortDirection(String string) { diff --git a/src/org/labkey/test/TestFileUtils.java b/src/org/labkey/test/TestFileUtils.java index fcbed755cd..6a4a3ae4eb 100644 --- a/src/org/labkey/test/TestFileUtils.java +++ b/src/org/labkey/test/TestFileUtils.java @@ -42,13 +42,11 @@ import org.bouncycastle.util.io.Streams; import org.jetbrains.annotations.NotNull; import org.labkey.serverapi.reader.Readers; -import org.labkey.serverapi.writer.PrintWriters; import org.openqa.selenium.NotFoundException; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java index f5dbd43307..2765dadd38 100644 --- a/src/org/labkey/test/WebDriverWrapper.java +++ b/src/org/labkey/test/WebDriverWrapper.java @@ -1096,11 +1096,11 @@ public boolean isPageEmpty() //IE and Firefox have different notions of empty. //IE returns html for all pages even empty text... String text = getHtmlSource(); - if (null == text || text.trim().length() == 0) + if (null == text || text.trim().isEmpty()) return true; text = getBodyText(); - return null == text || text.trim().length() == 0; + return null == text || text.trim().isEmpty(); } /** @@ -1209,7 +1209,7 @@ public long beginAt(String url, int millis, boolean acceptAlerts) try { - if (relativeURL.length() == 0) + if (relativeURL.isEmpty()) logMessage = "Navigating to root"; else { @@ -2655,7 +2655,7 @@ public void waitForText(final String text, final int count, int wait) public boolean isElementPresent(Locator loc) { - return loc.findElements(getDriver()).size() > 0; + return !loc.findElements(getDriver()).isEmpty(); } public boolean isElementVisible(Locator loc) @@ -3475,7 +3475,7 @@ private void setInput(WebElement input, String text) else if (text.length() < 1000 && !text.contains("\n") && !text.contains("\t")) { input.clear(); - if (!waitFor(()-> getFormElement(input).length() == 0, 500)) + if (!waitFor(()-> getFormElement(input).isEmpty(), 500)) { TestLogger.warn("Failed to clear input: " + input); } @@ -3523,8 +3523,6 @@ public void actionClear(WebElement input) /** * puts the specified text into the clipboard, then pastes it into the specified element, * or whatever has focus at the moment. - * @param input - * @param text */ public void actionPaste(WebElement input, String text) { diff --git a/src/org/labkey/test/aspects/MethodLoggingAspect.java b/src/org/labkey/test/aspects/MethodLoggingAspect.java index 2ab1225035..1a2c648544 100644 --- a/src/org/labkey/test/aspects/MethodLoggingAspect.java +++ b/src/org/labkey/test/aspects/MethodLoggingAspect.java @@ -38,10 +38,10 @@ @Aspect public class MethodLoggingAspect { - private static Stack startTimes = new Stack<>(); - private static Stack methodStack = new Stack<>(); - private static Stack quietMethods = new Stack<>(); - private static Stack quietMethodsArgStrings = new Stack<>(); + private static final Stack startTimes = new Stack<>(); + private static final Stack methodStack = new Stack<>(); + private static final Stack quietMethods = new Stack<>(); + private static final Stack quietMethodsArgStrings = new Stack<>(); @Pointcut(value = "execution(@org.labkey.test.util.LogMethod * *(..))") void loggedMethod(){} @@ -103,7 +103,7 @@ private void logMethodEnd(JoinPoint joinPoint, LogMethod logMethod, String logPr { methodStack.pop(); // Discard current method, duplicated in joinPoint String caller = methodStack.isEmpty() ? "" : methodStack.peek(); - Long elapsed = System.currentTimeMillis()-startTimes.pop(); + long elapsed = System.currentTimeMillis()-startTimes.pop(); String method = joinPoint.getStaticPart().getSignature().getName(); String argString = " done"; @@ -144,7 +144,7 @@ private String getArgsString(List args) StringBuilder argBuilder = new StringBuilder(); for (Object arg : args) { - if (argBuilder.length() > 0) + if (!argBuilder.isEmpty()) argBuilder.append(", "); argBuilder.append(getArgString(arg, maxArgLength)); } @@ -163,7 +163,7 @@ private String getArgsString(List args) } }while (!done); - argsString = (argsString.length() > 0 ? "(" + argsString + ")" : ""); + argsString = (!argsString.isEmpty() ? "(" + argsString + ")" : ""); return argsString; } @@ -174,7 +174,7 @@ private String getArgString(Object arg, int maxArgLength) { for (Object nestedArg : (Object[])arg) { - argString += (argString.length() > 0 ? ", " : "") + getArgString(nestedArg, maxArgLength); + argString += (!argString.isEmpty() ? ", " : "") + getArgString(nestedArg, maxArgLength); } argString = "[" + argString + "]"; } @@ -182,7 +182,7 @@ else if (arg instanceof Collection) { for (Object nestedArg : (Collection)arg) { - argString += (argString.length() > 0 ? ", " : "") + getArgString(nestedArg, maxArgLength); + argString += (!argString.isEmpty() ? ", " : "") + getArgString(nestedArg, maxArgLength); } argString = "[" + argString + "]"; } diff --git a/src/org/labkey/test/aspects/TestPerfAspect.java b/src/org/labkey/test/aspects/TestPerfAspect.java index a0f50b8a5e..1397ae5557 100644 --- a/src/org/labkey/test/aspects/TestPerfAspect.java +++ b/src/org/labkey/test/aspects/TestPerfAspect.java @@ -27,7 +27,7 @@ @Aspect public class TestPerfAspect { - private static HashMap> _testClassMethodPerfStats = new HashMap<>(); + private static final HashMap> _testClassMethodPerfStats = new HashMap<>(); private static long _startTime; private static TestSection _currentSection = null; diff --git a/src/org/labkey/test/components/ChartTypeDialog.java b/src/org/labkey/test/components/ChartTypeDialog.java index e0441c52bd..206897e76b 100644 --- a/src/org/labkey/test/components/ChartTypeDialog.java +++ b/src/org/labkey/test/components/ChartTypeDialog.java @@ -72,7 +72,7 @@ public ChartTypeDialog setChartType(ChartType chartType) public boolean isChartTypeEnabled(ChartType chartType) { - String classValue = ""; + String classValue; switch(chartType) { @@ -411,7 +411,7 @@ private String getFieldValue(WebElement fieldElement, WebElement dragAndDropElem String text; text = fieldElement.getText(); - if(text.length() == 0) + if(text.isEmpty()) { // If the length is 0 see if the drag and drop text is visible. if(dragAndDropElement.isDisplayed()) diff --git a/src/org/labkey/test/components/ColumnChartComponent.java b/src/org/labkey/test/components/ColumnChartComponent.java index f3f0a5c507..7b172e5530 100644 --- a/src/org/labkey/test/components/ColumnChartComponent.java +++ b/src/org/labkey/test/components/ColumnChartComponent.java @@ -29,8 +29,9 @@ public class ColumnChartComponent public final static String TYPE_BOX = "box"; public final static String TYPE_UNKNOWN = "unknown"; - private WebDriverWrapper _driver; - private WebElement _divReference, _svgReference; + private final WebDriverWrapper _driver; + private final WebElement _divReference; + private final WebElement _svgReference; private String _title, _footer, _type, _plotId; private int _numberOfDataPoints; @@ -64,7 +65,7 @@ public ColumnChartComponent(WebDriverWrapper driver, WebElement webelement) } } - if(classValue.length() != 0) + if(!classValue.isEmpty()) { // Id for pie charts is different form bar and box plots. _plotId = classValue.substring(0, classValue.indexOf("_")); diff --git a/src/org/labkey/test/components/CustomizeView.java b/src/org/labkey/test/components/CustomizeView.java index 90c5fb7769..e2e801c044 100644 --- a/src/org/labkey/test/components/CustomizeView.java +++ b/src/org/labkey/test/components/CustomizeView.java @@ -214,7 +214,7 @@ public void saveCustomView(String name, @Nullable Boolean shared, @Nullable Bool if (name != null) { - if ("".equals(name)) + if (name.isEmpty()) { _driver.log("Saving default custom view"); saveWindow.defaultViewRadio.check(); @@ -345,7 +345,6 @@ public enum ViewItemType /** * expand customize view menu to all but the last of fieldKeyParts - * @param fieldKeyParts * @return The data-recordid property of the <tr> element for the specified field in the "Available Fields" column tree. */ private WebElement expandPivots(String[] fieldKeyParts) @@ -364,7 +363,7 @@ private WebElement expandPivots(String[] fieldKeyParts) Locator.css(".x4-tree-expander").findElement(fieldRow).click(); } Locator.tag("tr").withClass("x4-grid-tree-node-expanded").withAttribute("data-recordid", nodePath).waitForElement(getComponentElement(), 10000); - WebDriverWrapper.waitFor(() -> Locator.css("tr[data-recordid] + tr:not(.x4-grid-row)").findElements(getComponentElement()).size() == 0, 2000); // Spacer row appears during expansion animation + WebDriverWrapper.waitFor(() -> Locator.css("tr[data-recordid] + tr:not(.x4-grid-row)").findElements(getComponentElement()).isEmpty(), 2000); // Spacer row appears during expansion animation nodePath += "/"; } @@ -414,7 +413,7 @@ public void addFilter(String fieldKey, String column_name, String filter_type, S public void addFilter(String[] fieldKeyParts, String column_name, String filter_type, String filter) { - if (filter.equals("")) + if (filter.isEmpty()) _driver.log("Adding " + column_name + " filter of " + filter_type); else _driver.log("Adding " + column_name + " filter of " + filter_type + " " + filter); @@ -758,7 +757,7 @@ public boolean isColumnVisible(String fieldKey) public boolean isLookupColumn(String fieldKey) { WebElement fieldRow = expandPivots(fieldKey.split("/")); - return Locator.css("img.x4-tree-expander").findElements(fieldRow).size() > 0; + return !Locator.css("img.x4-tree-expander").findElements(fieldRow).isEmpty(); } @Override @@ -777,8 +776,8 @@ protected class Elements extends Component.ElementCache private class SelectedItemRow extends Component { - private WebElement _element; - private String _fieldKey; + private final WebElement _element; + private final String _fieldKey; protected SelectedItemRow(ViewItemType itemType, String fieldkey) { diff --git a/src/org/labkey/test/components/DomainDesignerPage.java b/src/org/labkey/test/components/DomainDesignerPage.java index 6594907dce..517b41ce49 100644 --- a/src/org/labkey/test/components/DomainDesignerPage.java +++ b/src/org/labkey/test/components/DomainDesignerPage.java @@ -74,7 +74,7 @@ public List getPanels() */ public List getPanelTitles() { - waitFor(() -> getPanels().size() > 0, "No form panels found on page.", WAIT_FOR_JAVASCRIPT); + waitFor(() -> !getPanels().isEmpty(), "No form panels found on page.", WAIT_FOR_JAVASCRIPT); List titles = new ArrayList<>(); for(DomainPanel formPanel : getPanels()) { diff --git a/src/org/labkey/test/components/LookAndFeelPieChart.java b/src/org/labkey/test/components/LookAndFeelPieChart.java index b416d1a32d..3c880fa7a7 100644 --- a/src/org/labkey/test/components/LookAndFeelPieChart.java +++ b/src/org/labkey/test/components/LookAndFeelPieChart.java @@ -179,7 +179,7 @@ public enum ColorPalette Dark("Dark"), Alternate("Alternate"); - private String _dropDownText; + private final String _dropDownText; ColorPalette(String value) { _dropDownText = value; diff --git a/src/org/labkey/test/components/SummaryStatisticsDialog.java b/src/org/labkey/test/components/SummaryStatisticsDialog.java index 7258c0624d..d90dc77430 100644 --- a/src/org/labkey/test/components/SummaryStatisticsDialog.java +++ b/src/org/labkey/test/components/SummaryStatisticsDialog.java @@ -20,7 +20,6 @@ import org.labkey.test.components.ext4.Window; import org.labkey.test.util.DataRegionTable; import org.openqa.selenium.NoSuchElementException; -import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import java.util.List; @@ -50,7 +49,7 @@ public void cancel() public boolean isPresent(String statLabel) { - return elementCache().statCellLoc.startsWith(statLabel).findElements(this).size() >= 1; + return !elementCache().statCellLoc.startsWith(statLabel).findElements(this).isEmpty(); } public boolean isSelected(String statLabel) diff --git a/src/org/labkey/test/components/WebPartPanel.java b/src/org/labkey/test/components/WebPartPanel.java index 81b45e1ade..216fb196da 100644 --- a/src/org/labkey/test/components/WebPartPanel.java +++ b/src/org/labkey/test/components/WebPartPanel.java @@ -23,8 +23,8 @@ public class WebPartPanel extends WebDriverComponent { - private WebElement _componentElement; - private WebDriver _driver; + private final WebElement _componentElement; + private final WebDriver _driver; protected String _title; protected WebPartPanel(WebElement componentElement, WebDriver driver) diff --git a/src/org/labkey/test/components/bootstrap/LoggedOutDialog.java b/src/org/labkey/test/components/bootstrap/LoggedOutDialog.java index 363c3c62a9..270cedb468 100644 --- a/src/org/labkey/test/components/bootstrap/LoggedOutDialog.java +++ b/src/org/labkey/test/components/bootstrap/LoggedOutDialog.java @@ -87,8 +87,6 @@ public boolean isContentBlurred(List elementsToBeBlurred) /** * Use this to check expected top-level elements' presence in tests before subsequently calling isContentBlurred * to measure whether they are blurred or not - * @param test - * @param expectedElements Locators for the top-level elements we expect; either for LKS or for apps */ static public void verifyExpectedElements(WebDriverWrapper test, List expectedElements) { diff --git a/src/org/labkey/test/components/domain/ConditionalFormatDialog.java b/src/org/labkey/test/components/domain/ConditionalFormatDialog.java index f3a3e7074a..5089fc1291 100644 --- a/src/org/labkey/test/components/domain/ConditionalFormatDialog.java +++ b/src/org/labkey/test/components/domain/ConditionalFormatDialog.java @@ -8,7 +8,7 @@ public class ConditionalFormatDialog extends ModalDialog { - private DomainFieldRow _row; + private final DomainFieldRow _row; private ConditionalFormatDialog(DomainFieldRow row, ModalDialogFinder finder) { diff --git a/src/org/labkey/test/components/domain/ConditionalFormatPanel.java b/src/org/labkey/test/components/domain/ConditionalFormatPanel.java index e5f430a455..b776ff900b 100644 --- a/src/org/labkey/test/components/domain/ConditionalFormatPanel.java +++ b/src/org/labkey/test/components/domain/ConditionalFormatPanel.java @@ -178,7 +178,7 @@ public Checkbox strikethroughCheckbox() static class ConditionalFormatPanelFinder extends WebDriverComponentFinder { - private ConditionalFormatDialog _dialog; + private final ConditionalFormatDialog _dialog; private final Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "domain-validator-panel"); private String _id = null; diff --git a/src/org/labkey/test/components/domain/DetailPopover.java b/src/org/labkey/test/components/domain/DetailPopover.java index 4c0cce269f..c720ddd6e5 100644 --- a/src/org/labkey/test/components/domain/DetailPopover.java +++ b/src/org/labkey/test/components/domain/DetailPopover.java @@ -72,7 +72,7 @@ protected ElementCache newElementCache() @Override protected ElementCache elementCache() { - return (ElementCache) super.elementCache(); + return super.elementCache(); } protected class ElementCache extends Component.ElementCache diff --git a/src/org/labkey/test/components/domain/DomainFieldRow.java b/src/org/labkey/test/components/domain/DomainFieldRow.java index 1f24c94165..dd4481a845 100644 --- a/src/org/labkey/test/components/domain/DomainFieldRow.java +++ b/src/org/labkey/test/components/domain/DomainFieldRow.java @@ -1760,7 +1760,7 @@ private Select waitForSelectToLoad(Select select) Locator.XPathLocator loadingOption = Locator.tagWithText("option", "Loading..."); if (!WebDriverWrapper.waitFor(() -> !loadingOption.existsIn(select.getWrappedElement()), WAIT_FOR_JAVASCRIPT)) { - throw new NoSuchElementException("Select got stuck loading: " + select.getWrappedElement().toString()); + throw new NoSuchElementException("Select got stuck loading: " + select.getWrappedElement()); } return select; } diff --git a/src/org/labkey/test/components/domain/DomainFormPanel.java b/src/org/labkey/test/components/domain/DomainFormPanel.java index 61cd8a0cb5..2475f7d67f 100644 --- a/src/org/labkey/test/components/domain/DomainFormPanel.java +++ b/src/org/labkey/test/components/domain/DomainFormPanel.java @@ -280,7 +280,7 @@ public DomainFieldRow addField(String name) public boolean isManuallyDefineFieldsPresent() { - return getThis().findElements(elementCache().manuallyDefineFieldsLoc).size() > 0; + return !getThis().findElements(elementCache().manuallyDefineFieldsLoc).isEmpty(); } /** @@ -525,7 +525,7 @@ public int getRowcountInSummaryMode() public DomainFormPanel setInferFieldFile(File file) { getWrapper().setFormElement(elementCache().fileUploadInput, file); - getWrapper().waitFor(()-> elementCache().findFieldRows().size() > 0, + getWrapper().waitFor(()-> !elementCache().findFieldRows().isEmpty(), "fields were not inferred from file in time", WAIT_FOR_JAVASCRIPT); return this; } diff --git a/src/org/labkey/test/components/domain/RangeValidatorDialog.java b/src/org/labkey/test/components/domain/RangeValidatorDialog.java index 7e0f128541..bbfd7bc95b 100644 --- a/src/org/labkey/test/components/domain/RangeValidatorDialog.java +++ b/src/org/labkey/test/components/domain/RangeValidatorDialog.java @@ -9,7 +9,7 @@ public class RangeValidatorDialog extends ModalDialog { - private DomainFieldRow _row; + private final DomainFieldRow _row; public RangeValidatorDialog(DomainFieldRow row, ModalDialogFinder finder) { diff --git a/src/org/labkey/test/components/domain/RangeValidatorPanel.java b/src/org/labkey/test/components/domain/RangeValidatorPanel.java index 5eb1059bf5..780342ac5c 100644 --- a/src/org/labkey/test/components/domain/RangeValidatorPanel.java +++ b/src/org/labkey/test/components/domain/RangeValidatorPanel.java @@ -161,7 +161,7 @@ public Input nameInput() static class RangeValidatorPanelFinder extends WebDriverComponentFinder { - private RangeValidatorDialog _dialog; + private final RangeValidatorDialog _dialog; private Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "domain-validator-panel"); private String _name = null; private String _id = null; diff --git a/src/org/labkey/test/components/domain/RegexValidatorDialog.java b/src/org/labkey/test/components/domain/RegexValidatorDialog.java index f10874d76f..2320b570f3 100644 --- a/src/org/labkey/test/components/domain/RegexValidatorDialog.java +++ b/src/org/labkey/test/components/domain/RegexValidatorDialog.java @@ -9,7 +9,7 @@ public class RegexValidatorDialog extends ModalDialog { - private DomainFieldRow _row; + private final DomainFieldRow _row; public RegexValidatorDialog(DomainFieldRow row, ModalDialogFinder finder) { diff --git a/src/org/labkey/test/components/domain/RegexValidatorPanel.java b/src/org/labkey/test/components/domain/RegexValidatorPanel.java index 2faea5293e..818b09dd61 100644 --- a/src/org/labkey/test/components/domain/RegexValidatorPanel.java +++ b/src/org/labkey/test/components/domain/RegexValidatorPanel.java @@ -151,7 +151,7 @@ public Input nameInput() static class RegexValidatorPanelFinder extends WebDriverComponentFinder { - private RegexValidatorDialog _dialog; + private final RegexValidatorDialog _dialog; private Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "domain-validator-panel"); private String _id = null; diff --git a/src/org/labkey/test/components/domain/TextChoiceValueDialog.java b/src/org/labkey/test/components/domain/TextChoiceValueDialog.java index 9a7c9822ab..0418d78494 100644 --- a/src/org/labkey/test/components/domain/TextChoiceValueDialog.java +++ b/src/org/labkey/test/components/domain/TextChoiceValueDialog.java @@ -12,7 +12,7 @@ */ public class TextChoiceValueDialog extends ModalDialog { - private DomainFieldRow _row; + private final DomainFieldRow _row; /** * Constructor with a field row and a finder. diff --git a/src/org/labkey/test/components/ext4/ComboBox.java b/src/org/labkey/test/components/ext4/ComboBox.java index 67eb38b384..1d09f9e446 100644 --- a/src/org/labkey/test/components/ext4/ComboBox.java +++ b/src/org/labkey/test/components/ext4/ComboBox.java @@ -39,8 +39,8 @@ public class ComboBox extends WebDriverComponent { - private WebElement _formItem; - private WebDriver _driver; + private final WebElement _formItem; + private final WebDriver _driver; private ComboListMatcher _matcher; private Boolean _isMultiSelect; diff --git a/src/org/labkey/test/components/html/BootstrapMenu.java b/src/org/labkey/test/components/html/BootstrapMenu.java index 34556f3fe2..8781ac0716 100644 --- a/src/org/labkey/test/components/html/BootstrapMenu.java +++ b/src/org/labkey/test/components/html/BootstrapMenu.java @@ -222,7 +222,6 @@ public BootstrapMenuFinder withToggleId(String id) /** * Some menu controls have IDs prepended with dynamic numbers, like 123-special-menu * @param substring the part of the ID that isn't dynamic - * @return */ public BootstrapMenuFinder withToggleIdContaining(String substring) { diff --git a/src/org/labkey/test/components/html/Checkbox.java b/src/org/labkey/test/components/html/Checkbox.java index 8b9feba994..e313cc7552 100644 --- a/src/org/labkey/test/components/html/Checkbox.java +++ b/src/org/labkey/test/components/html/Checkbox.java @@ -25,7 +25,7 @@ public class Checkbox extends Component implements FormItem { - private WebElement _el; + private final WebElement _el; public Checkbox(WebElement element) { diff --git a/src/org/labkey/test/components/html/RadioButton.java b/src/org/labkey/test/components/html/RadioButton.java index 97c1777747..bc91f227b1 100644 --- a/src/org/labkey/test/components/html/RadioButton.java +++ b/src/org/labkey/test/components/html/RadioButton.java @@ -47,7 +47,7 @@ protected void assertElementType() public static class RadioButtonFinder extends ComponentFinder { - private Locator loc = Locator.radioButton(); + private final Locator loc = Locator.radioButton(); public SimpleComponentFinder withName(String name) { diff --git a/src/org/labkey/test/components/html/SelectWrapper.java b/src/org/labkey/test/components/html/SelectWrapper.java index 2c6b63546c..74c39d7e94 100644 --- a/src/org/labkey/test/components/html/SelectWrapper.java +++ b/src/org/labkey/test/components/html/SelectWrapper.java @@ -138,13 +138,13 @@ public static void waitForOptionWithVisibleText(Select select, String text) { WebDriverWrapper.waitFor(() -> select.getOptions().stream().anyMatch(option -> Objects.equals(text, option.getText())), - "Option [text = " + text + "] not found: " + select.getWrappedElement().toString(), 10000); + "Option [text = " + text + "] not found: " + select.getWrappedElement(), 10000); } public static void waitForOptionWithValue(Select select, String value) { WebDriverWrapper.waitFor(() -> select.getOptions().stream().anyMatch(option -> Objects.equals(value, option.getAttribute("value"))), - "Option [value = " + value + "] not found: " + select.getWrappedElement().toString(), 10000); + "Option [value = " + value + "] not found: " + select.getWrappedElement(), 10000); } } diff --git a/src/org/labkey/test/components/html/SiteNavBar.java b/src/org/labkey/test/components/html/SiteNavBar.java index b11024dee5..069f62b094 100644 --- a/src/org/labkey/test/components/html/SiteNavBar.java +++ b/src/org/labkey/test/components/html/SiteNavBar.java @@ -227,7 +227,7 @@ protected SimpleWebDriverComponentFinder userMenuFinder() return new SimpleWebDriverComponentFinder<>(getDriver(), Locators.userMenu, UserMenu::new); } - public class AdminMenu extends BootstrapMenu + public static class AdminMenu extends BootstrapMenu { protected AdminMenu(WebElement componentElement, WebDriver driver) { @@ -271,7 +271,7 @@ public AdminMenu withExpandRetries(int retries) } } - public class UserMenu extends BootstrapMenu + public static class UserMenu extends BootstrapMenu { protected UserMenu(WebElement componentElement, WebDriver driver) { diff --git a/src/org/labkey/test/components/html/Table.java b/src/org/labkey/test/components/html/Table.java index fca62fc405..0f45a21ce0 100644 --- a/src/org/labkey/test/components/html/Table.java +++ b/src/org/labkey/test/components/html/Table.java @@ -217,7 +217,7 @@ public List getColumnAsText(int col) List columnElements = getColumnAsElement(col); List columnText = new ArrayList<>(); - if (columnElements.size() > 0) + if (!columnElements.isEmpty()) { for (WebElement columnElement : columnElements) { diff --git a/src/org/labkey/test/components/labkey/FormItemFinder.java b/src/org/labkey/test/components/labkey/FormItemFinder.java index 89fe9b1a7e..cc70ee2d61 100644 --- a/src/org/labkey/test/components/labkey/FormItemFinder.java +++ b/src/org/labkey/test/components/labkey/FormItemFinder.java @@ -16,7 +16,6 @@ package org.labkey.test.components.labkey; import org.jetbrains.annotations.NotNull; -import org.labkey.test.LabKeySiteWrapper; import org.labkey.test.Locator; import org.labkey.test.components.Component; import org.labkey.test.components.html.FormItem; @@ -34,7 +33,7 @@ public abstract class FormItemFinder extends Component.ComponentFinder FormItem(WebDriver driver) { - return new FormItemFinder() + return new FormItemFinder<>() { @Override protected FormItem construct(WebElement el) diff --git a/src/org/labkey/test/components/labkey/ReadOnlyFormItem.java b/src/org/labkey/test/components/labkey/ReadOnlyFormItem.java index 6a95624e67..d63dde1f07 100644 --- a/src/org/labkey/test/components/labkey/ReadOnlyFormItem.java +++ b/src/org/labkey/test/components/labkey/ReadOnlyFormItem.java @@ -21,7 +21,7 @@ public class ReadOnlyFormItem extends Component implements FormItem { - private WebElement _el; + private final WebElement _el; protected ReadOnlyFormItem(WebElement el) { @@ -30,7 +30,7 @@ protected ReadOnlyFormItem(WebElement el) public static FormItemFinder ReadOnlyFormItem() { - return new FormItemFinder() + return new FormItemFinder<>() { @Override protected ReadOnlyFormItem construct(WebElement el) diff --git a/src/org/labkey/test/components/list/AdvancedListSettingsDialog.java b/src/org/labkey/test/components/list/AdvancedListSettingsDialog.java index 46ed5bfd3b..bcebb20114 100644 --- a/src/org/labkey/test/components/list/AdvancedListSettingsDialog.java +++ b/src/org/labkey/test/components/list/AdvancedListSettingsDialog.java @@ -223,7 +223,7 @@ public enum SearchIncludeOptions DataOnly("Include data only"), MetadataOnly("Include metadata only (name and description of list and fields)"); - private String _labelText; + private final String _labelText; SearchIncludeOptions(String labelText) { @@ -242,7 +242,7 @@ public enum SearchIndexOptions NonPhiFields("Index all non-PHI fields (text, number, date, and boolean)"), CustomTemplate("Index using custom template"); - private String _labelText; + private final String _labelText; SearchIndexOptions(String labelText) { diff --git a/src/org/labkey/test/components/react/Card.java b/src/org/labkey/test/components/react/Card.java index 3a9e1b5852..74c985c9d1 100644 --- a/src/org/labkey/test/components/react/Card.java +++ b/src/org/labkey/test/components/react/Card.java @@ -3,13 +3,9 @@ import org.labkey.test.Locator; import org.labkey.test.components.Component; import org.labkey.test.components.WebDriverComponent; -import org.labkey.test.components.html.Input; -import org.labkey.test.pages.LabKeyPage; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import static org.labkey.test.components.html.Input.Input; - /** * automates shared component implemented by /internal/components/base/Cards.tsx */ @@ -38,7 +34,6 @@ public WebDriver getDriver() /** * returns the text of the 'title' tag in the content block - * @return */ public String getTitle() { @@ -47,7 +42,6 @@ public String getTitle() /** * returns the URL to which the user will go if the component is clicked - * @return */ public String getLinkHref() { diff --git a/src/org/labkey/test/components/react/DropdownButtonGroup.java b/src/org/labkey/test/components/react/DropdownButtonGroup.java index 9e10be025e..9158ac9954 100644 --- a/src/org/labkey/test/components/react/DropdownButtonGroup.java +++ b/src/org/labkey/test/components/react/DropdownButtonGroup.java @@ -97,7 +97,7 @@ public WebElement openMenuTo(@LoggedParam String ... subMenuLabels) return null; WebElement context = getRootMenu(); - WebElement item = null; + WebElement item; for (int i = 0; i < subMenuLabels.length -1; i++) { context = openSubmenu(subMenuLabels[i], context); @@ -134,7 +134,7 @@ private WebElement getRootMenu() { WebElement rootMenu = Locator.tagWithClass("ul", "dropdown-menu") .withAttribute("aria-labelledby", componentId()).findElement(getComponentElement()); - WebDriverWrapper.waitFor(()-> Locators.menuItem().findElements(rootMenu).size() > 0, + WebDriverWrapper.waitFor(()-> !Locators.menuItem().findElements(rootMenu).isEmpty(), "the root menu did not have items in time", WAIT_FOR_JAVASCRIPT); return rootMenu; } diff --git a/src/org/labkey/test/components/react/FilteringReactSelect.java b/src/org/labkey/test/components/react/FilteringReactSelect.java index b9c6d1f0eb..febe1df91b 100644 --- a/src/org/labkey/test/components/react/FilteringReactSelect.java +++ b/src/org/labkey/test/components/react/FilteringReactSelect.java @@ -170,7 +170,7 @@ public List setFilter(String value) long filterStart = System.currentTimeMillis(); WebDriverWrapper.waitFor(()-> { List options = elementCache().getOptions(); - return options.size() > 0 && + return !options.isEmpty() && !isLoading() || options.stream().anyMatch((a)-> a.getText().contains(value)); }, WAIT_FOR_JAVASCRIPT); long elapsed = System.currentTimeMillis() - filterStart; diff --git a/src/org/labkey/test/components/react/MultiMenu.java b/src/org/labkey/test/components/react/MultiMenu.java index ab9b95a757..cb16ca52c3 100644 --- a/src/org/labkey/test/components/react/MultiMenu.java +++ b/src/org/labkey/test/components/react/MultiMenu.java @@ -57,7 +57,6 @@ public List getMenuItems() * If there are duplicate items in the menu by text and the one you want isn't the first in the menu, * consider using getMenuItemUnderToggle or getMenuItemUnderHeading * @param menuItem Text of the intended menuItem - * @return */ public WebElement getMenuItem(String menuItem) { @@ -252,7 +251,6 @@ public WebElement expandToggle(String toggle) * * @param heading Text of the lk-dropdown-header under which to find menu items * @param collapse whether to collapse the menu after - * @return */ public List getMenuItemsUnderHeading(String heading, boolean collapse) { @@ -266,7 +264,6 @@ public List getMenuItemsUnderHeading(String heading, boolean collapse) * gets the dropdown-section__menu-items between a heading and the next separator * * @param heading Text of the lk-dropdown-header under which to find menu items - * @return */ protected List getMenuItemsUnderHeading(String heading) { diff --git a/src/org/labkey/test/components/react/QueryChartDialog.java b/src/org/labkey/test/components/react/QueryChartDialog.java index d000105168..cc028eae8f 100644 --- a/src/org/labkey/test/components/react/QueryChartDialog.java +++ b/src/org/labkey/test/components/react/QueryChartDialog.java @@ -476,7 +476,7 @@ public WebElement fieldOptionIconByLabel(String label) Locator loc = Locator.tag("div").withChild(Locator.tagContainingText("label", label)); return Locator.tagWithClass("div", "field-option-icon").descendant("span").findElementOrNull(loc.findElement(this)); } - private Locator.XPathLocator previewContainerLoc = Locator.tag("div").withChild(Locator.tagWithText("label", "Preview")); + private final Locator.XPathLocator previewContainerLoc = Locator.tag("div").withChild(Locator.tagWithText("label", "Preview")); public WebElement previewContainer() { return previewContainerLoc.waitForElement(this, 1500); @@ -486,8 +486,8 @@ public String grayTextPreviewInstruction() return Locator.tagWithClass("div", "gray-text").waitForElement(previewContainer(), 1500).getText(); } - private Locator previewBodyLoc = Locator.tagWithClass("div", "chart-builder-preview-body"); - private Locator svgLoc = Locator.tagWithClass("div", "svg-chart__chart"); + private final Locator previewBodyLoc = Locator.tagWithClass("div", "chart-builder-preview-body"); + private final Locator svgLoc = Locator.tagWithClass("div", "svg-chart__chart"); public WebElement svg() { @@ -515,7 +515,7 @@ public enum CHART_TYPE{ } static { - Map map = new HashMap(); + Map map = new HashMap<>(); for(CHART_TYPE instance : CHART_TYPE.values()) { map.put(instance.getChartType(), instance); diff --git a/src/org/labkey/test/components/react/QueryChartPanel.java b/src/org/labkey/test/components/react/QueryChartPanel.java index 57a6dc94b3..4711e99b31 100644 --- a/src/org/labkey/test/components/react/QueryChartPanel.java +++ b/src/org/labkey/test/components/react/QueryChartPanel.java @@ -85,7 +85,7 @@ protected ElementCache newElementCache() @Override protected ElementCache elementCache() { - return (ElementCache) super.elementCache(); + return super.elementCache(); } protected class ElementCache extends Component.ElementCache diff --git a/src/org/labkey/test/components/react/ReactCheckBox.java b/src/org/labkey/test/components/react/ReactCheckBox.java index 781de4036b..b8a82075e8 100644 --- a/src/org/labkey/test/components/react/ReactCheckBox.java +++ b/src/org/labkey/test/components/react/ReactCheckBox.java @@ -121,7 +121,7 @@ public enum CheckboxState { Checked, Indeterminate, - Unchecked; + Unchecked } } diff --git a/src/org/labkey/test/components/react/SelectInputOption.java b/src/org/labkey/test/components/react/SelectInputOption.java index 32e2d23ad9..664831fb31 100644 --- a/src/org/labkey/test/components/react/SelectInputOption.java +++ b/src/org/labkey/test/components/react/SelectInputOption.java @@ -2,22 +2,15 @@ import org.apache.commons.lang3.StringUtils; import org.labkey.api.collections.CaseInsensitiveHashMap; -import org.labkey.api.collections.CaseInsensitiveMapWrapper; -import org.labkey.api.util.Pair; import org.labkey.test.Locator; import org.labkey.test.components.Component; import org.labkey.test.components.WebDriverComponent; -import org.labkey.test.components.html.Input; -import org.labkey.test.pages.LabKeyPage; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.labkey.test.components.html.Input.Input; - /* This component is meant to wrap the verbose options in filteringReactSelect, ReactSelect */ @@ -71,7 +64,7 @@ protected ElementCache newElementCache() @Override protected ElementCache elementCache() { - return (ElementCache) super.elementCache(); + return super.elementCache(); } diff --git a/src/org/labkey/test/components/react/Tabs.java b/src/org/labkey/test/components/react/Tabs.java index 2d0e5c51c5..ad986fc799 100644 --- a/src/org/labkey/test/components/react/Tabs.java +++ b/src/org/labkey/test/components/react/Tabs.java @@ -116,7 +116,7 @@ protected class ElementCache extends Component.ElementCache public ElementCache() { - if (!WebDriverWrapper.waitFor(() -> findAllTabs().size() > 0, 10_000)) + if (!WebDriverWrapper.waitFor(() -> !findAllTabs().isEmpty(), 10_000)) { tabLoc.findElement(this); // Should trigger a 'NoSuchElementException' } diff --git a/src/org/labkey/test/components/studydesigner/AssayScheduleWebpart.java b/src/org/labkey/test/components/studydesigner/AssayScheduleWebpart.java index 70de749095..9800f1b7d6 100644 --- a/src/org/labkey/test/components/studydesigner/AssayScheduleWebpart.java +++ b/src/org/labkey/test/components/studydesigner/AssayScheduleWebpart.java @@ -72,13 +72,13 @@ protected ElementCache newElementCache() public class ElementCache extends BodyWebPart.ElementCache { - private int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; - private Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); - private Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); - private Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); - private Locator.XPathLocator emptyLoc = Locator.tagWithClassContaining("td", "empty").withText("No data to show."); - private Locator.XPathLocator assaysLoc = Locator.tagWithClass("div", "vaccine-design-assays"); - private Locator.XPathLocator assayPlanLoc = Locator.tag("p").withAttribute("data-index", "AssayPlan"); + private final int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; + private final Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); + private final Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); + private final Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); + private final Locator.XPathLocator emptyLoc = Locator.tagWithClassContaining("td", "empty").withText("No data to show."); + private final Locator.XPathLocator assaysLoc = Locator.tagWithClass("div", "vaccine-design-assays"); + private final Locator.XPathLocator assayPlanLoc = Locator.tag("p").withAttribute("data-index", "AssayPlan"); WebElement assaysTable = assaysLoc.append(tableOuterLoc).findWhenNeeded(this).withTimeout(wait); WebElement assayPlan = assayPlanLoc.findWhenNeeded(this).withTimeout(wait); diff --git a/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignPage.java b/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignPage.java index 812c20a76b..e243639ff6 100644 --- a/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignPage.java +++ b/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignPage.java @@ -124,10 +124,10 @@ protected BaseElements baseElements() protected class BaseElements { - private Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); - private Locator.XPathLocator cellValueLoc = Locator.tagWithClass("td", "cell-value"); - private Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); - private Locator.XPathLocator addRowIconLoc = Locator.tagWithClass("i", "add-new-row"); + private final Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); + private final Locator.XPathLocator cellValueLoc = Locator.tagWithClass("td", "cell-value"); + private final Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); + private final Locator.XPathLocator addRowIconLoc = Locator.tagWithClass("i", "add-new-row"); protected int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; protected Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); diff --git a/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignVisitPage.java b/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignVisitPage.java index 2705553b58..fbeeee4e21 100644 --- a/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignVisitPage.java +++ b/src/org/labkey/test/components/studydesigner/BaseManageVaccineDesignVisitPage.java @@ -108,10 +108,10 @@ protected BaseVisitElements visitElements() protected class BaseVisitElements extends BaseElements { - private Locator.XPathLocator newVisitRadioLoc = Ext4Helper.Locators.radiobutton(_test, "Create a new study visit:"); - private Locator.XPathLocator newVisitLabelLoc = Locator.tagWithName("input", "newVisitLabel"); - private Locator.XPathLocator newVisitMinLoc = Locator.tagWithName("input", "newVisitRangeMin"); - private Locator.XPathLocator newVisitMaxLoc = Locator.tagWithName("input", "newVisitRangeMax"); + private final Locator.XPathLocator newVisitRadioLoc = Ext4Helper.Locators.radiobutton(_test, "Create a new study visit:"); + private final Locator.XPathLocator newVisitLabelLoc = Locator.tagWithName("input", "newVisitLabel"); + private final Locator.XPathLocator newVisitMinLoc = Locator.tagWithName("input", "newVisitRangeMin"); + private final Locator.XPathLocator newVisitMaxLoc = Locator.tagWithName("input", "newVisitRangeMax"); Locator.XPathLocator existingVisitLoc = Locator.tagWithClass("table", "x4-field").withDescendant(Locator.tagWithName("input", "existingVisit")); Locator.XPathLocator addVisitIconLoc = Locator.tagWithClass("i", "add-visit-column"); @@ -145,7 +145,7 @@ WebElement getNewVisitMaxField() public static class Visit { private Integer _rowId; - private String _label; + private final String _label; private Double _rangeMin; private Double _rangeMax; diff --git a/src/org/labkey/test/components/studydesigner/ImmunizationScheduleWebpart.java b/src/org/labkey/test/components/studydesigner/ImmunizationScheduleWebpart.java index 93cc10997b..4dffd54efb 100644 --- a/src/org/labkey/test/components/studydesigner/ImmunizationScheduleWebpart.java +++ b/src/org/labkey/test/components/studydesigner/ImmunizationScheduleWebpart.java @@ -62,13 +62,13 @@ protected ElementCache newElementCache() public class ElementCache extends BodyWebPart.ElementCache { - private int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; - private Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); - private Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); - private Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); - private Locator.XPathLocator emptyLoc = Locator.tagWithClassContaining("td", "empty").withText("No data to show."); - private Locator.XPathLocator manageLoc = Locator.linkWithText("Manage Treatments"); - private Locator.XPathLocator cohortsLoc = Locator.tagWithClass("div", "immunization-schedule-cohorts"); + private final int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; + private final Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); + private final Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); + private final Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); + private final Locator.XPathLocator emptyLoc = Locator.tagWithClassContaining("td", "empty").withText("No data to show."); + private final Locator.XPathLocator manageLoc = Locator.linkWithText("Manage Treatments"); + private final Locator.XPathLocator cohortsLoc = Locator.tagWithClass("div", "immunization-schedule-cohorts"); WebElement cohortsTable = cohortsLoc.append(tableOuterLoc).findWhenNeeded(this).withTimeout(wait); WebElement manageLink = manageLoc.findWhenNeeded(this).withTimeout(wait); diff --git a/src/org/labkey/test/components/studydesigner/ManageAssaySchedulePage.java b/src/org/labkey/test/components/studydesigner/ManageAssaySchedulePage.java index 9cca395a16..ac40ffee34 100644 --- a/src/org/labkey/test/components/studydesigner/ManageAssaySchedulePage.java +++ b/src/org/labkey/test/components/studydesigner/ManageAssaySchedulePage.java @@ -121,8 +121,8 @@ protected Elements elements() protected class Elements extends BaseElements { - private Locator.XPathLocator assayPlanLoc = Locator.tagWithName("textarea", "assayPlan"); - private Locator.XPathLocator checkbox = Locator.tagWithClass("input", "x4-form-checkbox"); + private final Locator.XPathLocator assayPlanLoc = Locator.tagWithName("textarea", "assayPlan"); + private final Locator.XPathLocator checkbox = Locator.tagWithClass("input", "x4-form-checkbox"); Locator.XPathLocator assaysLoc = Locator.tagWithClass("div", "vaccine-design-assays"); diff --git a/src/org/labkey/test/components/studydesigner/ManageTreatmentsSingleTablePage.java b/src/org/labkey/test/components/studydesigner/ManageTreatmentsSingleTablePage.java index 0d07ba3c52..c7cd9d0af9 100644 --- a/src/org/labkey/test/components/studydesigner/ManageTreatmentsSingleTablePage.java +++ b/src/org/labkey/test/components/studydesigner/ManageTreatmentsSingleTablePage.java @@ -19,8 +19,6 @@ import org.labkey.test.WebDriverWrapper; import org.labkey.test.WebTestHelper; import org.labkey.test.pages.LabKeyPage; -import org.labkey.test.selenium.LazyWebElement; -import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.By; diff --git a/src/org/labkey/test/components/studydesigner/VaccineDesignWebpart.java b/src/org/labkey/test/components/studydesigner/VaccineDesignWebpart.java index 8350e2aae2..0a52b6c3a2 100644 --- a/src/org/labkey/test/components/studydesigner/VaccineDesignWebpart.java +++ b/src/org/labkey/test/components/studydesigner/VaccineDesignWebpart.java @@ -103,16 +103,16 @@ protected ElementCache newElementCache() public class ElementCache extends BodyWebPart.ElementCache { - private int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; - private Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); - private Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); - private Locator.XPathLocator subgridRowLoc = Locator.tagWithClass("tr", "subrow"); - private Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); - private Locator.XPathLocator emptyLoc = Locator.tagWithClassContaining("td", "empty").withText("No data to show."); - private Locator.XPathLocator manageLoc = Locator.linkWithText("Manage Study Products"); - private Locator.XPathLocator immunogensLoc = Locator.tagWithClass("div", "vaccine-design-immunogens"); - private Locator.XPathLocator adjuvantsLoc = Locator.tagWithClass("div", "vaccine-design-adjuvants"); - private Locator.XPathLocator challengesLoc = Locator.tagWithClass("div", "vaccine-design-challenges"); + private final int wait = BaseWebDriverTest.WAIT_FOR_JAVASCRIPT; + private final Locator.XPathLocator tableOuterLoc = Locator.tagWithClass("table", "outer"); + private final Locator.XPathLocator tableRowLoc = Locator.tagWithClass("tr", "row-outer"); + private final Locator.XPathLocator subgridRowLoc = Locator.tagWithClass("tr", "subrow"); + private final Locator.XPathLocator cellDisplayLoc = Locator.tagWithClass("td", "cell-display"); + private final Locator.XPathLocator emptyLoc = Locator.tagWithClassContaining("td", "empty").withText("No data to show."); + private final Locator.XPathLocator manageLoc = Locator.linkWithText("Manage Study Products"); + private final Locator.XPathLocator immunogensLoc = Locator.tagWithClass("div", "vaccine-design-immunogens"); + private final Locator.XPathLocator adjuvantsLoc = Locator.tagWithClass("div", "vaccine-design-adjuvants"); + private final Locator.XPathLocator challengesLoc = Locator.tagWithClass("div", "vaccine-design-challenges"); WebElement immunogensTable = immunogensLoc.append(tableOuterLoc).findWhenNeeded(this).withTimeout(wait); WebElement adjuvantsTable = adjuvantsLoc.append(tableOuterLoc).findWhenNeeded(this).withTimeout(wait); diff --git a/src/org/labkey/test/components/ui/CollapsiblePanel.java b/src/org/labkey/test/components/ui/CollapsiblePanel.java index ab254dd925..eae6a62092 100644 --- a/src/org/labkey/test/components/ui/CollapsiblePanel.java +++ b/src/org/labkey/test/components/ui/CollapsiblePanel.java @@ -73,7 +73,7 @@ protected class ElementCache extends Component.ElementCache .findWhenNeeded(this).withTimeout(2000); WebElement expandCollapseToggle = Locator.tagWithClass("span", "pull-right") .findWhenNeeded(header).withTimeout(2000); - private Locator.XPathLocator body = Locator.tagWithClass("div", "panel-collapse"); + private final Locator.XPathLocator body = Locator.tagWithClass("div", "panel-collapse"); Locator expandedLoc = Locator.tagWithAttributeContaining("span", "class", "fa-chevron-down"); Locator collapsedLoc = Locator.tagWithAttributeContaining("span", "class", "fa-chevron-right"); diff --git a/src/org/labkey/test/components/ui/DetailTableRow.java b/src/org/labkey/test/components/ui/DetailTableRow.java index 4dd6b341dc..d92446a8c2 100644 --- a/src/org/labkey/test/components/ui/DetailTableRow.java +++ b/src/org/labkey/test/components/ui/DetailTableRow.java @@ -10,7 +10,7 @@ public class DetailTableRow extends WebDriverComponent { final WebElement _rowElement; - private WebDriver _driver; + private final WebDriver _driver; protected DetailTableRow(WebElement element, WebDriver driver) { diff --git a/src/org/labkey/test/components/ui/assay/RunDataPanel.java b/src/org/labkey/test/components/ui/assay/RunDataPanel.java index b4dd9f75c9..c4b1c4614b 100644 --- a/src/org/labkey/test/components/ui/assay/RunDataPanel.java +++ b/src/org/labkey/test/components/ui/assay/RunDataPanel.java @@ -4,13 +4,9 @@ import org.labkey.test.WebDriverWrapper; import org.labkey.test.components.Component; import org.labkey.test.components.WebDriverComponent; -import org.labkey.test.components.html.Checkbox; -import org.labkey.test.components.html.Input; import org.labkey.test.components.ui.entities.EntityBulkInsertDialog; -import org.labkey.test.components.ui.entities.EntityInsertPanel; import org.labkey.test.components.ui.files.FileUploadPanel; import org.labkey.test.components.ui.grids.EditableGrid; -import org.labkey.test.pages.LabKeyPage; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -19,7 +15,6 @@ import java.util.Optional; import static org.labkey.test.WebDriverWrapper.WAIT_FOR_JAVASCRIPT; -import static org.labkey.test.components.html.Input.Input; /** * Exercises behavior for /internal/components/assay/RunDataPanel.tsx @@ -154,8 +149,6 @@ private Optional optionalFileUploadPanel() /** * finds the mode select tabs, to switch between grid input and file upload - * @param text - * @return */ private Locator.XPathLocator modeSelectListItem(String text) { diff --git a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java index 6e037894e6..c21451262b 100644 --- a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java +++ b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java @@ -354,7 +354,7 @@ public T removeParentAlias(int index) public String getParentAlias(int index) { expandPropertiesPanel(); - WebDriverWrapper.waitFor(()->elementCache().parentAliases().size() > 0, + WebDriverWrapper.waitFor(()-> !elementCache().parentAliases().isEmpty(), "There are no parent aliases visible.", 2_500); return elementCache().parentAlias(index).get(); } diff --git a/src/org/labkey/test/components/ui/entities/EntityInsertPanel.java b/src/org/labkey/test/components/ui/entities/EntityInsertPanel.java index cb80a53b0b..46fa0a0f15 100644 --- a/src/org/labkey/test/components/ui/entities/EntityInsertPanel.java +++ b/src/org/labkey/test/components/ui/entities/EntityInsertPanel.java @@ -398,8 +398,6 @@ protected void waitForReady() /** * finds the mode select tabs, to switch between grid input and file upload - * @param containsText - * @return */ private Locator.XPathLocator modeSelectListItem(String containsText) { diff --git a/src/org/labkey/test/components/ui/files/AttachmentCard.java b/src/org/labkey/test/components/ui/files/AttachmentCard.java index 21ade46fdb..54127b4ddc 100644 --- a/src/org/labkey/test/components/ui/files/AttachmentCard.java +++ b/src/org/labkey/test/components/ui/files/AttachmentCard.java @@ -84,7 +84,7 @@ public boolean canDownload() public File clickDownload() { if (!elementCache().menu.isPresent()) - throw new IllegalStateException("Unable to download attachment/file");; + throw new IllegalStateException("Unable to download attachment/file"); return getWrapper().doAndWaitForDownload(()-> elementCache().menu.get().clickSubMenu(false, DOWNLOAD_ATTACHMENT)); } diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java index 89fab97504..ab84872260 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java @@ -49,7 +49,7 @@ protected ElementCache newElementCache() @Override protected ElementCache elementCache() { - return (ElementCache) super.elementCache(); + return super.elementCache(); } public boolean isMulti() diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java b/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java index 749ac3a625..69518191f5 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java @@ -68,7 +68,7 @@ protected ElementCache newElementCache() @Override protected ElementCache elementCache() { - return (ElementCache) super.elementCache(); + return super.elementCache(); } protected class ElementCache extends Component.ElementCache diff --git a/src/org/labkey/test/components/ui/files/FileSelectTree.java b/src/org/labkey/test/components/ui/files/FileSelectTree.java index e565a98565..13e6ed7f78 100644 --- a/src/org/labkey/test/components/ui/files/FileSelectTree.java +++ b/src/org/labkey/test/components/ui/files/FileSelectTree.java @@ -56,7 +56,7 @@ private WebElement expandNode(SearchContext parent, String nodeName) public FileSelectTree waitForLoadingFileTree() { - WebDriverWrapper.waitFor(()-> (this.findElements(By.xpath("//span[contains(text(), 'Loading...')]")).size() < 1), + WebDriverWrapper.waitFor(()-> (this.findElements(By.xpath("//span[contains(text(), 'Loading...')]")).isEmpty()), "File tree loading too long", 4000); return this; diff --git a/src/org/labkey/test/components/ui/files/FileTree.java b/src/org/labkey/test/components/ui/files/FileTree.java index 1b0440ee68..3f2f0d15c6 100644 --- a/src/org/labkey/test/components/ui/files/FileTree.java +++ b/src/org/labkey/test/components/ui/files/FileTree.java @@ -139,7 +139,7 @@ private static Locator directoryChildLoc(String name, boolean dir) * </li> * */ - public class SubTree extends Component.ElementCache> + public static class SubTree extends Component.ElementCache> { //
  • that wraps subtree private final WebElement _el; @@ -327,7 +327,7 @@ private DirExpansionState getState() } throw new IllegalStateException(String.format( - "Unable to determine row expansion state for '%s'. Possibly not a directory?: %s", getName(), _icon.toString())); + "Unable to determine row expansion state for '%s'. Possibly not a directory?: %s", getName(), _icon)); } } diff --git a/src/org/labkey/test/components/ui/grids/DetailDataPanel.java b/src/org/labkey/test/components/ui/grids/DetailDataPanel.java index 3aef10a9af..06c655bf8b 100644 --- a/src/org/labkey/test/components/ui/grids/DetailDataPanel.java +++ b/src/org/labkey/test/components/ui/grids/DetailDataPanel.java @@ -50,7 +50,6 @@ public String getTitle() /** * When the logged-in user does not have edit permissions, the edit button will not be present - * @return */ public boolean isEditable() { diff --git a/src/org/labkey/test/components/ui/grids/GridBar.java b/src/org/labkey/test/components/ui/grids/GridBar.java index 036733c573..d82c9b6766 100644 --- a/src/org/labkey/test/components/ui/grids/GridBar.java +++ b/src/org/labkey/test/components/ui/grids/GridBar.java @@ -92,7 +92,6 @@ public boolean hasPager() /** * uses the pager to select a page from the pager dropdown list * @param page the text of the list item to be clicked - * @return */ public GridBar jumpToPage(String page) // e.g. "First Page"|"Last Page" { @@ -102,7 +101,6 @@ public GridBar jumpToPage(String page) // e.g. "First Page"|"Last Page" /** * gets the current page number - * @return */ public int getCurrentPage() { @@ -111,8 +109,6 @@ public int getCurrentPage() /** * selects the number of rows to be shown per page - * @param pageSize - * @return */ public GridBar selectPageSize(String pageSize) { @@ -150,7 +146,6 @@ public boolean isOnLastPage() /** * clicks the 'next' button on the pager associated with this grid and waits for the grid to update - * @return */ public QueryGrid clickNext() { @@ -160,7 +155,6 @@ public QueryGrid clickNext() /** * clicks the 'previous' button on the pager and waits for the grid to update - * @return */ public QueryGrid clickPrevious() { diff --git a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java index 86aa10740f..1a119bb1a7 100644 --- a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java +++ b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java @@ -80,7 +80,7 @@ public Map> getParentDetailsPanelGrids() public boolean hasParentTypes() { - return getParentTypes().size() > 0; + return !getParentTypes().isEmpty(); } public List getParentTypes() @@ -128,7 +128,7 @@ protected void waitForReady() else { List detailTables = new DetailTable.DetailTableFinder(getDriver()).findAll(this); - if (detailTables.size() == 0) + if (detailTables.isEmpty()) return false; // at least one detailtable exists, each with some value in it diff --git a/src/org/labkey/test/components/ui/navigation/FindByIdsDialog.java b/src/org/labkey/test/components/ui/navigation/FindByIdsDialog.java index 844d9f368c..63f1dbdf70 100644 --- a/src/org/labkey/test/components/ui/navigation/FindByIdsDialog.java +++ b/src/org/labkey/test/components/ui/navigation/FindByIdsDialog.java @@ -4,7 +4,6 @@ import org.labkey.test.Locator; import org.labkey.test.components.bootstrap.ModalDialog; import org.labkey.test.components.html.RadioButton; -import org.labkey.test.components.react.BaseReactSelect; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import java.util.List; diff --git a/src/org/labkey/test/components/ui/navigation/SubNavBar.java b/src/org/labkey/test/components/ui/navigation/SubNavBar.java index f1f622ef4e..e6e98cb4a9 100644 --- a/src/org/labkey/test/components/ui/navigation/SubNavBar.java +++ b/src/org/labkey/test/components/ui/navigation/SubNavBar.java @@ -124,7 +124,7 @@ static protected class Locators // Extend simpleComponentFinder public static class SubNavBarFinder extends WebDriverComponentFinder { - private Locator.XPathLocator _locator; + private final Locator.XPathLocator _locator; private SubNavBarFinder(WebDriver driver) { diff --git a/src/org/labkey/test/components/ui/navigation/apps/ChangeTargetFolderDialog.java b/src/org/labkey/test/components/ui/navigation/apps/ChangeTargetFolderDialog.java index cf7bd15dbe..0460933294 100644 --- a/src/org/labkey/test/components/ui/navigation/apps/ChangeTargetFolderDialog.java +++ b/src/org/labkey/test/components/ui/navigation/apps/ChangeTargetFolderDialog.java @@ -29,7 +29,7 @@ public void clickChangeFolders() - static public interface UpdatesTargetFolder + public interface UpdatesTargetFolder { void doAndWaitForFolderUpdate(Runnable func); } diff --git a/src/org/labkey/test/components/ui/navigation/apps/LKSNavContainer.java b/src/org/labkey/test/components/ui/navigation/apps/LKSNavContainer.java index 3f401f9f41..82da00d684 100644 --- a/src/org/labkey/test/components/ui/navigation/apps/LKSNavContainer.java +++ b/src/org/labkey/test/components/ui/navigation/apps/LKSNavContainer.java @@ -32,7 +32,7 @@ public void clickProject(String project) public boolean hasTabs() { - return tabLinks().size() > 0; + return !tabLinks().isEmpty(); } public boolean hasEmptyTabNotification() diff --git a/src/org/labkey/test/components/ui/navigation/apps/ProductsNavContainer.java b/src/org/labkey/test/components/ui/navigation/apps/ProductsNavContainer.java index 931fb59cce..0a71fdfe2b 100644 --- a/src/org/labkey/test/components/ui/navigation/apps/ProductsNavContainer.java +++ b/src/org/labkey/test/components/ui/navigation/apps/ProductsNavContainer.java @@ -110,7 +110,7 @@ public enum Product { _name = name; } - private String _name; + private final String _name; public String getName() { diff --git a/src/org/labkey/test/components/ui/ontology/ConceptPickerDialog.java b/src/org/labkey/test/components/ui/ontology/ConceptPickerDialog.java index 17b0092f2e..9c3803a557 100644 --- a/src/org/labkey/test/components/ui/ontology/ConceptPickerDialog.java +++ b/src/org/labkey/test/components/ui/ontology/ConceptPickerDialog.java @@ -74,7 +74,6 @@ public List getSelectedConceptPath() /** * uses the treePanel control to expand the nodes in order - * @param pathToNode * @return the current dialog */ public ConceptPickerDialog selectNodeFromPath(List pathToNode) diff --git a/src/org/labkey/test/components/ui/ontology/OntologyTreeSearch.java b/src/org/labkey/test/components/ui/ontology/OntologyTreeSearch.java index eeaa85f2bc..d719f27772 100644 --- a/src/org/labkey/test/components/ui/ontology/OntologyTreeSearch.java +++ b/src/org/labkey/test/components/ui/ontology/OntologyTreeSearch.java @@ -87,7 +87,6 @@ public OntologyTreeSearch setInput(String value) * and for the placeholder to become visible. * Clearing the search results in this manner (and ensuring that they are not present) is helpful to ensure * that subsequent calls to waitForResults won't find the last set as they go stale - * @return */ public OntologyTreeSearch clearInput() { @@ -103,7 +102,7 @@ public OntologyTreeSearch clearInput() public List waitForResults() { - getWrapper().waitFor(()-> isResultContainerExpanded() && getSearchResults().size() > 0 || showsNoSearchResultsFound() + getWrapper().waitFor(()-> isResultContainerExpanded() && !getSearchResults().isEmpty() || showsNoSearchResultsFound() , WebDriverWrapper.WAIT_FOR_JAVASCRIPT); return getSearchResults(); } @@ -116,7 +115,6 @@ private List getSearchResults() /** * when more search hits exist than are shown (max of 20 can be shown), an added search result footer element * will appear with text advising the user to refine their search - * @return */ Optional searchResultFooterElement() { diff --git a/src/org/labkey/test/components/ui/ontology/TreeNode.java b/src/org/labkey/test/components/ui/ontology/TreeNode.java index ab1bfca9b8..59289501a2 100644 --- a/src/org/labkey/test/components/ui/ontology/TreeNode.java +++ b/src/org/labkey/test/components/ui/ontology/TreeNode.java @@ -66,7 +66,6 @@ public TreeNode collapse() * a Tree node that is selected shows up in blue bold text. The root always remains selected, while only * the lowest-traversed node (which can be a branch or a leaf node) will be selected. The selected node's * information will appear in the detail tabs when they are shown - * @return */ public TreeNode select() { @@ -204,7 +203,6 @@ public TreeNodeFinder withTitle(String title) * which are 'active'. * For example, search for children of a treeNode will return only direct descendants; use this one to get the * active/focused node(s) in the tree - * @return */ public TreeNodeFinder activeOnly() { @@ -214,7 +212,6 @@ public TreeNodeFinder activeOnly() /** * use this to search for nodes that have a filter icon - * @return */ public TreeNodeFinder withSelectedFilter() { diff --git a/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java b/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java index 565024ae27..ecab6e3030 100644 --- a/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java +++ b/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java @@ -1,6 +1,5 @@ package org.labkey.test.components.ui.permissions; -import org.labkey.test.BootstrapLocators; import org.labkey.test.Locator; import org.labkey.test.components.Component; import org.labkey.test.components.WebDriverComponent; diff --git a/src/org/labkey/test/components/ui/pipeline/StatusPage.java b/src/org/labkey/test/components/ui/pipeline/StatusPage.java index 80ca7ef5f4..263635afb7 100644 --- a/src/org/labkey/test/components/ui/pipeline/StatusPage.java +++ b/src/org/labkey/test/components/ui/pipeline/StatusPage.java @@ -161,7 +161,7 @@ public enum StatusInfo STATUS("Status"), INFO("Info"); - private String value; + private final String value; StatusInfo(String value) { diff --git a/src/org/labkey/test/components/ui/search/SampleFinder.java b/src/org/labkey/test/components/ui/search/SampleFinder.java index 61d8adfeca..3e7dd53e88 100644 --- a/src/org/labkey/test/components/ui/search/SampleFinder.java +++ b/src/org/labkey/test/components/ui/search/SampleFinder.java @@ -81,7 +81,6 @@ public EntityFieldFilterModal clickAddParent(String filterKind) /** * returns the list of search/filter buttons contained in the header section - * @return */ public List getFilterButtons() { @@ -151,7 +150,6 @@ public MultiMenu getSaveSearchDropdownBtn() /** * Clicks the 'Save Search' button next to the saved searches menu * This button will only be present if a search has been done - * @return */ public SaveSampleFinderViewModal clickSaveSearchBtn() { @@ -245,7 +243,7 @@ FilterCard findFilterCard(String queryName) final WebElement savedSearchesContainer = Locator.byClass("dropdown").withChild(savedSearchesButtonLoc).refindWhenNeeded(this); } - public class SavedSearchesMenu extends BootstrapMenu + public static class SavedSearchesMenu extends BootstrapMenu { final static String SAVE_MENU_OPTION = "Save as custom search"; final static String MANGE_MENU_OPTION = "Manage saved searches"; @@ -298,7 +296,7 @@ public boolean isManageEnabled() public String getSelectedView() { List views = getViewsWithCls("active"); - if (views.size() > 0) + if (!views.isEmpty()) return views.get(0).getText(); return null; @@ -307,7 +305,7 @@ public String getSelectedView() public String getLastSearchedView() { List views = getViewsWithCls("session-finder-view"); - if (views.size() > 0) + if (!views.isEmpty()) return views.get(0).getText(); return null; diff --git a/src/org/labkey/test/pages/FolderManagementFolderTree.java b/src/org/labkey/test/pages/FolderManagementFolderTree.java index 5276533c25..e0cab09b72 100644 --- a/src/org/labkey/test/pages/FolderManagementFolderTree.java +++ b/src/org/labkey/test/pages/FolderManagementFolderTree.java @@ -31,8 +31,8 @@ */ public class FolderManagementFolderTree { - private BaseWebDriverTest _test; - private String _projectName; + private final BaseWebDriverTest _test; + private final String _projectName; public FolderManagementFolderTree(BaseWebDriverTest test, String projectName) { @@ -182,7 +182,7 @@ private void dragAndDrop(Locator from, Locator to, BaseWebDriverTest.Position po { WebElement fromEl = from.findElement(_test.getDriver()); WebElement toEl = to.findElement(_test.getDriver()); - int offset = 0; + int offset; int y; switch (pos) { @@ -199,7 +199,7 @@ private void dragAndDrop(Locator from, Locator to, BaseWebDriverTest.Position po offset = -1 * (Integer.parseInt(toEl.getAttribute("height")) / 2 + 1); break; default: - throw new IllegalArgumentException("Unexpected position: " + pos.toString()); + throw new IllegalArgumentException("Unexpected position: " + pos); } Locator.XPathLocator dragBubble = Locator.byClass("x4-grid-dd-wrap"); @@ -238,7 +238,7 @@ private void dragAndDrop(Locator from, Locator to, BaseWebDriverTest.Position po public void reorderFolder(String folder, String targetFolder, Reorder order, boolean successExpected) { - _test.log("Reorder folder: '" + folder + "' " + toString() + " '" + targetFolder + "'"); + _test.log("Reorder folder: '" + folder + "' " + this + " '" + targetFolder + "'"); _test.waitForElement(Locator.xpath("//tr/td/div/span[text()='" + folder +"']/../img[contains(@class,'x4-tree-icon-parent')]"), BaseWebDriverTest.WAIT_FOR_JAVASCRIPT); _test.sleep(1000); //TODO: Figure out what to wait for _test._ext4Helper.waitForMaskToDisappear(); diff --git a/src/org/labkey/test/pages/ImportDataPage.java b/src/org/labkey/test/pages/ImportDataPage.java index 8c0637045f..4f94a43366 100644 --- a/src/org/labkey/test/pages/ImportDataPage.java +++ b/src/org/labkey/test/pages/ImportDataPage.java @@ -222,7 +222,7 @@ public enum Format { TSV("Tab-separated text (tsv)"), CSV("Comma-separated text (csv)"); - private String format; + private final String format; public String getFormat() { diff --git a/src/org/labkey/test/pages/InsertPage.java b/src/org/labkey/test/pages/InsertPage.java index b7996addd3..07b333f426 100644 --- a/src/org/labkey/test/pages/InsertPage.java +++ b/src/org/labkey/test/pages/InsertPage.java @@ -16,7 +16,6 @@ package org.labkey.test.pages; -import org.labkey.test.LabKeySiteWrapper; import org.labkey.test.Locator; import org.labkey.test.Locators; import org.openqa.selenium.WebDriver; @@ -50,7 +49,7 @@ protected Elements elements() return new Elements(); } - protected class Elements + protected static class Elements { public Locator.XPathLocator title = Locators.bodyTitle(); public Locator.XPathLocator body = Locators.bodyPanel(); diff --git a/src/org/labkey/test/pages/OlapTestJson.java b/src/org/labkey/test/pages/OlapTestJson.java index 93cc34f39d..9e997acf97 100644 --- a/src/org/labkey/test/pages/OlapTestJson.java +++ b/src/org/labkey/test/pages/OlapTestJson.java @@ -26,7 +26,7 @@ */ public class OlapTestJson { - private BaseWebDriverTest _test; + private final BaseWebDriverTest _test; public OlapTestJson(BaseWebDriverTest test) { diff --git a/src/org/labkey/test/pages/StartImportPage.java b/src/org/labkey/test/pages/StartImportPage.java index da5779f864..22928f6a0c 100644 --- a/src/org/labkey/test/pages/StartImportPage.java +++ b/src/org/labkey/test/pages/StartImportPage.java @@ -237,7 +237,7 @@ public enum AdvancedOptionsCheckBoxes WebpartPropertiesAndLayout("Webpart properties and layout"), WikisAndTheirAttachments("Wikis and their attachments"); - private String value; + private final String value; AdvancedOptionsCheckBoxes(String value) { diff --git a/src/org/labkey/test/pages/TimeChartWizard.java b/src/org/labkey/test/pages/TimeChartWizard.java index a2d6d6a704..bde54cada4 100644 --- a/src/org/labkey/test/pages/TimeChartWizard.java +++ b/src/org/labkey/test/pages/TimeChartWizard.java @@ -141,7 +141,7 @@ public void checkFilterGridRow(String label) List svgs = Locator.css("div.x4-container svg").findElements(getDriver()); waitForElement(Ext4Helper.Locators.getGridRow(label)); _ext4Helper.checkGridRowCheckbox(label); - if (svgs.size() > 0) + if (!svgs.isEmpty()) { shortWait().until(ExpectedConditions.stalenessOf(svgs.get(0))); } @@ -153,7 +153,7 @@ public void uncheckFilterGridRow(String label) List svgs = Locator.css("svg").findElements(getDriver()); waitForElement(Ext4Helper.Locators.getGridRow(label)); _ext4Helper.uncheckGridRowCheckbox(label); - if (svgs.size() > 0) + if (!svgs.isEmpty()) { shortWait().until(ExpectedConditions.stalenessOf(svgs.get(0))); } diff --git a/src/org/labkey/test/pages/ViewDatasetDataPage.java b/src/org/labkey/test/pages/ViewDatasetDataPage.java index 997e04384f..cde9d707c3 100644 --- a/src/org/labkey/test/pages/ViewDatasetDataPage.java +++ b/src/org/labkey/test/pages/ViewDatasetDataPage.java @@ -15,7 +15,6 @@ */ package org.labkey.test.pages; -import org.labkey.test.Locators; import org.labkey.test.util.DataRegionTable; import org.openqa.selenium.WebDriver; diff --git a/src/org/labkey/test/pages/admin/CreateProjectPage.java b/src/org/labkey/test/pages/admin/CreateProjectPage.java index 64bfac2fff..9bd76ca64f 100644 --- a/src/org/labkey/test/pages/admin/CreateProjectPage.java +++ b/src/org/labkey/test/pages/admin/CreateProjectPage.java @@ -95,8 +95,8 @@ protected ElementCache newElementCache() protected class ElementCache extends LabKeyPage.ElementCache { - WebElement nameInput = Locator.input("name").findWhenNeeded(this).withTimeout(4000);; - WebElement titleInput = Locator.input("title").findWhenNeeded(this).withTimeout(4000);; + WebElement nameInput = Locator.input("name").findWhenNeeded(this).withTimeout(4000); + WebElement titleInput = Locator.input("title").findWhenNeeded(this).withTimeout(4000); WebElement useNameAsDisplayTitleCheckBox = Locator.checkboxByLabel("Use name as display title", false) .findWhenNeeded(this).withTimeout(4000); Locator activePane = Locator.tagWithClass("li", "active") diff --git a/src/org/labkey/test/pages/admin/ReorderFoldersPage.java b/src/org/labkey/test/pages/admin/ReorderFoldersPage.java index f6a0f5fbe0..426fa34c7a 100644 --- a/src/org/labkey/test/pages/admin/ReorderFoldersPage.java +++ b/src/org/labkey/test/pages/admin/ReorderFoldersPage.java @@ -20,8 +20,6 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.components.html.SelectWrapper; import org.labkey.test.pages.LabKeyPage; -import org.labkey.test.selenium.LazyWebElement; -import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; diff --git a/src/org/labkey/test/pages/admin/UsageStatisticsPage.java b/src/org/labkey/test/pages/admin/UsageStatisticsPage.java index 812caf81cf..ba407a271a 100644 --- a/src/org/labkey/test/pages/admin/UsageStatisticsPage.java +++ b/src/org/labkey/test/pages/admin/UsageStatisticsPage.java @@ -6,7 +6,6 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.components.html.Input; import org.labkey.test.pages.LabKeyPage; -import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; @@ -67,7 +66,6 @@ public String getJsonPath() /** * gets the value of the content element, which will be json if not at the end of a key-path, otherwise the value - * @return */ public String getValue() { diff --git a/src/org/labkey/test/pages/announcements/AdminPage.java b/src/org/labkey/test/pages/announcements/AdminPage.java index 28fdb92f27..c3332a563b 100644 --- a/src/org/labkey/test/pages/announcements/AdminPage.java +++ b/src/org/labkey/test/pages/announcements/AdminPage.java @@ -192,7 +192,7 @@ protected class ElementCache extends LabKeyPage.ElementCache protected WebElement securityOff = Locator.radioButtonByName("secure").withAttribute("value", "0").findWhenNeeded(this); protected WebElement securityOn = Locator.radioButtonByName("secure").withAttribute("value", "1").findWhenNeeded(this); - private Locator.XPathLocator moderatorReview = Locator.radioButtonByName("moderatorReview"); + private final Locator.XPathLocator moderatorReview = Locator.radioButtonByName("moderatorReview"); protected WebElement moderatorReviewAll = moderatorReview.withAttribute("value", "All").findWhenNeeded(this); protected WebElement moderatorReviewInitial = moderatorReview.withAttribute("value", "InitialPost").findWhenNeeded(this); protected WebElement moderatorReviewNewThread = moderatorReview.withAttribute("value", "NewThread").findWhenNeeded(this); diff --git a/src/org/labkey/test/pages/announcements/EmailPrefsPage.java b/src/org/labkey/test/pages/announcements/EmailPrefsPage.java index 4b6f70746d..178af551f9 100644 --- a/src/org/labkey/test/pages/announcements/EmailPrefsPage.java +++ b/src/org/labkey/test/pages/announcements/EmailPrefsPage.java @@ -108,12 +108,12 @@ protected ElementCache newElementCache() protected class ElementCache extends LabKeyPage.ElementCache { - private Locator.XPathLocator notify = Locator.radioButtonByName("emailPreference"); + private final Locator.XPathLocator notify = Locator.radioButtonByName("emailPreference"); protected WebElement notifyNone = notify.withAttribute("value", "0").findWhenNeeded(this); protected WebElement notifyMine = notify.withAttribute("value", "2").findWhenNeeded(this); protected WebElement notifyAll = notify.withAttribute("value", "1").findWhenNeeded(this); - private Locator.XPathLocator type = Locator.radioButtonByName("notificationType"); + private final Locator.XPathLocator type = Locator.radioButtonByName("notificationType"); protected WebElement typeIndividual = notify.withAttribute("value", "3").findWhenNeeded(this); protected WebElement typeDigest = notify.withAttribute("value", "4").findWhenNeeded(this); diff --git a/src/org/labkey/test/pages/assay/AssayUploadJobsPage.java b/src/org/labkey/test/pages/assay/AssayUploadJobsPage.java index 9f9edca2fd..1a6942025c 100644 --- a/src/org/labkey/test/pages/assay/AssayUploadJobsPage.java +++ b/src/org/labkey/test/pages/assay/AssayUploadJobsPage.java @@ -5,10 +5,8 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.pages.LabKeyPage; import org.labkey.test.pages.pipeline.PipelineStatusDetailsPage; -import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.PipelineStatusTable; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; import java.util.Map; diff --git a/src/org/labkey/test/pages/assay/ExclusionConfirmationPage.java b/src/org/labkey/test/pages/assay/ExclusionConfirmationPage.java index 97928c3501..658d81cfcf 100644 --- a/src/org/labkey/test/pages/assay/ExclusionConfirmationPage.java +++ b/src/org/labkey/test/pages/assay/ExclusionConfirmationPage.java @@ -24,7 +24,7 @@ public class ExclusionConfirmationPage extends LabKeyPage { - private DataRegionTable excludedRowsDataGrid = null; + private DataRegionTable excludedRowsDataGrid; public ExclusionConfirmationPage(WebDriver driver) { diff --git a/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java b/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java index c1ba6ca215..299ccf67d6 100644 --- a/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java +++ b/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java @@ -112,8 +112,6 @@ public List getSelectedSamples() /** * to interact with the samples select, uncheck this box - * @param checked - * @return */ public ElisaRunDetailsPage setShowAllSamples(boolean checked) { @@ -124,8 +122,6 @@ public ElisaRunDetailsPage setShowAllSamples(boolean checked) /** * to interact with the controls select, uncheck this box - * @param checked - * @return */ public ElisaRunDetailsPage setShowAllControls(boolean checked) { diff --git a/src/org/labkey/test/pages/core/UserNotificationsPage.java b/src/org/labkey/test/pages/core/UserNotificationsPage.java index 1aaf6f6eaf..32e529c41d 100644 --- a/src/org/labkey/test/pages/core/UserNotificationsPage.java +++ b/src/org/labkey/test/pages/core/UserNotificationsPage.java @@ -106,7 +106,7 @@ public NotificationItem getNotificationAtIndex(int idx) public List getNotificationsOfType(NotificationTypes notificationType) { - List panels = new ArrayList<>(); + List panels; WebElement targetPanel = null; List notifications = new ArrayList<>(); @@ -137,7 +137,7 @@ public NotificationItem findNotificationInPage(String searchBody, @Nullable Noti { int noticeIndex; boolean noticeFound; - List notificationItemList = new ArrayList<>(); + List notificationItemList; if(notificationType == null) { diff --git a/src/org/labkey/test/pages/core/admin/FileTransferConfigurationPage.java b/src/org/labkey/test/pages/core/admin/FileTransferConfigurationPage.java index 7f41d7f715..a56287a8cc 100644 --- a/src/org/labkey/test/pages/core/admin/FileTransferConfigurationPage.java +++ b/src/org/labkey/test/pages/core/admin/FileTransferConfigurationPage.java @@ -20,7 +20,6 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.pages.LabKeyPage; import org.labkey.test.selenium.LazyWebElement; -import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/org/labkey/test/pages/core/admin/FolderTypePages.java b/src/org/labkey/test/pages/core/admin/FolderTypePages.java index a698f9612d..28a4a438c2 100644 --- a/src/org/labkey/test/pages/core/admin/FolderTypePages.java +++ b/src/org/labkey/test/pages/core/admin/FolderTypePages.java @@ -70,7 +70,7 @@ private Checkbox findFolderTypeCheckbox(String name) public boolean isEnabled(String value) { - return elementCache().enableTypeCheckbox.withAttribute("name", value).withAttribute("checked").findElements(getDriver()).size() > 0; + return !elementCache().enableTypeCheckbox.withAttribute("name", value).withAttribute("checked").findElements(getDriver()).isEmpty(); } @Override diff --git a/src/org/labkey/test/pages/core/admin/logger/ManagerPage.java b/src/org/labkey/test/pages/core/admin/logger/ManagerPage.java index f0a8a1ea6a..2fec7b847b 100644 --- a/src/org/labkey/test/pages/core/admin/logger/ManagerPage.java +++ b/src/org/labkey/test/pages/core/admin/logger/ManagerPage.java @@ -154,9 +154,10 @@ protected WebElement getLoggerRow(String logger) } } - public class LoggerInfo + public static class LoggerInfo { - private String _name, _parent; + private final String _name; + private final String _parent; LoggingLevel _level; public LoggerInfo(String name, String parent, LoggingLevel level) @@ -191,6 +192,6 @@ public enum LoggingLevel INFO, OFF, TRACE, - WARN; + WARN } } diff --git a/src/org/labkey/test/pages/dataintegration/ETLSchedulerPage.java b/src/org/labkey/test/pages/dataintegration/ETLSchedulerPage.java index b7e5e9c4e4..a83441e882 100644 --- a/src/org/labkey/test/pages/dataintegration/ETLSchedulerPage.java +++ b/src/org/labkey/test/pages/dataintegration/ETLSchedulerPage.java @@ -54,8 +54,6 @@ public static ETLSchedulerPage beginAt(BaseWebDriverTest test, String containerP /** * gets the ETL given its name. - * @param transformName - * @return */ public TransformRow getTransform(String transformName) { diff --git a/src/org/labkey/test/pages/files/FileContentPage.java b/src/org/labkey/test/pages/files/FileContentPage.java index f500da2a38..c097d07779 100644 --- a/src/org/labkey/test/pages/files/FileContentPage.java +++ b/src/org/labkey/test/pages/files/FileContentPage.java @@ -19,15 +19,13 @@ import org.labkey.test.WebDriverWrapper; import org.labkey.test.WebTestHelper; import org.labkey.test.pages.LabKeyPage; -import org.labkey.test.selenium.LazyWebElement; import org.labkey.test.util.FileBrowserHelper; -import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; public class FileContentPage extends LabKeyPage { - private FileBrowserHelper _fileBrowserHelper; + private final FileBrowserHelper _fileBrowserHelper; public FileContentPage(WebDriver driver) { diff --git a/src/org/labkey/test/pages/issues/EmailPrefsPage.java b/src/org/labkey/test/pages/issues/EmailPrefsPage.java index 9e598dcedb..51d40dfd59 100644 --- a/src/org/labkey/test/pages/issues/EmailPrefsPage.java +++ b/src/org/labkey/test/pages/issues/EmailPrefsPage.java @@ -20,8 +20,6 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.components.html.Checkbox; import org.labkey.test.pages.LabKeyPage; -import org.labkey.test.selenium.LazyWebElement; -import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/org/labkey/test/pages/issues/IssuesFormItemFinder.java b/src/org/labkey/test/pages/issues/IssuesFormItemFinder.java index 3279e68baf..8c75845f52 100644 --- a/src/org/labkey/test/pages/issues/IssuesFormItemFinder.java +++ b/src/org/labkey/test/pages/issues/IssuesFormItemFinder.java @@ -15,7 +15,6 @@ */ package org.labkey.test.pages.issues; -import org.labkey.test.LabKeySiteWrapper; import org.labkey.test.Locator; import org.labkey.test.components.html.FormItem; import org.labkey.test.components.labkey.FormItemFinder; @@ -33,7 +32,7 @@ public abstract class IssuesFormItemFinder extends org.labkey.test.components { public static FormItemFinder IssueFormItem(WebDriver driver) { - return new IssuesFormItemFinder() + return new IssuesFormItemFinder<>() { @Override protected FormItem construct(WebElement el) diff --git a/src/org/labkey/test/pages/issues/IssuesReadOnlyFormItem.java b/src/org/labkey/test/pages/issues/IssuesReadOnlyFormItem.java index a7217fe8a8..4bb5bd2863 100644 --- a/src/org/labkey/test/pages/issues/IssuesReadOnlyFormItem.java +++ b/src/org/labkey/test/pages/issues/IssuesReadOnlyFormItem.java @@ -28,7 +28,7 @@ protected IssuesReadOnlyFormItem(WebElement el) public static FormItemFinder IssueReadOnlyFormItem() { - return new IssuesFormItemFinder() + return new IssuesFormItemFinder<>() { @Override protected IssuesReadOnlyFormItem construct(WebElement el) diff --git a/src/org/labkey/test/pages/list/SetDefaultValuesListPage.java b/src/org/labkey/test/pages/list/SetDefaultValuesListPage.java index 0c6f8b77da..f596ab0619 100644 --- a/src/org/labkey/test/pages/list/SetDefaultValuesListPage.java +++ b/src/org/labkey/test/pages/list/SetDefaultValuesListPage.java @@ -74,7 +74,7 @@ protected ElementCache newElementCache() protected class ElementCache extends LabKeyPage.ElementCache { - private Map formItems = new HashMap<>(); + private final Map formItems = new HashMap<>(); protected WebElement saveButton = Locator.lkButton("Save Defaults").findWhenNeeded(this); protected WebElement clearButton = Locator.lkButton("Clear Defaults").findWhenNeeded(this); protected WebElement cancelButton = Locator.lkButton("Cancel").findWhenNeeded(this); diff --git a/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java b/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java index 81e1558158..762dedf7f0 100644 --- a/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java +++ b/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java @@ -385,7 +385,6 @@ public void clickRunLink() /** * Click the run link with the given name. - * @param runName */ @LogMethod public void clickRunLink(@Nullable String runName) diff --git a/src/org/labkey/test/pages/search/SearchResultsPage.java b/src/org/labkey/test/pages/search/SearchResultsPage.java index 7931c06023..3099641a3c 100644 --- a/src/org/labkey/test/pages/search/SearchResultsPage.java +++ b/src/org/labkey/test/pages/search/SearchResultsPage.java @@ -152,7 +152,7 @@ List searchResultCards() // Todo: wrap these into a better compon return Locator.tagWithClass("div", "labkey-search-result").findElements(this); } - private WebElement searchResultsPanel = Locator.byClass("labkey-search-results").findWhenNeeded(this); + private final WebElement searchResultsPanel = Locator.byClass("labkey-search-results").findWhenNeeded(this); public Optional getSearchResultsPanel() { diff --git a/src/org/labkey/test/pages/study/DatasetDesignerPage.java b/src/org/labkey/test/pages/study/DatasetDesignerPage.java index b8ba488e23..4de76d223a 100644 --- a/src/org/labkey/test/pages/study/DatasetDesignerPage.java +++ b/src/org/labkey/test/pages/study/DatasetDesignerPage.java @@ -279,12 +279,12 @@ protected class ElementCache extends DomainDesigner.ElementCache protected Input descriptionInput = new Input(Locator.id("description").findWhenNeeded(propertiesPanel), getDriver()); - private WebElement categoryRow = Locator.tagWithClass("div", "margin-top") + private final WebElement categoryRow = Locator.tagWithClass("div", "margin-top") .containingIgnoreCase("Category").findWhenNeeded(propertiesPanel); protected FilteringReactSelect categorySelect = FilteringReactSelect.finder(getDriver()).findWhenNeeded(categoryRow); protected Input labelInput = new Input(Locator.inputById("label").findWhenNeeded(propertiesPanel), getDriver()); - private WebElement rowUniquenessContainer = Locator.tagWithClass("div", "dataset_data_row_uniqueness_container") + private final WebElement rowUniquenessContainer = Locator.tagWithClass("div", "dataset_data_row_uniqueness_container") .findWhenNeeded(propertiesPanel); final ReactSelect keyPropertyName = ReactSelect.finder(getDriver()).withName("keyPropertyName").findWhenNeeded(this); protected Locator dataRowRadioBtn(Integer index) diff --git a/src/org/labkey/test/pages/study/ManageStudyNotificationPage.java b/src/org/labkey/test/pages/study/ManageStudyNotificationPage.java index 6cb2bd0ceb..56b05adb13 100644 --- a/src/org/labkey/test/pages/study/ManageStudyNotificationPage.java +++ b/src/org/labkey/test/pages/study/ManageStudyNotificationPage.java @@ -1,13 +1,10 @@ package org.labkey.test.pages.study; -import org.labkey.test.Locator; import org.labkey.test.WebDriverWrapper; import org.labkey.test.WebTestHelper; import org.labkey.test.components.ext4.RadioButton; import org.labkey.test.pages.LabKeyPage; -import org.labkey.test.util.Ext4Helper; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; public class ManageStudyNotificationPage extends LabKeyPage { @@ -71,6 +68,7 @@ protected void waitForPage() waitForText("Manage Study Notifications"); } + @Override protected ManageStudyNotificationPage.ElementCache newElementCache() { return new ManageStudyNotificationPage.ElementCache(); diff --git a/src/org/labkey/test/pages/test/CoreComponentsTestPage.java b/src/org/labkey/test/pages/test/CoreComponentsTestPage.java index 01d1b6503a..6da3d621ef 100644 --- a/src/org/labkey/test/pages/test/CoreComponentsTestPage.java +++ b/src/org/labkey/test/pages/test/CoreComponentsTestPage.java @@ -42,8 +42,6 @@ public EditableGrid getEditableGrid(String schema, String query) /** * Configures the current page to show a GridPanel containing the contents of the specified query - * @param schema - * @param query * @return a QueryGrid to wrap the GridPanel, once it is found */ public QueryGrid getGridPanel(String schema, String query) @@ -63,7 +61,6 @@ private void applySchemaQuery(String schema, String query) /** * clears the selected component, if there is one, so that the current page can be re-used * to test a different component - * @return */ public CoreComponentsTestPage clearSelectedComponent() { diff --git a/src/org/labkey/test/params/experiment/SampleTypeDefinition.java b/src/org/labkey/test/params/experiment/SampleTypeDefinition.java index 8a41e58311..5ec903a07a 100644 --- a/src/org/labkey/test/params/experiment/SampleTypeDefinition.java +++ b/src/org/labkey/test/params/experiment/SampleTypeDefinition.java @@ -30,7 +30,7 @@ public class SampleTypeDefinition extends DomainProps private List _fields = new ArrayList<>(); private Map _parentAliases = new HashMap<>(); // Indicates which parent aliases reference 'exp.dataInputs' instead of 'exp.materialInputs' - private Set _dataParentAliases = new HashSet<>(); + private final Set _dataParentAliases = new HashSet<>(); // Currently, these values are only used by the SampleManager module. private MetricUnit _inventoryMetricUnit; diff --git a/src/org/labkey/test/pipeline/ExperimentGraph.java b/src/org/labkey/test/pipeline/ExperimentGraph.java index 7dbad3fda5..ef9efaf46a 100644 --- a/src/org/labkey/test/pipeline/ExperimentGraph.java +++ b/src/org/labkey/test/pipeline/ExperimentGraph.java @@ -27,7 +27,7 @@ public class ExperimentGraph { private static final String MAP_NAME = "graphmap"; - private PipelineWebTestBase _test; + private final PipelineWebTestBase _test; public ExperimentGraph(PipelineWebTestBase test) { diff --git a/src/org/labkey/test/pipeline/PipelineFolder.java b/src/org/labkey/test/pipeline/PipelineFolder.java index 18c4b6487d..91a35d8fef 100644 --- a/src/org/labkey/test/pipeline/PipelineFolder.java +++ b/src/org/labkey/test/pipeline/PipelineFolder.java @@ -131,7 +131,7 @@ public void clean() public static class MailSettings { - private PipelineWebTestBase _test; + private final PipelineWebTestBase _test; private boolean _notifyOnSuccess; private boolean _notifyOwnerOnSuccess; private String[] _notifyUsersOnSuccess = new String[0]; diff --git a/src/org/labkey/test/pipeline/PipelineTestsBase.java b/src/org/labkey/test/pipeline/PipelineTestsBase.java index 93bbd987fe..d448b78191 100644 --- a/src/org/labkey/test/pipeline/PipelineTestsBase.java +++ b/src/org/labkey/test/pipeline/PipelineTestsBase.java @@ -58,7 +58,7 @@ public void setFolder(PipelineFolder folder) public boolean hasParams() { - return _listParams.size() > 0; + return !_listParams.isEmpty(); } public void addParams(PipelineTestParams params) @@ -73,7 +73,7 @@ public void removeParams(PipelineTestParams params) public PipelineTestParams[] getParams() { - return _listParams.toArray(new PipelineTestParams[_listParams.size()]); + return _listParams.toArray(new PipelineTestParams[0]); } public PipelineTestParams[] getCompleteParams() @@ -85,7 +85,7 @@ public PipelineTestParams[] getCompleteParams() if (pc.isComplete(tp)) listCompleteParams.add(tp); } - return listCompleteParams.toArray(new PipelineTestParams[listCompleteParams.size()]); + return listCompleteParams.toArray(new PipelineTestParams[0]); } public void setup() @@ -147,7 +147,7 @@ public void runAll() public class PageCache { private PipelineStatusTable _tableStatus; - private Map _mapTableExp = new HashMap<>(); + private final Map _mapTableExp = new HashMap<>(); /** * Determines whether a test has completed its pipeline processing. Note diff --git a/src/org/labkey/test/pipeline/PipelineWebTestBase.java b/src/org/labkey/test/pipeline/PipelineWebTestBase.java index 0c27b0827c..a048cc27a0 100644 --- a/src/org/labkey/test/pipeline/PipelineWebTestBase.java +++ b/src/org/labkey/test/pipeline/PipelineWebTestBase.java @@ -23,7 +23,7 @@ */ abstract public class PipelineWebTestBase extends BaseWebDriverTest { - private String _projectName; + private final String _projectName; public PipelineWebTestBase(String projectName) { diff --git a/src/org/labkey/test/selenium/ReclickingWebElement.java b/src/org/labkey/test/selenium/ReclickingWebElement.java index 7d592011d0..65dc66e8e6 100644 --- a/src/org/labkey/test/selenium/ReclickingWebElement.java +++ b/src/org/labkey/test/selenium/ReclickingWebElement.java @@ -153,9 +153,9 @@ private void clickImageMapArea() private Point getAreaCenter() { List coords = Arrays.stream(getWrappedElement().getAttribute("coords").split(",")).map(Integer::parseInt).collect(Collectors.toList()); - Integer minX = Integer.MAX_VALUE; + int minX = Integer.MAX_VALUE; Integer maxX = 0; - Integer minY = Integer.MAX_VALUE; + int minY = Integer.MAX_VALUE; Integer maxY = 0; for (int i = 0; i + 1 < coords.size(); i = i + 2) { @@ -178,7 +178,7 @@ private Point getAreaCenter() */ private boolean clickRowInFirefox() { - TestLogger.warn("Don't click 'tr' elements directly, use a specific child 'td': " + toString()); + TestLogger.warn("Don't click 'tr' elements directly, use a specific child 'td': " + this); List cells = getWrappedElement().findElements(By.xpath("./td")); for (WebElement cell : cells) { diff --git a/src/org/labkey/test/stress/AbstractScenario.java b/src/org/labkey/test/stress/AbstractScenario.java index 0b0e7d99f3..4eb322702c 100644 --- a/src/org/labkey/test/stress/AbstractScenario.java +++ b/src/org/labkey/test/stress/AbstractScenario.java @@ -260,7 +260,7 @@ public enum ScenarioState RUNNING, FINISHING, SHUTDOWN, - COMPLETE; + COMPLETE } public interface TsvResultsWriter diff --git a/src/org/labkey/test/studysampler/Runner.java b/src/org/labkey/test/studysampler/Runner.java index af9f9b3913..1d382448bf 100644 --- a/src/org/labkey/test/studysampler/Runner.java +++ b/src/org/labkey/test/studysampler/Runner.java @@ -106,7 +106,7 @@ public class Runner static class AliasFactory { - private Map _aliases = new HashMap<>(); + private final Map _aliases = new HashMap<>(); String get(String key) { @@ -382,7 +382,7 @@ static void loadSubjectList(File subjectListFile, AliasFactory aliaser) throws I { random = new Random(Long.parseLong(reader.readLine())); // First line is seed. - while (!(line = reader.readLine()).equals("")) + while (!(line = reader.readLine()).isEmpty()) { subjectIds.add(line); aliaser.get(line, ANIMAL_PREFIX); // Pre-generate aliases to ensure consistency. diff --git a/src/org/labkey/test/teamcity/TeamCityUtils.java b/src/org/labkey/test/teamcity/TeamCityUtils.java index b01b57166d..a90f3d6070 100644 --- a/src/org/labkey/test/teamcity/TeamCityUtils.java +++ b/src/org/labkey/test/teamcity/TeamCityUtils.java @@ -165,7 +165,7 @@ public static void serviceMessage(String messageName, Map attrib } } messageBuilder.append("]"); - System.out.println(messageBuilder.toString()); + System.out.println(messageBuilder); } public static void serviceMessage(String messageName, String value) diff --git a/src/org/labkey/test/testpicker/TestHelper.java b/src/org/labkey/test/testpicker/TestHelper.java index 6ae580a915..a117ea6ebd 100644 --- a/src/org/labkey/test/testpicker/TestHelper.java +++ b/src/org/labkey/test/testpicker/TestHelper.java @@ -58,15 +58,15 @@ public class TestHelper public static final String DEFAULT_ROOT = TestFileUtils.getLabKeyRoot(); private static Thread awtThread = null; - private static String _saveFileName = "savedConfigs.idx"; - private static String _prevTestConfig = "previous_config"; + private static final String _saveFileName = "savedConfigs.idx"; + private static final String _prevTestConfig = "previous_config"; private File _saveFile; private List _savedConfigs; private JFrame _window; private CheckNode _treeRoot; private CheckRenderer _renderer; - private String _rootName = "Test Suites"; + private final String _rootName = "Test Suites"; private JCheckBox _clean; private JCheckBox _linkCheck; private JCheckBox _memCheck; @@ -344,7 +344,7 @@ private Component createButtonBar() public void actionPerformed(ActionEvent e) { String name = (String) _configDropDown.getSelectedItem(); - if (!name.equals("")) + if (!name.isEmpty()) { deleteTestConfig(name); _configDropDown.removeItem(name); @@ -392,7 +392,7 @@ public void actionPerformed(ActionEvent e) @Override public void actionPerformed(ActionEvent e) { - setResult(SuiteFactory.getInstance().getTestSet(Continue.class.getSimpleName()), new ArrayList()); + setResult(SuiteFactory.getInstance().getTestSet(Continue.class.getSimpleName()), new ArrayList<>()); _window.dispose(); } }); @@ -513,7 +513,7 @@ private List getChecked(CheckNode node, boolean testsOnly) private boolean validate(String name) { - if (name == null || name.equals("")) + if (name == null || name.isEmpty()) { JOptionPane.showMessageDialog(_window, "You did not enter a name. The test configuration was not saved."); return false; @@ -536,7 +536,7 @@ private void saveTestConfig(String name) */ private List deleteTestConfigFromList(String name, List list) { - if (list.size() > 0) + if (!list.isEmpty()) { for (TestConfig config : list) { @@ -580,7 +580,7 @@ private void writeConfigs(List configsToSave) */ private void loadTestConfig(String name) { - if (name == null || name.equals("")) + if (name == null || name.isEmpty()) { reloadPage(new TestConfig()); } @@ -656,13 +656,13 @@ private void loadUserProps() _memCheck.setSelected(Boolean.valueOf(System.getProperty("memCheck"))); _haltOnError.setSelected(Boolean.valueOf(System.getProperty("haltOnError"))); String port = System.getProperty("labkey.port"); - if (port != null && !port.equals("")) + if (port != null && !port.isEmpty()) _port.setText(port); String contextPath = System.getProperty("labkey.contextpath"); - if (contextPath != null && !contextPath.equals("")) + if (contextPath != null && !contextPath.isEmpty()) _contextPath.setText(contextPath); String server = System.getProperty("labkey.server"); - if (server != null && !server.equals("")) + if (server != null && !server.isEmpty()) _server.setText(server); } @@ -707,7 +707,6 @@ private void check(CheckNode node, List paths) /** * Expands the path of a node. - * @param path */ private void expandNode(TreeNode[] path) { @@ -829,7 +828,7 @@ else if (_ieButton.isSelected()) } saveTestConfig(_prevTestConfig); - if (selectedTests.size() != 0 ) + if (!selectedTests.isEmpty()) { setResult(SuiteFactory.getInstance().getTestSet(Test.class.getSimpleName()), selectedTests); } @@ -841,7 +840,7 @@ else if (_ieButton.isSelected()) * A checkbox that has another checkbox that must be selected if this checkbox is. Disables and checks * dependent checkbox if selected. */ - private class DependentCheckBox extends JCheckBox + private static class DependentCheckBox extends JCheckBox { JCheckBox _dependentCheckBox; diff --git a/src/org/labkey/test/tests/AbstractAdminConsoleTest.java b/src/org/labkey/test/tests/AbstractAdminConsoleTest.java index 2f2d9b0780..d0b8ba3c4e 100644 --- a/src/org/labkey/test/tests/AbstractAdminConsoleTest.java +++ b/src/org/labkey/test/tests/AbstractAdminConsoleTest.java @@ -24,11 +24,6 @@ import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public abstract class AbstractAdminConsoleTest extends BaseWebDriverTest { protected static final String APP_ADMIN_USER = "app_admin_test_user@adminconsole.test"; diff --git a/src/org/labkey/test/tests/AbstractKnitrReportTest.java b/src/org/labkey/test/tests/AbstractKnitrReportTest.java index 3f45ddd519..1400ef6a54 100644 --- a/src/org/labkey/test/tests/AbstractKnitrReportTest.java +++ b/src/org/labkey/test/tests/AbstractKnitrReportTest.java @@ -62,7 +62,7 @@ private static String readReport(final Path reportFile) @BeforeClass public static void initProject() { - AbstractKnitrReportTest init = (AbstractKnitrReportTest)getCurrentTest(); + AbstractKnitrReportTest init = getCurrentTest(); init.setupProject(); } diff --git a/src/org/labkey/test/tests/ActiveUserLimitationTest.java b/src/org/labkey/test/tests/ActiveUserLimitationTest.java index 957503109f..7be6eae720 100644 --- a/src/org/labkey/test/tests/ActiveUserLimitationTest.java +++ b/src/org/labkey/test/tests/ActiveUserLimitationTest.java @@ -30,7 +30,7 @@ public class ActiveUserLimitationTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - ActiveUserLimitationTest init = (ActiveUserLimitationTest) getCurrentTest(); + ActiveUserLimitationTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/AdminConsoleNavigationTest.java b/src/org/labkey/test/tests/AdminConsoleNavigationTest.java index 7aa02fcf79..f899bf92da 100644 --- a/src/org/labkey/test/tests/AdminConsoleNavigationTest.java +++ b/src/org/labkey/test/tests/AdminConsoleNavigationTest.java @@ -18,7 +18,6 @@ import org.labkey.test.util.Crawler; import org.labkey.test.util.PermissionsHelper; import org.labkey.test.util.TestLogger; -import org.openqa.selenium.JavascriptException; import org.openqa.selenium.WebElement; import java.io.IOException; @@ -46,7 +45,7 @@ public class AdminConsoleNavigationTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - AdminConsoleNavigationTest init = (AdminConsoleNavigationTest) getCurrentTest(); + AdminConsoleNavigationTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/AssayExportImportTest.java b/src/org/labkey/test/tests/AssayExportImportTest.java index 697a848f70..b5b8953c9b 100644 --- a/src/org/labkey/test/tests/AssayExportImportTest.java +++ b/src/org/labkey/test/tests/AssayExportImportTest.java @@ -132,7 +132,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - AssayExportImportTest init = (AssayExportImportTest)getCurrentTest(); + AssayExportImportTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/AssayResultsExportTest.java b/src/org/labkey/test/tests/AssayResultsExportTest.java index cdfc9a63f3..73f50b75e6 100644 --- a/src/org/labkey/test/tests/AssayResultsExportTest.java +++ b/src/org/labkey/test/tests/AssayResultsExportTest.java @@ -129,7 +129,7 @@ protected String getDataRegionId() @BeforeClass public static void doSetup() throws Exception { - AssayResultsExportTest initTest = (AssayResultsExportTest) getCurrentTest(); + AssayResultsExportTest initTest = getCurrentTest(); initTest.setupTestContainers(); } diff --git a/src/org/labkey/test/tests/AttachmentFieldTest.java b/src/org/labkey/test/tests/AttachmentFieldTest.java index cf82e05d19..6570daf0f7 100644 --- a/src/org/labkey/test/tests/AttachmentFieldTest.java +++ b/src/org/labkey/test/tests/AttachmentFieldTest.java @@ -32,7 +32,7 @@ public class AttachmentFieldTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - AttachmentFieldTest init = (AttachmentFieldTest) getCurrentTest(); + AttachmentFieldTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/BaseTermsOfUseTest.java b/src/org/labkey/test/tests/BaseTermsOfUseTest.java index 29322ded18..8456735205 100644 --- a/src/org/labkey/test/tests/BaseTermsOfUseTest.java +++ b/src/org/labkey/test/tests/BaseTermsOfUseTest.java @@ -58,7 +58,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - BaseTermsOfUseTest init = (BaseTermsOfUseTest) getCurrentTest(); + BaseTermsOfUseTest init = getCurrentTest(); init.doSetup(); } @@ -109,7 +109,7 @@ protected void createProjectWithTermsOfUse(String name, String termsText, boolea protected void createTermsOfUsePage(String projectName, String body) { - String message = null; + String message; if (null != projectName) { message = "Create terms of use page for project " + projectName; diff --git a/src/org/labkey/test/tests/ChartingAPITest.java b/src/org/labkey/test/tests/ChartingAPITest.java index eb9f64bf07..0520ed5457 100644 --- a/src/org/labkey/test/tests/ChartingAPITest.java +++ b/src/org/labkey/test/tests/ChartingAPITest.java @@ -82,7 +82,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void doSetup() throws Exception { - ChartingAPITest initTest = (ChartingAPITest)getCurrentTest(); + ChartingAPITest initTest = getCurrentTest(); initTest.initProject(); } diff --git a/src/org/labkey/test/tests/ClientAPITest.java b/src/org/labkey/test/tests/ClientAPITest.java index 2d43a013b1..a9b4549d91 100644 --- a/src/org/labkey/test/tests/ClientAPITest.java +++ b/src/org/labkey/test/tests/ClientAPITest.java @@ -200,7 +200,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() throws Exception { - ClientAPITest init = (ClientAPITest)getCurrentTest(); + ClientAPITest init = getCurrentTest(); init._containerHelper.createProject(OTHER_PROJECT, null); init._containerHelper.createProject(PROJECT_NAME, null); @@ -1264,8 +1264,8 @@ private String executeEmailScript(String from, String subject, String[] recipien contentStr.append("'),"); } - String emailScript = String.format(emailScriptTemplate, from, StringUtils.trimToEmpty(subject), recipientStr.toString(), - contentStr.toString()); + String emailScript = String.format(emailScriptTemplate, from, StringUtils.trimToEmpty(subject), recipientStr, + contentStr); return (String)((JavascriptExecutor) getDriver()).executeAsyncScript(emailScript); } @@ -1295,7 +1295,7 @@ public void webDavAPITest() public void webDavAPITestJS() { String script = TestFileUtils.getFileContents(TestFileUtils.getSampleData("api/webdavTest.js")); - String scriptResult = ""; + String scriptResult; try { scriptResult = (String)((JavascriptExecutor) getDriver()).executeAsyncScript(script); diff --git a/src/org/labkey/test/tests/ContainerContextTest.java b/src/org/labkey/test/tests/ContainerContextTest.java index ac1cac44a4..f5d6a05cbb 100644 --- a/src/org/labkey/test/tests/ContainerContextTest.java +++ b/src/org/labkey/test/tests/ContainerContextTest.java @@ -112,7 +112,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setup() throws Exception { - ContainerContextTest init = (ContainerContextTest)getCurrentTest(); + ContainerContextTest init = getCurrentTest(); init.doSetup(); } @@ -556,7 +556,7 @@ private void verifySimpleModuleTables( href != null && (href.contains(expectedHref))); // parent sample ID link (table has a container so URL should go to lookup's container) - if (parentRowIds[i] != null && !parentRowIds[i].equals("") && parentDetailsAction != null) + if (parentRowIds[i] != null && !parentRowIds[i].isEmpty() && parentDetailsAction != null) { String parentTestWorkbookId = rowIdToWorkbookId.get(parentRowIds[i]); String parentTestContainer = getProjectName() + "/" + parentTestWorkbookId; diff --git a/src/org/labkey/test/tests/CrawlerTest.java b/src/org/labkey/test/tests/CrawlerTest.java index f703ae20fd..f356e4ab76 100644 --- a/src/org/labkey/test/tests/CrawlerTest.java +++ b/src/org/labkey/test/tests/CrawlerTest.java @@ -42,7 +42,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void setupProject() { - CrawlerTest init = (CrawlerTest) getCurrentTest(); + CrawlerTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java b/src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java index 2ca8b0aa0b..6b24605c32 100644 --- a/src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java +++ b/src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java @@ -25,7 +25,7 @@ public class CrossSiteScriptingForDeleteTest extends BaseWebDriverTest @BeforeClass public static void initTest() { - CrossSiteScriptingForDeleteTest init = (CrossSiteScriptingForDeleteTest) getCurrentTest(); + CrossSiteScriptingForDeleteTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/CustomizeViewTest.java b/src/org/labkey/test/tests/CustomizeViewTest.java index 90c4d8e51a..d5acccbffb 100644 --- a/src/org/labkey/test/tests/CustomizeViewTest.java +++ b/src/org/labkey/test/tests/CustomizeViewTest.java @@ -85,7 +85,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() throws Exception { - CustomizeViewTest init = (CustomizeViewTest) getCurrentTest(); + CustomizeViewTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/DataClassFolderExportImportTest.java b/src/org/labkey/test/tests/DataClassFolderExportImportTest.java index aed1682416..8859969749 100644 --- a/src/org/labkey/test/tests/DataClassFolderExportImportTest.java +++ b/src/org/labkey/test/tests/DataClassFolderExportImportTest.java @@ -45,7 +45,7 @@ public class DataClassFolderExportImportTest extends BaseWebDriverTest private final File SAMPLE_JPG = new File(DATAFILE_DIRECTORY, "jpg_sample.jpg"); private final File SAMPLE_PDF = new File(DATAFILE_DIRECTORY, "pdf_sample.pdf"); private final File SAMPLE_TIF = new File(DATAFILE_DIRECTORY, "tif_sample.tif"); - private List _attachments = List.of(SAMPLE_CSV, SAMPLE_JPG, SAMPLE_PDF, SAMPLE_TIF); + private final List _attachments = List.of(SAMPLE_CSV, SAMPLE_JPG, SAMPLE_PDF, SAMPLE_TIF); @Override protected void doCleanup(boolean afterTest) throws TestTimeoutException @@ -57,7 +57,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - DataClassFolderExportImportTest init = (DataClassFolderExportImportTest) getCurrentTest(); + DataClassFolderExportImportTest init = getCurrentTest(); init.doSetup(); } @@ -147,7 +147,7 @@ public void testExportImportSimpleDataClass() throws Exception } clickAndWait(Locator.linkWithText(testDataClass)); - DataRegionTable destTable = DataRegionTable.DataRegion(getDriver()).withName("query").waitFor();; + DataRegionTable destTable = DataRegionTable.DataRegion(getDriver()).withName("query").waitFor(); // capture the data in the exported sampleType List> destRowData = destTable.getTableData(); diff --git a/src/org/labkey/test/tests/DataClassTest.java b/src/org/labkey/test/tests/DataClassTest.java index d8adeeddd1..dd39eb96a4 100644 --- a/src/org/labkey/test/tests/DataClassTest.java +++ b/src/org/labkey/test/tests/DataClassTest.java @@ -65,7 +65,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - DataClassTest init = (DataClassTest) getCurrentTest(); + DataClassTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/DataReportsTest.java b/src/org/labkey/test/tests/DataReportsTest.java index 2c6da5b735..50d7df3c54 100644 --- a/src/org/labkey/test/tests/DataReportsTest.java +++ b/src/org/labkey/test/tests/DataReportsTest.java @@ -136,7 +136,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void doSetup() { - DataReportsTest initTest = (DataReportsTest)getCurrentTest(); + DataReportsTest initTest = getCurrentTest(); // fail fast if R is not configured initTest._rReportHelper.ensureRConfig(); diff --git a/src/org/labkey/test/tests/DataViewsReportOrderingTest.java b/src/org/labkey/test/tests/DataViewsReportOrderingTest.java index fc7c24a693..bf6c17c243 100644 --- a/src/org/labkey/test/tests/DataViewsReportOrderingTest.java +++ b/src/org/labkey/test/tests/DataViewsReportOrderingTest.java @@ -52,7 +52,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - DataViewsReportOrderingTest init = (DataViewsReportOrderingTest) getCurrentTest(); + DataViewsReportOrderingTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java b/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java index 4204caad3c..a729e2eda4 100644 --- a/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java +++ b/src/org/labkey/test/tests/DatabaseDiagnosticsTest.java @@ -16,7 +16,6 @@ package org.labkey.test.tests; import org.junit.Assume; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.labkey.test.BaseWebDriverTest; @@ -32,14 +31,11 @@ import org.labkey.test.io.Grep; import org.labkey.test.pages.core.admin.SiteValidationPage; import org.labkey.test.pages.pipeline.PipelineStatusDetailsPage; -import org.labkey.test.util.CspLogUtil; import org.labkey.test.util.Maps; import org.labkey.test.util.Order; import org.labkey.test.util.PasswordUtil; import org.labkey.test.util.PipelineStatusTable; -import org.labkey.test.util.PortalHelper; import org.labkey.test.util.TextSearcher; -import org.labkey.test.util.WikiHelper; import org.openqa.selenium.WebElement; import java.io.File; diff --git a/src/org/labkey/test/tests/DatasetExportTest.java b/src/org/labkey/test/tests/DatasetExportTest.java index 062b3eb9d7..b5739b9dc3 100644 --- a/src/org/labkey/test/tests/DatasetExportTest.java +++ b/src/org/labkey/test/tests/DatasetExportTest.java @@ -91,7 +91,7 @@ protected boolean expectSortedExport() @BeforeClass public static void doSetup() throws Exception { - DatasetExportTest initTest = (DatasetExportTest)getCurrentTest(); + DatasetExportTest initTest = getCurrentTest(); initTest.setupDataset(); } diff --git a/src/org/labkey/test/tests/DomainDesignerTest.java b/src/org/labkey/test/tests/DomainDesignerTest.java index fcc76afee7..3644727342 100644 --- a/src/org/labkey/test/tests/DomainDesignerTest.java +++ b/src/org/labkey/test/tests/DomainDesignerTest.java @@ -85,7 +85,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - DomainDesignerTest init = (DomainDesignerTest) getCurrentTest(); + DomainDesignerTest init = getCurrentTest(); init.doSetup(); } @@ -555,7 +555,6 @@ public void testDeleteNewField() throws Exception /** * confirms that the key field (called 'name') in a sampleset is not shown in the domain editor * - * @throws Exception */ @Test public void testConfirmNameFieldFromSampleTypeNotShown() throws Exception @@ -625,7 +624,6 @@ public void testFieldNameErrors() throws Exception /** * provides regression coverage for https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=38314 * - * @throws Exception */ @Test public void verifySavedFieldCannotBeRenamedReservedName() throws Exception @@ -667,7 +665,6 @@ public void verifySavedFieldCannotBeRenamedReservedName() throws Exception /** * regresses issue https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=38341 * - * @throws Exception */ @Test public void showHideFieldOnDefaultGridView() throws Exception @@ -949,7 +946,7 @@ public void testLookUpFieldSampleType() throws IOException, CommandException new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), new FieldDefinition("testCol", FieldDefinition.ColumnType.String))); - createResponse = dgen.createDomain(createDefaultConnection(), SAMPLE_TYPE_DOMAIN_KIND); + dgen.createDomain(createDefaultConnection(), SAMPLE_TYPE_DOMAIN_KIND); DomainDesignerPage domainDesignerPage = DomainDesignerPage.beginAt(this, getProjectName(), "exp.materials", sampleType); DomainFormPanel domainFormPanel = domainDesignerPage.fieldsPanel(); @@ -1164,7 +1161,6 @@ public void verifyExpectedWarningOnNavigateWithUncomittedChanges() throws Except /** * verifies that when a user marks a field 'required' (and that field already has empty values in it) they are warned * - * @throws Exception */ @Test public void testUserWarningOnRequiredFieldWithEmptyValues() throws Exception @@ -1203,7 +1199,6 @@ public void testUserWarningOnRequiredFieldWithEmptyValues() throws Exception /** * verifies that a field with data (and no blank values) can be marked as 'required' * - * @throws Exception */ @Test public void testMarkFieldRequired() throws Exception @@ -1243,7 +1238,6 @@ public void testMarkFieldRequired() throws Exception /** * confirms that clicking the name field does not expand the field row * - * @throws Exception */ @Test public void verifyNameFieldClickExpandsRow() throws Exception diff --git a/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java b/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java index c4cf1a7521..304a24d4e7 100644 --- a/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java +++ b/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java @@ -33,7 +33,7 @@ public class DomainFieldTypeChangeTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - DomainFieldTypeChangeTest init = (DomainFieldTypeChangeTest) getCurrentTest(); + DomainFieldTypeChangeTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/EditMetadataDomainTest.java b/src/org/labkey/test/tests/EditMetadataDomainTest.java index f9c821baed..2384463771 100644 --- a/src/org/labkey/test/tests/EditMetadataDomainTest.java +++ b/src/org/labkey/test/tests/EditMetadataDomainTest.java @@ -27,7 +27,7 @@ public class EditMetadataDomainTest extends BaseWebDriverTest @BeforeClass public static void setupProject() throws IOException, CommandException { - EditMetadataDomainTest init = (EditMetadataDomainTest) getCurrentTest(); + EditMetadataDomainTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/ExportOptionsMetadataOnlyTest.java b/src/org/labkey/test/tests/ExportOptionsMetadataOnlyTest.java index e18246f9eb..ed9d9538d9 100644 --- a/src/org/labkey/test/tests/ExportOptionsMetadataOnlyTest.java +++ b/src/org/labkey/test/tests/ExportOptionsMetadataOnlyTest.java @@ -43,7 +43,7 @@ public class ExportOptionsMetadataOnlyTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - ExportOptionsMetadataOnlyTest init = (ExportOptionsMetadataOnlyTest) getCurrentTest(); + ExportOptionsMetadataOnlyTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/ExternalSchemaTest.java b/src/org/labkey/test/tests/ExternalSchemaTest.java index d14c0fd3e9..1c5bd311cc 100644 --- a/src/org/labkey/test/tests/ExternalSchemaTest.java +++ b/src/org/labkey/test/tests/ExternalSchemaTest.java @@ -173,7 +173,7 @@ public String toString() @BeforeClass public static void doSetup() throws Exception { - ExternalSchemaTest initTest = (ExternalSchemaTest)getCurrentTest(); + ExternalSchemaTest initTest = getCurrentTest(); initTest.createProject(); } @@ -440,7 +440,7 @@ Row[] selectViaJavaApi(String containerPath, Connection cn, int... pks) throws I Row r = new Row(rowid, text, intNotNull, datetimeNotNull); rows.add(r); } - return rows.toArray(new Row[rows.size()]); + return rows.toArray(new Row[0]); } Row[] updateViaJavaApi(String containerPath, Connection cn, Row... rows) throws ParseException, IOException, CommandException @@ -545,7 +545,7 @@ public int insertViaForm(String containerPath, String text, int intNotNull) // get newly inserted pk String rowidStr = table.getDataAsText(0, table.getColumnIndex("RowId")); assertTrue("Expected to find the RowId for the new row instead of '" + rowidStr + "'", - rowidStr != null && !rowidStr.equals("")); + rowidStr != null && !rowidStr.isEmpty()); return Integer.parseInt(rowidStr); } diff --git a/src/org/labkey/test/tests/FacetedFilterCutoffTest.java b/src/org/labkey/test/tests/FacetedFilterCutoffTest.java index 81d029b812..c37ffc93fb 100644 --- a/src/org/labkey/test/tests/FacetedFilterCutoffTest.java +++ b/src/org/labkey/test/tests/FacetedFilterCutoffTest.java @@ -47,7 +47,7 @@ protected String getProjectName() @BeforeClass public static void doSetup() throws Exception { - FacetedFilterCutoffTest initTest = (FacetedFilterCutoffTest)getCurrentTest(); + FacetedFilterCutoffTest initTest = getCurrentTest(); initTest.doSetupSteps(); } diff --git a/src/org/labkey/test/tests/FieldEditorRowSelectionActionTest.java b/src/org/labkey/test/tests/FieldEditorRowSelectionActionTest.java index 22ef6b18fb..b4d5b646ff 100644 --- a/src/org/labkey/test/tests/FieldEditorRowSelectionActionTest.java +++ b/src/org/labkey/test/tests/FieldEditorRowSelectionActionTest.java @@ -44,7 +44,7 @@ public class FieldEditorRowSelectionActionTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - FieldEditorRowSelectionActionTest init = (FieldEditorRowSelectionActionTest) getCurrentTest(); + FieldEditorRowSelectionActionTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/FileAttachmentColumnTest.java b/src/org/labkey/test/tests/FileAttachmentColumnTest.java index 1bb7d9dc36..9c05dc255c 100644 --- a/src/org/labkey/test/tests/FileAttachmentColumnTest.java +++ b/src/org/labkey/test/tests/FileAttachmentColumnTest.java @@ -101,7 +101,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() throws Exception { - FileAttachmentColumnTest init = (FileAttachmentColumnTest)getCurrentTest(); + FileAttachmentColumnTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/FileBasedPipelineTest.java b/src/org/labkey/test/tests/FileBasedPipelineTest.java index aef1c073d6..7791a439a4 100644 --- a/src/org/labkey/test/tests/FileBasedPipelineTest.java +++ b/src/org/labkey/test/tests/FileBasedPipelineTest.java @@ -61,7 +61,7 @@ public class FileBasedPipelineTest extends BaseWebDriverTest @BeforeClass public static void doSetup() throws Exception { - FileBasedPipelineTest initTest = (FileBasedPipelineTest)getCurrentTest(); + FileBasedPipelineTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), null); initTest._containerHelper.enableModules(Arrays.asList(PIPELINETEST_MODULE, "Pipeline")); diff --git a/src/org/labkey/test/tests/FiltersOnMultipleGridsTest.java b/src/org/labkey/test/tests/FiltersOnMultipleGridsTest.java index 4843c54de7..3f01fa141b 100644 --- a/src/org/labkey/test/tests/FiltersOnMultipleGridsTest.java +++ b/src/org/labkey/test/tests/FiltersOnMultipleGridsTest.java @@ -29,7 +29,7 @@ public class FiltersOnMultipleGridsTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - FiltersOnMultipleGridsTest init = (FiltersOnMultipleGridsTest) getCurrentTest(); + FiltersOnMultipleGridsTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/FlagColumnTest.java b/src/org/labkey/test/tests/FlagColumnTest.java index f2fd3b68aa..4a976ba04e 100644 --- a/src/org/labkey/test/tests/FlagColumnTest.java +++ b/src/org/labkey/test/tests/FlagColumnTest.java @@ -68,7 +68,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void initTest() { - FlagColumnTest init = (FlagColumnTest)getCurrentTest(); + FlagColumnTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/FolderExportTest.java b/src/org/labkey/test/tests/FolderExportTest.java index aa2a43a1ae..0da35b244d 100644 --- a/src/org/labkey/test/tests/FolderExportTest.java +++ b/src/org/labkey/test/tests/FolderExportTest.java @@ -135,7 +135,7 @@ protected Set excludeFromViewCheck() @BeforeClass public static void setupProject() throws IOException { - FolderExportTest init = (FolderExportTest) getCurrentTest(); + FolderExportTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/FolderTest.java b/src/org/labkey/test/tests/FolderTest.java index b4af158fa5..2fac7a56bd 100644 --- a/src/org/labkey/test/tests/FolderTest.java +++ b/src/org/labkey/test/tests/FolderTest.java @@ -23,7 +23,6 @@ import org.labkey.remoteapi.Connection; import org.labkey.remoteapi.query.DeleteRowsCommand; import org.labkey.remoteapi.query.InsertRowsCommand; -import org.labkey.remoteapi.query.SaveRowsResponse; import org.labkey.remoteapi.query.SelectRowsCommand; import org.labkey.remoteapi.query.SelectRowsResponse; import org.labkey.test.BaseWebDriverTest; @@ -62,7 +61,7 @@ @BaseWebDriverTest.ClassTimeout(minutes = 25 ) public class FolderTest extends BaseWebDriverTest { - private static String secondProject = "FolderTestProject2"; + private static final String secondProject = "FolderTestProject2"; @Override public List getAssociatedModules() @@ -92,7 +91,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void testSetup() { - FolderTest init = (FolderTest)getCurrentTest(); + FolderTest init = getCurrentTest(); init._containerHelper.createProject(init.getProjectName(), null); init._containerHelper.createProject(secondProject, null); init.goToProjectHome(); diff --git a/src/org/labkey/test/tests/FolderTreeEncodingTest.java b/src/org/labkey/test/tests/FolderTreeEncodingTest.java index fd483d5dbb..412ba154f2 100644 --- a/src/org/labkey/test/tests/FolderTreeEncodingTest.java +++ b/src/org/labkey/test/tests/FolderTreeEncodingTest.java @@ -48,7 +48,7 @@ public List getAssociatedModules() @BeforeClass public static void initTest() { - FolderTreeEncodingTest init = (FolderTreeEncodingTest)getCurrentTest(); + FolderTreeEncodingTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/GenericMeasurePickerTest.java b/src/org/labkey/test/tests/GenericMeasurePickerTest.java index b20aaa2f8f..c2738a48e1 100644 --- a/src/org/labkey/test/tests/GenericMeasurePickerTest.java +++ b/src/org/labkey/test/tests/GenericMeasurePickerTest.java @@ -66,7 +66,7 @@ protected String getProjectName() @BeforeClass public static void beforeTestClass() { - GenericMeasurePickerTest init = (GenericMeasurePickerTest)getCurrentTest(); + GenericMeasurePickerTest init = getCurrentTest(); init.initProject(); } diff --git a/src/org/labkey/test/tests/GpatAssayTest.java b/src/org/labkey/test/tests/GpatAssayTest.java index 3aa3029ed0..62bc3b0c14 100644 --- a/src/org/labkey/test/tests/GpatAssayTest.java +++ b/src/org/labkey/test/tests/GpatAssayTest.java @@ -76,7 +76,7 @@ public class GpatAssayTest extends BaseWebDriverTest @BeforeClass public static void doSetup() { - GpatAssayTest init = (GpatAssayTest) getCurrentTest(); + GpatAssayTest init = getCurrentTest(); init._containerHelper.createProject(init.getProjectName(), "Assay"); init.goToProjectHome(); } diff --git a/src/org/labkey/test/tests/HTTPApiTest.java b/src/org/labkey/test/tests/HTTPApiTest.java index b0a21cab7a..179df50ebc 100644 --- a/src/org/labkey/test/tests/HTTPApiTest.java +++ b/src/org/labkey/test/tests/HTTPApiTest.java @@ -81,7 +81,7 @@ public List getAssociatedModules() @BeforeClass public static void initTest() throws Exception { - HTTPApiTest init = (HTTPApiTest)getCurrentTest(); + HTTPApiTest init = getCurrentTest(); init.createTestData(); } diff --git a/src/org/labkey/test/tests/InlineImagesAssayTest.java b/src/org/labkey/test/tests/InlineImagesAssayTest.java index 2d4d291118..bb3458c5a1 100644 --- a/src/org/labkey/test/tests/InlineImagesAssayTest.java +++ b/src/org/labkey/test/tests/InlineImagesAssayTest.java @@ -81,7 +81,7 @@ public void preTest() @BeforeClass public static void initTest() { - InlineImagesAssayTest init = (InlineImagesAssayTest)getCurrentTest(); + InlineImagesAssayTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/InlineImagesListTest.java b/src/org/labkey/test/tests/InlineImagesListTest.java index 677a90c8a0..3a95c0c4b7 100644 --- a/src/org/labkey/test/tests/InlineImagesListTest.java +++ b/src/org/labkey/test/tests/InlineImagesListTest.java @@ -122,7 +122,7 @@ public void preTest() @BeforeClass public static void initTest() { - InlineImagesListTest init = (InlineImagesListTest)getCurrentTest(); + InlineImagesListTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/JavaClientApiTest.java b/src/org/labkey/test/tests/JavaClientApiTest.java index 09cf72624b..4ac7ddfd55 100644 --- a/src/org/labkey/test/tests/JavaClientApiTest.java +++ b/src/org/labkey/test/tests/JavaClientApiTest.java @@ -106,7 +106,7 @@ public class JavaClientApiTest extends BaseWebDriverTest @LogMethod public static void doSetup() throws Exception { - JavaClientApiTest initTest = (JavaClientApiTest)getCurrentTest(); + JavaClientApiTest initTest = getCurrentTest(); initTest.setupProject(); } diff --git a/src/org/labkey/test/tests/LinkedReportTest.java b/src/org/labkey/test/tests/LinkedReportTest.java index 1d2c61dec5..fab80e9ee9 100644 --- a/src/org/labkey/test/tests/LinkedReportTest.java +++ b/src/org/labkey/test/tests/LinkedReportTest.java @@ -33,7 +33,7 @@ public List getAssociatedModules() @BeforeClass public static void setupProject() { - LinkedReportTest init = (LinkedReportTest) getCurrentTest(); + LinkedReportTest init = getCurrentTest(); init._containerHelper.createProject(init.getProjectName()); } diff --git a/src/org/labkey/test/tests/LinkedSchemaTest.java b/src/org/labkey/test/tests/LinkedSchemaTest.java index 4a3bcce5f7..428ff5156c 100644 --- a/src/org/labkey/test/tests/LinkedSchemaTest.java +++ b/src/org/labkey/test/tests/LinkedSchemaTest.java @@ -104,7 +104,7 @@ @BaseWebDriverTest.ClassTimeout(minutes = 11) public class LinkedSchemaTest extends BaseWebDriverTest { - private SchemaHelper _schemaHelper = new SchemaHelper(this); + private final SchemaHelper _schemaHelper = new SchemaHelper(this); private static final String PROJECT_NAME = LinkedSchemaTest.class.getSimpleName() + "Project"; private static final String SOURCE_FOLDER = "SourceFolder"; private static final String TARGET_FOLDER = "TargetFolder"; @@ -406,7 +406,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void doSetup() throws Exception { - LinkedSchemaTest initTest = (LinkedSchemaTest)getCurrentTest(); + LinkedSchemaTest initTest = getCurrentTest(); initTest.setupProject(); initTest.createList(); diff --git a/src/org/labkey/test/tests/LookupToSampleIDTest.java b/src/org/labkey/test/tests/LookupToSampleIDTest.java index e1b0e3711d..7cc47003a3 100644 --- a/src/org/labkey/test/tests/LookupToSampleIDTest.java +++ b/src/org/labkey/test/tests/LookupToSampleIDTest.java @@ -62,7 +62,7 @@ public class LookupToSampleIDTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - LookupToSampleIDTest init = (LookupToSampleIDTest) getCurrentTest(); + LookupToSampleIDTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/MessagesLongTest.java b/src/org/labkey/test/tests/MessagesLongTest.java index 5974d1b803..8579d2c3b1 100644 --- a/src/org/labkey/test/tests/MessagesLongTest.java +++ b/src/org/labkey/test/tests/MessagesLongTest.java @@ -155,7 +155,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - MessagesLongTest init = (MessagesLongTest) getCurrentTest(); + MessagesLongTest init = getCurrentTest(); init.doSetup(); } @@ -225,7 +225,7 @@ public void testSteps() log("Create message using markdown"); clickButton( "New"); InsertPage markdownPage = new InsertPage(getDriver()); - assertEquals("default selection should be 'Markdown'",markdownPage.getRenderAs(), WikiHelper.WikiRendererType.MARKDOWN); + assertEquals("default selection should be 'Markdown'", WikiHelper.WikiRendererType.MARKDOWN, markdownPage.getRenderAs()); markdownPage.setTitle("Markdown is a thing now") .setBody(""" # Holy Header, Batman! @@ -534,7 +534,7 @@ private void verifyAdmin() clickButton("Yes"); DataRegionTable dr = new DataRegionTable(usersDataRegion, getDriver()); - assertEquals(dr.getDataAsText(_messageUserId, messageColumn), userSettingNew); + assertEquals(userSettingNew, dr.getDataAsText(_messageUserId, messageColumn)); } private void testMemberLists() @@ -786,7 +786,7 @@ private void schemaTest() selectCmd.setMaxRows(-1); selectCmd.setContainerFilter(ContainerFilter.CurrentAndSubfolders); selectCmd.setColumns(Arrays.asList("*")); - SelectRowsResponse selectResp = null; + SelectRowsResponse selectResp; String[] queries = {"Announcement", "AnnouncementSubscription", "EmailOption", "ForumSubscription"}; int[] counts = {2, 0, 5, 1}; diff --git a/src/org/labkey/test/tests/ModuleAssayTest.java b/src/org/labkey/test/tests/ModuleAssayTest.java index 5ac4b3fc0e..4c87730274 100644 --- a/src/org/labkey/test/tests/ModuleAssayTest.java +++ b/src/org/labkey/test/tests/ModuleAssayTest.java @@ -122,7 +122,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupStuff() throws Exception { - ModuleAssayTest init = (ModuleAssayTest)getCurrentTest(); + ModuleAssayTest init = getCurrentTest(); assertNotNull(init._useTransform); init.doSetup(); } @@ -462,7 +462,7 @@ protected void uploadBatch(String batchName, String... uploadedFiles) { sleep(1500); String runCountStr = getText(Locator.id("batch_runCount_div")); - if (runCountStr != null && !runCountStr.equals("") && Integer.parseInt(runCountStr) == i+1) + if (runCountStr != null && !runCountStr.isEmpty() && Integer.parseInt(runCountStr) == i+1) break; } while (--count > 0); assertElementContains(Locator.id("batch_runCount_div"), String.valueOf(i+1)); diff --git a/src/org/labkey/test/tests/ModuleAssayTransformTest.java b/src/org/labkey/test/tests/ModuleAssayTransformTest.java index 13815820d5..fb55400915 100644 --- a/src/org/labkey/test/tests/ModuleAssayTransformTest.java +++ b/src/org/labkey/test/tests/ModuleAssayTransformTest.java @@ -15,7 +15,6 @@ */ package org.labkey.test.tests; -import org.junit.BeforeClass; import org.junit.experimental.categories.Category; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.categories.Assays; diff --git a/src/org/labkey/test/tests/MultiplePKUploadAssayTest.java b/src/org/labkey/test/tests/MultiplePKUploadAssayTest.java index 04345531b1..8b73e0304f 100644 --- a/src/org/labkey/test/tests/MultiplePKUploadAssayTest.java +++ b/src/org/labkey/test/tests/MultiplePKUploadAssayTest.java @@ -44,7 +44,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - MultiplePKUploadAssayTest init = (MultiplePKUploadAssayTest) getCurrentTest(); + MultiplePKUploadAssayTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/NonStandardDateAndTimeFormatTest.java b/src/org/labkey/test/tests/NonStandardDateAndTimeFormatTest.java index 0a45922574..7dbbceffa8 100644 --- a/src/org/labkey/test/tests/NonStandardDateAndTimeFormatTest.java +++ b/src/org/labkey/test/tests/NonStandardDateAndTimeFormatTest.java @@ -85,7 +85,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() throws IOException, CommandException { - NonStandardDateAndTimeFormatTest init = (NonStandardDateAndTimeFormatTest)getCurrentTest(); + NonStandardDateAndTimeFormatTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/PermissionsTestForJavascriptExecution.java b/src/org/labkey/test/tests/PermissionsTestForJavascriptExecution.java index bb76e19847..09a51d7aee 100644 --- a/src/org/labkey/test/tests/PermissionsTestForJavascriptExecution.java +++ b/src/org/labkey/test/tests/PermissionsTestForJavascriptExecution.java @@ -56,7 +56,7 @@ public class PermissionsTestForJavascriptExecution extends BaseWebDriverTest @BeforeClass public static void setupProject() { - PermissionsTestForJavascriptExecution init = (PermissionsTestForJavascriptExecution) getCurrentTest(); + PermissionsTestForJavascriptExecution init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/PortalTest.java b/src/org/labkey/test/tests/PortalTest.java index 54214befcc..4ebac2f21a 100644 --- a/src/org/labkey/test/tests/PortalTest.java +++ b/src/org/labkey/test/tests/PortalTest.java @@ -33,7 +33,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import static org.junit.Assert.assertTrue; @@ -57,7 +56,7 @@ protected String getProjectName() @BeforeClass public static void doSetup() throws Exception { - PortalTest initTest = (PortalTest)getCurrentTest(); + PortalTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), null); } @@ -107,7 +106,7 @@ public void doWebpartTest() @LogMethod public void assertWebparts(List requiredWebparts, List preferredWebparts) { - log(requiredWebparts.size() > 0 ? "Assert that required webparts can't be removed" : "No required webparts"); + log(!requiredWebparts.isEmpty() ? "Assert that required webparts can't be removed" : "No required webparts"); SiteNavBar navBar = new SiteNavBar(getDriver()); navBar.enterPageAdminMode(); for (String webpartTitle : requiredWebparts) @@ -122,7 +121,7 @@ public void assertWebparts(List requiredWebparts, List preferred titleMenu.collapse(); } - log(preferredWebparts.size() > 0 ? "Assert that preferred webparts can be removed" : "No preferred webparts"); + log(!preferredWebparts.isEmpty() ? "Assert that preferred webparts can be removed" : "No preferred webparts"); for (String webpartTitle : preferredWebparts) { log("Check preferred webpart: " + webpartTitle); diff --git a/src/org/labkey/test/tests/ProjectCreatorUserTest.java b/src/org/labkey/test/tests/ProjectCreatorUserTest.java index 754cffc0e7..0e1700afe7 100644 --- a/src/org/labkey/test/tests/ProjectCreatorUserTest.java +++ b/src/org/labkey/test/tests/ProjectCreatorUserTest.java @@ -46,7 +46,7 @@ public class ProjectCreatorUserTest extends BaseWebDriverTest @BeforeClass public static void setup() { - ProjectCreatorUserTest initTest = (ProjectCreatorUserTest) getCurrentTest(); + ProjectCreatorUserTest initTest = getCurrentTest(); initTest.doSetup(); } diff --git a/src/org/labkey/test/tests/ProjectSettingsTest.java b/src/org/labkey/test/tests/ProjectSettingsTest.java index 1de201af03..a2e78c2abc 100644 --- a/src/org/labkey/test/tests/ProjectSettingsTest.java +++ b/src/org/labkey/test/tests/ProjectSettingsTest.java @@ -164,7 +164,7 @@ private void resetProjectSettings() throws IOException, CommandException @BeforeClass public static void setupProject() throws IOException, CommandException { - ProjectSettingsTest init = (ProjectSettingsTest)getCurrentTest(); + ProjectSettingsTest init = getCurrentTest(); init.setUpTest(); } diff --git a/src/org/labkey/test/tests/ProjectTermsOfUseTest.java b/src/org/labkey/test/tests/ProjectTermsOfUseTest.java index 64d6d133dd..aa0c8bb550 100644 --- a/src/org/labkey/test/tests/ProjectTermsOfUseTest.java +++ b/src/org/labkey/test/tests/ProjectTermsOfUseTest.java @@ -23,7 +23,6 @@ import org.labkey.test.WebTestHelper; import org.labkey.test.categories.Daily; import org.labkey.test.util.Maps; -import org.labkey.test.util.PasswordUtil; import static org.junit.Assert.assertEquals; diff --git a/src/org/labkey/test/tests/QueryExportTest.java b/src/org/labkey/test/tests/QueryExportTest.java index 0f6f3702a5..5510babb6e 100644 --- a/src/org/labkey/test/tests/QueryExportTest.java +++ b/src/org/labkey/test/tests/QueryExportTest.java @@ -123,7 +123,7 @@ protected String getDataRegionId() @BeforeClass public static void doSetup() throws Exception { - QueryExportTest initTest = (QueryExportTest)getCurrentTest(); + QueryExportTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), null); initTest._listHelper.importListArchive(initTest.getProjectName(), LIST_ARCHIVE); diff --git a/src/org/labkey/test/tests/RConfigTest.java b/src/org/labkey/test/tests/RConfigTest.java index 4e7a1dc40c..264eda88bc 100644 --- a/src/org/labkey/test/tests/RConfigTest.java +++ b/src/org/labkey/test/tests/RConfigTest.java @@ -45,9 +45,9 @@ public class RConfigTest extends BaseWebDriverTest private static final String SECONDARY_ENGINE_NAME = "R Scripting Engine 2"; private static final String DISABLED_ENGINE_NAME = "Disabled Engine"; - private String FOLDER_NAME = "subfolder"; + private final String FOLDER_NAME = "subfolder"; - private RReportHelper _RReportHelper = new RReportHelper(this); + private final RReportHelper _RReportHelper = new RReportHelper(this); @Override protected void doCleanup(boolean afterTest) throws TestTimeoutException @@ -64,7 +64,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setup() throws Exception { - RConfigTest init = (RConfigTest) getCurrentTest(); + RConfigTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/RenameFolderJavaClientApiTest.java b/src/org/labkey/test/tests/RenameFolderJavaClientApiTest.java index 8600a9b30c..262cbf7ac7 100644 --- a/src/org/labkey/test/tests/RenameFolderJavaClientApiTest.java +++ b/src/org/labkey/test/tests/RenameFolderJavaClientApiTest.java @@ -28,7 +28,7 @@ public class RenameFolderJavaClientApiTest extends BaseWebDriverTest @BeforeClass public static void doSetup() { - RenameFolderJavaClientApiTest initTest = (RenameFolderJavaClientApiTest) getCurrentTest(); + RenameFolderJavaClientApiTest initTest = getCurrentTest(); initTest.setupProject(); } diff --git a/src/org/labkey/test/tests/ReportSharingTest.java b/src/org/labkey/test/tests/ReportSharingTest.java index 00ce002c7c..b1311e5449 100644 --- a/src/org/labkey/test/tests/ReportSharingTest.java +++ b/src/org/labkey/test/tests/ReportSharingTest.java @@ -52,7 +52,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - ReportSharingTest init = (ReportSharingTest) getCurrentTest(); + ReportSharingTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/RlabkeyTest.java b/src/org/labkey/test/tests/RlabkeyTest.java index 6aa9ba4e27..a42b518eeb 100644 --- a/src/org/labkey/test/tests/RlabkeyTest.java +++ b/src/org/labkey/test/tests/RlabkeyTest.java @@ -84,7 +84,7 @@ public class RlabkeyTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - RlabkeyTest init = (RlabkeyTest)getCurrentTest(); + RlabkeyTest init = getCurrentTest(); init.doInit(); } @@ -306,7 +306,7 @@ private void doRLabkeyTest(File testData, Map scriptReplacements if (!success) { TestLogger.error("Expected results for test case: " + test.getName() + ":\n" + expectedOutput); - TestLogger.error("Script for failed test case: " + test.getName() + ":\n" + sb.toString()); + TestLogger.error("Script for failed test case: " + test.getName() + ":\n" + sb); checker().withScreenshot(testData.getName()).error(test.getName()); } else if ("DEBUG".equalsIgnoreCase(test.getType())) diff --git a/src/org/labkey/test/tests/SampleTypeExportTest.java b/src/org/labkey/test/tests/SampleTypeExportTest.java index a1a95adbc9..034ba2f2e3 100644 --- a/src/org/labkey/test/tests/SampleTypeExportTest.java +++ b/src/org/labkey/test/tests/SampleTypeExportTest.java @@ -45,7 +45,7 @@ public class SampleTypeExportTest extends AbstractExportTest @BeforeClass public static void doSetup() throws Exception { - SampleTypeExportTest initTest = (SampleTypeExportTest) getCurrentTest(); + SampleTypeExportTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), null); diff --git a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java index 23d485790f..3739f2eee2 100644 --- a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java +++ b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java @@ -99,7 +99,7 @@ public BrowserType bestBrowser() @BeforeClass public static void setupProject() { - SampleTypeFolderExportImportTest init = (SampleTypeFolderExportImportTest) getCurrentTest(); + SampleTypeFolderExportImportTest init = getCurrentTest(); init.doSetup(); } @@ -150,13 +150,12 @@ protected boolean areDataListEqual(List> list01, List 0) + if(!errorLog.isEmpty()) Assert.fail(errorLog.toString()); log("All done."); diff --git a/src/org/labkey/test/tests/SampleTypeLimitsTest.java b/src/org/labkey/test/tests/SampleTypeLimitsTest.java index 7d9216ff74..3911dd5f7d 100644 --- a/src/org/labkey/test/tests/SampleTypeLimitsTest.java +++ b/src/org/labkey/test/tests/SampleTypeLimitsTest.java @@ -62,7 +62,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - SampleTypeLimitsTest init = (SampleTypeLimitsTest) getCurrentTest(); + SampleTypeLimitsTest init = getCurrentTest(); init.doSetup(); } @@ -272,7 +272,7 @@ public void testInsertLargeLineageGraph() throws IOException, CommandException LineageResponse linResponse = linCmd.execute(createDefaultConnection(), getCurrentContainerPath()); LineageNode node = linResponse.getSeed(); int generationDepth = 0; - while(node.getChildren().size()>0) // walk the node depth until the end + while(!node.getChildren().isEmpty()) // walk the node depth until the end { node = node.getChildren().get(0).getNode(); generationDepth++; diff --git a/src/org/labkey/test/tests/SampleTypeLineageTest.java b/src/org/labkey/test/tests/SampleTypeLineageTest.java index 24bde174dc..de8f2c97db 100644 --- a/src/org/labkey/test/tests/SampleTypeLineageTest.java +++ b/src/org/labkey/test/tests/SampleTypeLineageTest.java @@ -64,7 +64,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - SampleTypeLineageTest init = (SampleTypeLineageTest) getCurrentTest(); + SampleTypeLineageTest init = getCurrentTest(); // Comment out this line (after you run once) it will make iterating on tests much easier. init.doSetup(); @@ -852,7 +852,7 @@ public void testDeleteLineageParent() throws IOException, CommandException sampleGenerator.addCustomRow(Map.of("name", "J", "MaterialInputs/Family", "A", "DataInputs/Sources", "S-1")); sampleGenerator.addCustomRow(Map.of("name", "K", "MaterialInputs/Family", "D", "DataInputs/Sources", "S-1")); sampleGenerator.addCustomRow(Map.of("name", "L", "MaterialInputs/Family", "A,B", "DataInputs/Sources", "S-1,S-2")); - List> savedSampleRows = sampleGenerator.insertRows(createDefaultConnection(), sampleGenerator.getRows()).getRows();; + List> savedSampleRows = sampleGenerator.insertRows(createDefaultConnection(), sampleGenerator.getRows()).getRows(); // add data objects with samples as parents dataGenerator = dataClass.getTestDataGenerator(getProjectName()); diff --git a/src/org/labkey/test/tests/SampleTypeLinkToStudyTest.java b/src/org/labkey/test/tests/SampleTypeLinkToStudyTest.java index eb3d5d7a2d..c00d96e4c5 100644 --- a/src/org/labkey/test/tests/SampleTypeLinkToStudyTest.java +++ b/src/org/labkey/test/tests/SampleTypeLinkToStudyTest.java @@ -60,7 +60,7 @@ public class SampleTypeLinkToStudyTest extends BaseWebDriverTest @BeforeClass public static void setupProject() throws IOException, CommandException { - SampleTypeLinkToStudyTest init = (SampleTypeLinkToStudyTest) getCurrentTest(); + SampleTypeLinkToStudyTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/SampleTypeLinkedStudyExportTest.java b/src/org/labkey/test/tests/SampleTypeLinkedStudyExportTest.java index 304a90bfca..e9f2a74ff3 100644 --- a/src/org/labkey/test/tests/SampleTypeLinkedStudyExportTest.java +++ b/src/org/labkey/test/tests/SampleTypeLinkedStudyExportTest.java @@ -44,7 +44,7 @@ public class SampleTypeLinkedStudyExportTest extends BaseWebDriverTest @BeforeClass public static void setupProject() throws IOException, CommandException { - SampleTypeLinkedStudyExportTest init = (SampleTypeLinkedStudyExportTest) getCurrentTest(); + SampleTypeLinkedStudyExportTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java index ef82650e95..96b69d6547 100644 --- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java +++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java @@ -101,7 +101,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() throws IOException, CommandException { - SampleTypeNameExpressionTest test = (SampleTypeNameExpressionTest)getCurrentTest(); + SampleTypeNameExpressionTest test = getCurrentTest(); test.doSetup(); } diff --git a/src/org/labkey/test/tests/SampleTypeParentColumnTest.java b/src/org/labkey/test/tests/SampleTypeParentColumnTest.java index 004b52037d..01f87ea14f 100644 --- a/src/org/labkey/test/tests/SampleTypeParentColumnTest.java +++ b/src/org/labkey/test/tests/SampleTypeParentColumnTest.java @@ -90,7 +90,7 @@ public BrowserType bestBrowser() @BeforeClass public static void setupProject() { - SampleTypeParentColumnTest init = (SampleTypeParentColumnTest) getCurrentTest(); + SampleTypeParentColumnTest init = getCurrentTest(); // Comment out this line (after you run once) it will make iterating on tests much easier. init.doSetup(); @@ -236,7 +236,7 @@ private void regexCheckRowInDataRegion(String dataRegionName, int rowIndex, Stri List dataInTable = dataRegionTable.getColumnDataAsText(columnName); - Assert.assertTrue("There were no rows in the data region '" + dataRegionName + "'.", dataInTable.size() > 0); + Assert.assertTrue("There were no rows in the data region '" + dataRegionName + "'.", !dataInTable.isEmpty()); Assert.assertTrue("The index given for the row (" + rowIndex + ") is beyond the number of rows in the data region '" + dataRegionName + "' (" + dataInTable.size() + ").", rowIndex < dataInTable.size()); String cellValue = dataInTable.get(rowIndex); diff --git a/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java b/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java index 1d165115fe..008540b420 100644 --- a/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java +++ b/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java @@ -83,7 +83,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - SampleTypeRemoteAPITest init = (SampleTypeRemoteAPITest) getCurrentTest(); + SampleTypeRemoteAPITest init = getCurrentTest(); init.doSetup(); } @@ -113,8 +113,6 @@ public void preTest() throws Exception /** * regression coverage for Issue 37514 - sample type lookup to exp.Files crashes when viewing the sample type - * @throws IOException - * @throws CommandException */ @Test public void samplesWithLookupsToExpFilesTest() throws IOException, CommandException @@ -146,8 +144,6 @@ public void samplesWithLookupsToExpFilesTest() throws IOException, CommandExcept /** * generates a small sample type, pastes data into it via the UI, including "Q" and "N" missing value indicators - * @throws IOException - * @throws CommandException */ @Test public void importMissingValueSampleType() throws IOException, CommandException @@ -339,8 +335,6 @@ public void importMVDataWithEmptyValues() throws IOException, CommandException /** * regression for https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=38436 - * @throws CommandException - * @throws IOException */ @Test @Ignore("ignoring result until issue 38436 can be resolved.") @@ -688,7 +682,7 @@ public void deriveSamplesOverSaveBatchAPI() throws Exception SaveAssayBatchCommand saveAssayBatchCommand = new SaveAssayBatchCommand(SaveAssayBatchCommand.SAMPLE_DERIVATION_PROTOCOL, batch); //saveAssayBatchCommand.setAssayId(Integer.parseInt(assayIdStringValue)); SaveAssayBatchResponse saveAssayBatchResponse; - saveAssayBatchResponse = saveAssayBatchCommand.execute(createDefaultConnection(), getProjectName() + "/" + samplesFolder); + saveAssayBatchCommand.execute(createDefaultConnection(), getProjectName() + "/" + samplesFolder); refresh(); // add a bodyWebPart here to make viewing the sampleset easier while debugging @@ -726,7 +720,6 @@ private void generateAssay(String subfolderName, String assayName) /** * generates data (runs) for the gpat assay used by tests in this class. * @param assayLookup : specifies the container, schema, name of the assay's run table - * @return */ private List generateAssayData(FieldDefinition.LookupInfo assayLookup) { diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java index d11fcdc98f..f5f8d40a16 100644 --- a/src/org/labkey/test/tests/SampleTypeRenameTest.java +++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java @@ -61,7 +61,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() throws IOException, CommandException { - SampleTypeRenameTest init = (SampleTypeRenameTest) getCurrentTest(); + SampleTypeRenameTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/SampleTypeTest.java b/src/org/labkey/test/tests/SampleTypeTest.java index f96827d043..21b1637def 100644 --- a/src/org/labkey/test/tests/SampleTypeTest.java +++ b/src/org/labkey/test/tests/SampleTypeTest.java @@ -107,7 +107,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - SampleTypeTest init = (SampleTypeTest) getCurrentTest(); + SampleTypeTest init = getCurrentTest(); // Comment out this line (after you run once) it will make iterating on tests much easier. init.doSetup(); @@ -327,7 +327,7 @@ public void testMeFilterOnSampleType() mouseOver(meCell); WebElement helpDivBody = shortWait().until(ExpectedConditions.visibilityOfElementLocated(Locator.id("helpDivBody"))); assertEquals("expect custom format popup for me filter", - helpDivBody.getText(), "Formatting applied because column = ~me~."); + "Formatting applied because column = ~me~.", helpDivBody.getText()); assertNotEquals("expect cell for other user not to get custom format", "rgb(244, 78, 59)", notMeCell.getCssValue("background-color")); } @@ -1729,7 +1729,7 @@ private void exportGridWithAttachment(int numOfRows, Set expectedHeaders row = 1; for (String filePath : expectedFilePaths) { - if (filePath.length() == 0) + if (filePath.isEmpty()) { assertEquals("Value of attachment column for row " + row + " not exported as expected.", "", exportedColumn.get(row).trim()); } diff --git a/src/org/labkey/test/tests/ScriptValidationTest.java b/src/org/labkey/test/tests/ScriptValidationTest.java index 3884f87d22..105bc59a67 100644 --- a/src/org/labkey/test/tests/ScriptValidationTest.java +++ b/src/org/labkey/test/tests/ScriptValidationTest.java @@ -93,7 +93,7 @@ public static ColorRecord fromMap(Map map) @BeforeClass public static void initTest() throws Exception { - ScriptValidationTest init = (ScriptValidationTest) getCurrentTest(); + ScriptValidationTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/SecurityApiTest.java b/src/org/labkey/test/tests/SecurityApiTest.java index c3459ddeba..fbcd8941de 100644 --- a/src/org/labkey/test/tests/SecurityApiTest.java +++ b/src/org/labkey/test/tests/SecurityApiTest.java @@ -62,7 +62,7 @@ protected BrowserType bestBrowser() @BeforeClass public static void initTest() throws Exception { - SecurityApiTest init = (SecurityApiTest)getCurrentTest(); + SecurityApiTest init = getCurrentTest(); init.createUsers(); } diff --git a/src/org/labkey/test/tests/SimpleModuleTest.java b/src/org/labkey/test/tests/SimpleModuleTest.java index 0ccb01bac0..8864bc29bd 100644 --- a/src/org/labkey/test/tests/SimpleModuleTest.java +++ b/src/org/labkey/test/tests/SimpleModuleTest.java @@ -202,7 +202,7 @@ protected String getProjectName() @LogMethod public static void initTest() { - SimpleModuleTest init = (SimpleModuleTest) getCurrentTest(); + SimpleModuleTest init = getCurrentTest(); init.doSetup(); } @@ -1793,7 +1793,7 @@ private Map getColorColumnFilterGroup() Map result = (Map)executeAsyncScript(vehicleMetadataJsQuery); Map colorColumnFields = ((List)(((Map)result.get("metaData")).get("fields"))).get(0); - assertEquals("Column fields for column 'Color' in vehicle.Vehicles query not found!", colorColumnFields.get("name"), "Color"); + assertEquals("Column fields for column 'Color' in vehicle.Vehicles query not found!", "Color", colorColumnFields.get("name")); return (Map)((List)((Map)colorColumnFields.get("lookup")).get("filterGroups")).get(0); } diff --git a/src/org/labkey/test/tests/SpecimenCustomizeTest.java b/src/org/labkey/test/tests/SpecimenCustomizeTest.java index 8193706c35..d01a2a2710 100644 --- a/src/org/labkey/test/tests/SpecimenCustomizeTest.java +++ b/src/org/labkey/test/tests/SpecimenCustomizeTest.java @@ -261,7 +261,7 @@ public String getType() public Boolean isEditable() { - return _tr.findElements(By.xpath(".//div[contains(@id,'name')]/input")).size() > 0; + return !_tr.findElements(By.xpath(".//div[contains(@id,'name')]/input")).isEmpty(); } public void editName(String value) diff --git a/src/org/labkey/test/tests/SpecimenGridExportTest.java b/src/org/labkey/test/tests/SpecimenGridExportTest.java index f059b4326d..0ee1cf7037 100644 --- a/src/org/labkey/test/tests/SpecimenGridExportTest.java +++ b/src/org/labkey/test/tests/SpecimenGridExportTest.java @@ -47,7 +47,7 @@ public class SpecimenGridExportTest extends AbstractExportTest @BeforeClass public static void doSetup() throws Exception { - SpecimenGridExportTest initTest = (SpecimenGridExportTest) getCurrentTest(); + SpecimenGridExportTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), "Study"); initTest._containerHelper.enableModule("Specimen"); diff --git a/src/org/labkey/test/tests/SpecimenImportTest.java b/src/org/labkey/test/tests/SpecimenImportTest.java index dc4e665780..28f5d15837 100644 --- a/src/org/labkey/test/tests/SpecimenImportTest.java +++ b/src/org/labkey/test/tests/SpecimenImportTest.java @@ -158,7 +158,7 @@ protected void assertSampleTypeData() List> sampleTypeData = getSampleDataFromDB(folderPath, "Study Specimens", fields); - Assert.assertNotEquals("There are no rows in the \"Study Specimens\" sample type.", sampleTypeData.size(), 0); + Assert.assertNotEquals("There are no rows in the \"Study Specimens\" sample type.", 0, sampleTypeData.size()); List expectedNames = Arrays.asList("1", "2", "3", "4"); diff --git a/src/org/labkey/test/tests/SpecimenTest.java b/src/org/labkey/test/tests/SpecimenTest.java index b7b186e7aa..0277fc6e05 100644 --- a/src/org/labkey/test/tests/SpecimenTest.java +++ b/src/org/labkey/test/tests/SpecimenTest.java @@ -891,8 +891,8 @@ private enum StudyLocationType SAL("Site Affiliated Lab", 8), ENDPOINT("Endpoint Lab", 8); - private String _type; - private int _count; + private final String _type; + private final int _count; StudyLocationType(String type, int count) { diff --git a/src/org/labkey/test/tests/StudySurveyTest.java b/src/org/labkey/test/tests/StudySurveyTest.java index 8c03906b4a..1b441771ed 100644 --- a/src/org/labkey/test/tests/StudySurveyTest.java +++ b/src/org/labkey/test/tests/StudySurveyTest.java @@ -21,13 +21,13 @@ public class StudySurveyTest extends BaseWebDriverTest { PortalHelper portalHelper = new PortalHelper(this); - private String datasetName = "SampleDataset"; - private String surveyDesignName = "Dataset Survey Design"; + private final String datasetName = "SampleDataset"; + private final String surveyDesignName = "Dataset Survey Design"; @BeforeClass public static void doSetup() { - StudySurveyTest initTest = (StudySurveyTest) getCurrentTest(); + StudySurveyTest initTest = getCurrentTest(); initTest.setupProject(); } diff --git a/src/org/labkey/test/tests/SubfolderWebPartTest.java b/src/org/labkey/test/tests/SubfolderWebPartTest.java index 55565367b4..86497050d9 100644 --- a/src/org/labkey/test/tests/SubfolderWebPartTest.java +++ b/src/org/labkey/test/tests/SubfolderWebPartTest.java @@ -65,7 +65,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - SubfolderWebPartTest init = (SubfolderWebPartTest) getCurrentTest(); + SubfolderWebPartTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/SurveyTest.java b/src/org/labkey/test/tests/SurveyTest.java index e85f4ae2bd..76aa30c84e 100644 --- a/src/org/labkey/test/tests/SurveyTest.java +++ b/src/org/labkey/test/tests/SurveyTest.java @@ -84,7 +84,7 @@ protected BrowserType bestBrowser() @LogMethod public static void doSetup() { - SurveyTest initTest = (SurveyTest)getCurrentTest(); + SurveyTest initTest = getCurrentTest(); initTest.setupProject(); } diff --git a/src/org/labkey/test/tests/SystemMaintenanceTest.java b/src/org/labkey/test/tests/SystemMaintenanceTest.java index 769f8fd552..c27e41a77c 100644 --- a/src/org/labkey/test/tests/SystemMaintenanceTest.java +++ b/src/org/labkey/test/tests/SystemMaintenanceTest.java @@ -18,7 +18,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.labkey.test.BaseWebDriverTest; -import org.labkey.test.Locator; import org.labkey.test.TestTimeoutException; import org.labkey.test.categories.InDevelopment; diff --git a/src/org/labkey/test/tests/TabTest.java b/src/org/labkey/test/tests/TabTest.java index 32114bc0af..9b73d78500 100644 --- a/src/org/labkey/test/tests/TabTest.java +++ b/src/org/labkey/test/tests/TabTest.java @@ -16,7 +16,6 @@ package org.labkey.test.tests; import org.junit.Ignore; -import org.junit.Test; import org.junit.experimental.categories.Category; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; @@ -116,7 +115,7 @@ private void doTabManagementTests() String tab2Delete = "RENAMED TAB 1"; portalHelper.activateTab(tab2Delete); portalHelper.deleteTab("Test Tab 2"); - WebDriverWrapper.waitFor(()-> portalHelper.getBodyWebParts().size() > 0, + WebDriverWrapper.waitFor(()-> !portalHelper.getBodyWebParts().isEmpty(), "Webparts failed to load after tab delete while on page", 2000); WebDriverWrapper.waitFor(()-> { try @@ -131,7 +130,7 @@ private void doTabManagementTests() //Delete tab while on the Tab portalHelper.deleteTab(tab2Delete); - WebDriverWrapper.waitFor(()-> portalHelper.getBodyWebParts().size() > 0, + WebDriverWrapper.waitFor(()-> !portalHelper.getBodyWebParts().isEmpty(), "Webparts failed to load after tab delete while on page", 2000); } diff --git a/src/org/labkey/test/tests/TextChoiceAssayTest.java b/src/org/labkey/test/tests/TextChoiceAssayTest.java index ddb8d352d2..6b9c3db4d1 100644 --- a/src/org/labkey/test/tests/TextChoiceAssayTest.java +++ b/src/org/labkey/test/tests/TextChoiceAssayTest.java @@ -33,14 +33,14 @@ protected String getProjectName() @BeforeClass public static void setupProject() throws IOException, CommandException { - TextChoiceAssayTest init = (TextChoiceAssayTest) getCurrentTest(); + TextChoiceAssayTest init = getCurrentTest(); init.doSetup(); } - private static List unusedRunFieldValues = new ArrayList<>(RUN_FIELD_VALUES); + private static final List unusedRunFieldValues = new ArrayList<>(RUN_FIELD_VALUES); private static String currentRunValue; - private static List unusedResultFiledValues = new ArrayList<>(RESULT_FIELD_VALUES); + private static final List unusedResultFiledValues = new ArrayList<>(RESULT_FIELD_VALUES); private static Map currentResultRowData = new HashMap<>(); diff --git a/src/org/labkey/test/tests/TextChoiceImportExportAndOtherDomainsTest.java b/src/org/labkey/test/tests/TextChoiceImportExportAndOtherDomainsTest.java index fe84c116e6..d6dd21f198 100644 --- a/src/org/labkey/test/tests/TextChoiceImportExportAndOtherDomainsTest.java +++ b/src/org/labkey/test/tests/TextChoiceImportExportAndOtherDomainsTest.java @@ -40,7 +40,7 @@ public class TextChoiceImportExportAndOtherDomainsTest extends TextChoiceTest private static final String LIST_TC_FIELD = "LTC_Field"; private static final String LIST_TEXT_FIELD = "Str"; private static final List LIST_VALUES = Arrays.asList("L1", "L2|withPipes|", "L3", "L4"); - private static List> listData = new ArrayList<>(); + private static final List> listData = new ArrayList<>(); // Issue names, etc... private static final String ISSUE_DESIGN_NAME = "Simple_TC_Issue"; @@ -65,7 +65,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - TextChoiceImportExportAndOtherDomainsTest init = (TextChoiceImportExportAndOtherDomainsTest) getCurrentTest(); + TextChoiceImportExportAndOtherDomainsTest init = getCurrentTest(); init.doSetup(); } @@ -168,7 +168,7 @@ private void verifyTextChoiceInIssueDesign() log("Validate that a new issue can be inserted that uses the TextChoice field."); IssuesHelper issuesHelper = new IssuesHelper(getDriver()); - String tcFieldName = getSelectControlName(ISSUE_TC_FIELD);; + String tcFieldName = getSelectControlName(ISSUE_TC_FIELD); Map issueDetails = Map.of("title", ISSUE_TITLE, "assignedTo", getDisplayName(), tcFieldName, ISSUE_VALUE); diff --git a/src/org/labkey/test/tests/TextChoiceSampleTypeTest.java b/src/org/labkey/test/tests/TextChoiceSampleTypeTest.java index ca6fd7aafe..6cf91f37fe 100644 --- a/src/org/labkey/test/tests/TextChoiceSampleTypeTest.java +++ b/src/org/labkey/test/tests/TextChoiceSampleTypeTest.java @@ -1,6 +1,5 @@ package org.labkey.test.tests; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -62,7 +61,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - TextChoiceSampleTypeTest init = (TextChoiceSampleTypeTest) getCurrentTest(); + TextChoiceSampleTypeTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/TimeChartAPITest.java b/src/org/labkey/test/tests/TimeChartAPITest.java index 1ae883c580..74b786f209 100644 --- a/src/org/labkey/test/tests/TimeChartAPITest.java +++ b/src/org/labkey/test/tests/TimeChartAPITest.java @@ -71,7 +71,8 @@ public class TimeChartAPITest extends TimeChartTest 33 }; - private static final List>> GETDATA_API_TEST_MEASURES = new ArrayList>>(){{ + private static final List>> GETDATA_API_TEST_MEASURES = new ArrayList<>() + {{ add(Pair.of("study_Lab Results_CD4", Arrays.asList(543.0, 520.0, 420.0, 185.0, 261.0, 308.0, 177.0, 144.0, 167.0, 154.0))); add(Pair.of("study_Lab Results_Hemoglobin", Arrays.asList(14.5, 16.0, 12.2, 15.5, 13.9, 13.7, 12.9, 11.1, 13.2, 16.1))); add(Pair.of("study_Physical Exam_Weight_kg", Arrays.asList(86.0, 84.0, 83.0, 80.0, 79.0, 79.0, 79.0, 78.0, 77.0, 75.0))); @@ -115,7 +116,8 @@ protected void doCreateSteps() {"study_Lab Results_date", "study_Lab Results_CD4", "study_Lab Results_ParticipantVisit_VisitDate", "IL-10 (23)::study_LuminexAssay_ObsConc_MAX", "IL-2 (3)::study_LuminexAssay_ObsConc_MAX", "TNF-alpha (40)::study_LuminexAssay_ObsConc_MAX", "IL-10 (23)::study_LuminexAssay_FI_MAX", "IL-2 (3)::study_LuminexAssay_FI_MAX", "TNF-alpha (40)::study_LuminexAssay_FI_MAX", "Days"} }; - final List>> GETDATA_API_TEST_DAYS = new ArrayList>>() {{ + final List>> GETDATA_API_TEST_DAYS = new ArrayList<>() + {{ add(Pair.of("Days", Arrays.asList(44.0, 79.0, 108.0, 190.0, 246.0, 276.0, 303.0, 335.0, 364.0, 394.0))); add(Pair.of("Days", Arrays.asList(44.0, 79.0, 108.0, 190.0, 246.0, 276.0, 303.0, 335.0, 364.0, 394.0))); add(Pair.of("Days", Arrays.asList(44.0, 79.0, 108.0, 190.0, 246.0, 276.0, 303.0, 335.0, 364.0, 394.0))); @@ -147,7 +149,8 @@ protected void doCreateSteps() {"study_Lab Results_ParticipantVisit_sequencenum", "study_Lab Results_CD4", "study_Lab Results_ParticipantVisit_Visit_Label", "study_Lab Results_ParticipantVisit_Visit_DisplayOrder", "study_Lab Results_ParticipantVisit_VisitDate", "IL-10 (23)::study_LuminexAssay_ObsConc_MAX", "IL-2 (3)::study_LuminexAssay_ObsConc_MAX", "TNF-alpha (40)::study_LuminexAssay_ObsConc_MAX", "IL-10 (23)::study_LuminexAssay_FI_MAX", "IL-2 (3)::study_LuminexAssay_FI_MAX", "TNF-alpha (40)::study_LuminexAssay_FI_MAX"} }; - final List>> GETDATA_API_TEST_VISITLABEL = new ArrayList>>() {{ + final List>> GETDATA_API_TEST_VISITLABEL = new ArrayList<>() + {{ add(Pair.of("VisitLabel", Arrays.asList("Month 2", "Month 3", "Month 4", "Month 7", "Month 9", "Month 10", "Month 10", "Month 11", "Month 12", "Month 13"))); add(Pair.of("VisitLabel", Arrays.asList("Month 2", "Month 3", "Month 4", "Month 7", "Month 9", "Month 10", "Month 10", "Month 11", "Month 12", "Month 13"))); add(Pair.of("study_Lab Results_ParticipantVisit_Visit_Label", Arrays.asList("Month 2", "Month 3", "Month 4", "Month 7", "Month 9", "Month 10", "Month 10", "Month 11", "Month 12", "Month 13"))); diff --git a/src/org/labkey/test/tests/TimeChartImportTest.java b/src/org/labkey/test/tests/TimeChartImportTest.java index 466c23e4a6..3c54179ac5 100644 --- a/src/org/labkey/test/tests/TimeChartImportTest.java +++ b/src/org/labkey/test/tests/TimeChartImportTest.java @@ -62,7 +62,7 @@ public class TimeChartImportTest extends StudyBaseTest @BeforeClass public static void doSetup() throws Exception { - TimeChartImportTest initTest = (TimeChartImportTest)getCurrentTest(); + TimeChartImportTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), null); initTest.importFolderFromZip(MULTI_FOLDER_ZIP); initTest._containerHelper.createSubfolder(initTest.getProjectName(), EXPORT_TEST_FOLDER, "Collaboration"); @@ -332,11 +332,11 @@ protected BrowserType bestBrowser() public static class TimeChartInfo { - private String _name; - private int _countSVGs; - private int _gridCount; - private boolean _hasPointClickFn; - private String[] _svg; + private final String _name; + private final int _countSVGs; + private final int _gridCount; + private final boolean _hasPointClickFn; + private final String[] _svg; public TimeChartInfo(String name, int countSVGs, int gridCount, boolean hasPointClickFn, String[] svg) { diff --git a/src/org/labkey/test/tests/TourTest.java b/src/org/labkey/test/tests/TourTest.java index e11bb9478d..11e414fb73 100644 --- a/src/org/labkey/test/tests/TourTest.java +++ b/src/org/labkey/test/tests/TourTest.java @@ -62,7 +62,7 @@ protected BrowserType bestBrowser() @LogMethod public static void setup() throws Exception { - TourTest initTest = (TourTest)getCurrentTest(); + TourTest initTest = getCurrentTest(); initTest._containerHelper.createProject(initTest.getProjectName(), "Collaboration"); initTest._containerHelper.createSubfolder(initTest.getProjectName(), SUBFOLDER1); initTest._containerHelper.createSubfolder(initTest.getProjectName(), SUBFOLDER2); diff --git a/src/org/labkey/test/tests/TriggerScriptTest.java b/src/org/labkey/test/tests/TriggerScriptTest.java index 5aa8e7b6e7..ab27676192 100644 --- a/src/org/labkey/test/tests/TriggerScriptTest.java +++ b/src/org/labkey/test/tests/TriggerScriptTest.java @@ -167,7 +167,7 @@ private interface GoToDataUI @BeforeClass public static void projectSetup() { - TriggerScriptTest init = (TriggerScriptTest) getCurrentTest(); + TriggerScriptTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/UserClonePermissionTest.java b/src/org/labkey/test/tests/UserClonePermissionTest.java index f191f47c4a..546b4c96a9 100644 --- a/src/org/labkey/test/tests/UserClonePermissionTest.java +++ b/src/org/labkey/test/tests/UserClonePermissionTest.java @@ -44,7 +44,7 @@ public List getAssociatedModules() @BeforeClass public static void setup() { - UserClonePermissionTest initTest = (UserClonePermissionTest) getCurrentTest(); + UserClonePermissionTest initTest = getCurrentTest(); initTest.doSetup(); } diff --git a/src/org/labkey/test/tests/UserDetailsPermissionTest.java b/src/org/labkey/test/tests/UserDetailsPermissionTest.java index 50f93e943c..dbcc072494 100644 --- a/src/org/labkey/test/tests/UserDetailsPermissionTest.java +++ b/src/org/labkey/test/tests/UserDetailsPermissionTest.java @@ -82,7 +82,7 @@ public List getAssociatedModules() @BeforeClass public static void setup() { - UserDetailsPermissionTest initTest = (UserDetailsPermissionTest) getCurrentTest(); + UserDetailsPermissionTest initTest = getCurrentTest(); initTest.doSetup(); } diff --git a/src/org/labkey/test/tests/UserPermissionsTest.java b/src/org/labkey/test/tests/UserPermissionsTest.java index ea7a068e4f..3218c427fa 100644 --- a/src/org/labkey/test/tests/UserPermissionsTest.java +++ b/src/org/labkey/test/tests/UserPermissionsTest.java @@ -23,20 +23,17 @@ import org.labkey.remoteapi.CommandException; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; -import org.labkey.test.TestFileUtils; import org.labkey.test.TestTimeoutException; import org.labkey.test.categories.Daily; import org.labkey.test.pages.core.admin.ShowAuditLogPage; import org.labkey.test.params.list.IntListDefinition; import org.labkey.test.util.ApiPermissionsHelper; -import org.labkey.test.util.DataRegion; import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.LogMethod; import org.labkey.test.util.PortalHelper; import org.labkey.test.util.TestDataGenerator; import org.openqa.selenium.WebElement; -import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/src/org/labkey/test/tests/UserTableCustomFieldUpdateTest.java b/src/org/labkey/test/tests/UserTableCustomFieldUpdateTest.java index 4d8ae9f308..83f3cdfbdb 100644 --- a/src/org/labkey/test/tests/UserTableCustomFieldUpdateTest.java +++ b/src/org/labkey/test/tests/UserTableCustomFieldUpdateTest.java @@ -45,7 +45,7 @@ public List getAssociatedModules() @BeforeClass public static void initProject() { - UserTableCustomFieldUpdateTest initTest = (UserTableCustomFieldUpdateTest) getCurrentTest(); + UserTableCustomFieldUpdateTest initTest = getCurrentTest(); initTest.doSetup(); } diff --git a/src/org/labkey/test/tests/UserTest.java b/src/org/labkey/test/tests/UserTest.java index 21d8fae9d7..8f5a0c0f5b 100644 --- a/src/org/labkey/test/tests/UserTest.java +++ b/src/org/labkey/test/tests/UserTest.java @@ -98,7 +98,7 @@ public List getAssociatedModules() @BeforeClass public static void setupProject() { - UserTest init = (UserTest)getCurrentTest(); + UserTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/WebDavTest.java b/src/org/labkey/test/tests/WebDavTest.java index 9eeadab5a8..daff8aaff2 100644 --- a/src/org/labkey/test/tests/WebDavTest.java +++ b/src/org/labkey/test/tests/WebDavTest.java @@ -73,7 +73,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - WebDavTest init = (WebDavTest)getCurrentTest(); + WebDavTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/WebpartPermissionsTest.java b/src/org/labkey/test/tests/WebpartPermissionsTest.java index 8ea65e8ed6..c67c404912 100644 --- a/src/org/labkey/test/tests/WebpartPermissionsTest.java +++ b/src/org/labkey/test/tests/WebpartPermissionsTest.java @@ -24,7 +24,6 @@ import org.labkey.test.categories.Daily; import org.labkey.test.util.PortalHelper; -import java.io.File; import java.util.Arrays; import java.util.List; diff --git a/src/org/labkey/test/tests/WorkbookTest.java b/src/org/labkey/test/tests/WorkbookTest.java index e8291507ba..d38dd4c555 100644 --- a/src/org/labkey/test/tests/WorkbookTest.java +++ b/src/org/labkey/test/tests/WorkbookTest.java @@ -180,7 +180,7 @@ public void testSteps() _containerHelper.createProject(PROJECT_NAME2, null); portalHelper.addWebPart("Workbooks"); int id = workbookHelper.createWorkbook(PROJECT_NAME2, FILE_WORKBOOK_NAME, FILE_WORKBOOK_DESCRIPTION, WorkbookFolderType.FILE_WORKBOOK); - assertEquals("workbook added to new project did not have id=1", id, 1); + assertEquals("workbook added to new project did not have id=1", 1, id); } private List createWorkbooks(String projectName, String fileWorkbookName, String fileWorkbookDescription, diff --git a/src/org/labkey/test/tests/announcements/AnnouncementAPITest.java b/src/org/labkey/test/tests/announcements/AnnouncementAPITest.java index 6854fad65f..b5ad49577f 100644 --- a/src/org/labkey/test/tests/announcements/AnnouncementAPITest.java +++ b/src/org/labkey/test/tests/announcements/AnnouncementAPITest.java @@ -33,7 +33,7 @@ public class AnnouncementAPITest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - AnnouncementAPITest init = (AnnouncementAPITest) getCurrentTest(); + AnnouncementAPITest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/announcements/AnnouncementsPermissionTest.java b/src/org/labkey/test/tests/announcements/AnnouncementsPermissionTest.java index a954e8fb23..fb39561449 100644 --- a/src/org/labkey/test/tests/announcements/AnnouncementsPermissionTest.java +++ b/src/org/labkey/test/tests/announcements/AnnouncementsPermissionTest.java @@ -37,13 +37,13 @@ public class AnnouncementsPermissionTest extends BaseWebDriverTest public static final String NOT_CONTRIBUTOR_ONLY_MESSAGE = "Not-Contributor-only message"; private static final String CONTRIBUTOR = "contributor@messages.test"; private static final String MSG5_TITLE = "test message 5"; - private String TEST_GROUP = "contributorTestGroup"; - private String PERMISSION = "Message Board Contributor"; + private final String TEST_GROUP = "contributorTestGroup"; + private final String PERMISSION = "Message Board Contributor"; @BeforeClass public static void setupProject() { - AnnouncementsPermissionTest init = (AnnouncementsPermissionTest) getCurrentTest(); + AnnouncementsPermissionTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/announcements/DiscussionLinkTest.java b/src/org/labkey/test/tests/announcements/DiscussionLinkTest.java index 7e9fa26382..2657cceb3a 100644 --- a/src/org/labkey/test/tests/announcements/DiscussionLinkTest.java +++ b/src/org/labkey/test/tests/announcements/DiscussionLinkTest.java @@ -42,7 +42,7 @@ public class DiscussionLinkTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - DiscussionLinkTest init = (DiscussionLinkTest) getCurrentTest(); + DiscussionLinkTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/announcements/MessagesAttachmentTest.java b/src/org/labkey/test/tests/announcements/MessagesAttachmentTest.java index 368f59e70e..e087684ff9 100644 --- a/src/org/labkey/test/tests/announcements/MessagesAttachmentTest.java +++ b/src/org/labkey/test/tests/announcements/MessagesAttachmentTest.java @@ -65,7 +65,7 @@ public static void setupProject() throws Exception { assertFalse("Do not run this test on Windows. It uses files with illegal characters", SystemUtils.IS_OS_WINDOWS); - MessagesAttachmentTest init = (MessagesAttachmentTest) getCurrentTest(); + MessagesAttachmentTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/api/CustomizeGridPermissionsTest.java b/src/org/labkey/test/tests/api/CustomizeGridPermissionsTest.java index ef71cdcfa8..706093dfcc 100644 --- a/src/org/labkey/test/tests/api/CustomizeGridPermissionsTest.java +++ b/src/org/labkey/test/tests/api/CustomizeGridPermissionsTest.java @@ -63,7 +63,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - CustomizeGridPermissionsTest init = (CustomizeGridPermissionsTest) getCurrentTest(); + CustomizeGridPermissionsTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/assay/AssayMissingValuesTest.java b/src/org/labkey/test/tests/assay/AssayMissingValuesTest.java index df8e77a7aa..bb14a71a7e 100644 --- a/src/org/labkey/test/tests/assay/AssayMissingValuesTest.java +++ b/src/org/labkey/test/tests/assay/AssayMissingValuesTest.java @@ -39,7 +39,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void beforeTestClass() { - AssayMissingValuesTest init = (AssayMissingValuesTest)getCurrentTest(); + AssayMissingValuesTest init = getCurrentTest(); init.setupProject(); } diff --git a/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java b/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java index 4f486a27f2..8400607307 100644 --- a/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java +++ b/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java @@ -61,14 +61,14 @@ public class AssayRenameExportImportTest extends BaseWebDriverTest .setTimeOfDay(10, 45, 0) .build().getTime(); - private SimpleDateFormat _defaultDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - private SimpleDateFormat _defaultTimeFormat = new SimpleDateFormat("HH:mm:ss"); - private SimpleDateFormat _defaultDateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + private final SimpleDateFormat _defaultDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + private final SimpleDateFormat _defaultTimeFormat = new SimpleDateFormat("HH:mm:ss"); + private final SimpleDateFormat _defaultDateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); @BeforeClass public static void doSetup() { - AssayRenameExportImportTest init = (AssayRenameExportImportTest) getCurrentTest(); + AssayRenameExportImportTest init = getCurrentTest(); init._containerHelper.createProject(ORIGINAL_PROJECT, "Assay"); init._containerHelper.createProject(SECOND_PROJECT, "Assay"); diff --git a/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java b/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java index b42a0ad0dc..c505a81c5a 100644 --- a/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java +++ b/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java @@ -32,7 +32,6 @@ import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.QCAssayScriptHelper; import org.labkey.test.util.RReportHelper; -import org.labkey.test.util.core.webdav.WebDavUtils; import java.io.File; import java.util.Arrays; @@ -85,7 +84,7 @@ public void preTest() @BeforeClass public static void initTest() { - AssayTransformWarningTest init = (AssayTransformWarningTest)getCurrentTest(); + AssayTransformWarningTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/component/GridPanelViewTest.java b/src/org/labkey/test/tests/component/GridPanelViewTest.java index bb466c9bec..d26e8b0c46 100644 --- a/src/org/labkey/test/tests/component/GridPanelViewTest.java +++ b/src/org/labkey/test/tests/component/GridPanelViewTest.java @@ -29,7 +29,6 @@ import org.labkey.test.util.SampleTypeHelper; import org.labkey.test.util.TestDataGenerator; import org.labkey.test.util.exp.SampleTypeAPIHelper; -import org.openqa.selenium.TimeoutException; import org.openqa.selenium.WebDriverException; import java.io.IOException; @@ -41,8 +40,6 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.fail; - @Category({Daily.class}) public class GridPanelViewTest extends GridPanelBaseTest { @@ -81,7 +78,7 @@ public class GridPanelViewTest extends GridPanelBaseTest private static final String UPDATED_ALERT = "UPDATED"; // Keep track of any custom views that may have been created. - private static List savedViewsForDefaultSampleType = new ArrayList<>(); + private static final List savedViewsForDefaultSampleType = new ArrayList<>(); // Using the core-components.view adds 'GridPanel - ' to the panel header. Need to take that into account . private static final String PANEL_VIEW_NAME_PREFIX = "GridPanel - %s"; @@ -107,7 +104,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void setupProject() throws IOException, CommandException { - GridPanelViewTest init = (GridPanelViewTest) getCurrentTest(); + GridPanelViewTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/core/admin/ShortUrlTest.java b/src/org/labkey/test/tests/core/admin/ShortUrlTest.java index 508986fafa..8952bed624 100644 --- a/src/org/labkey/test/tests/core/admin/ShortUrlTest.java +++ b/src/org/labkey/test/tests/core/admin/ShortUrlTest.java @@ -7,7 +7,6 @@ import org.junit.experimental.categories.Category; import org.labkey.remoteapi.Connection; import org.labkey.test.BaseWebDriverTest; -import org.labkey.test.BootstrapLocators; import org.labkey.test.WebTestHelper; import org.labkey.test.categories.Daily; import org.labkey.test.pages.admin.ShortUrlAdminPage; diff --git a/src/org/labkey/test/tests/core/login/PasswordTest.java b/src/org/labkey/test/tests/core/login/PasswordTest.java index f72d2e7149..82db3cf13a 100644 --- a/src/org/labkey/test/tests/core/login/PasswordTest.java +++ b/src/org/labkey/test/tests/core/login/PasswordTest.java @@ -33,7 +33,6 @@ import org.labkey.test.params.login.DatabaseAuthenticationProvider; import org.labkey.test.util.LogMethod; import org.labkey.test.util.LoggedParam; -import org.labkey.test.util.PasswordUtil; import org.labkey.test.util.core.login.DbLoginUtils; import org.labkey.test.util.core.login.DbLoginUtils.DbLoginProperties; import org.labkey.test.util.core.login.DbLoginUtils.PasswordExpiration; diff --git a/src/org/labkey/test/tests/core/security/AppAdminRoleTest.java b/src/org/labkey/test/tests/core/security/AppAdminRoleTest.java index 54c5d924d4..ebc879f9db 100644 --- a/src/org/labkey/test/tests/core/security/AppAdminRoleTest.java +++ b/src/org/labkey/test/tests/core/security/AppAdminRoleTest.java @@ -63,7 +63,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - AppAdminRoleTest init = (AppAdminRoleTest) getCurrentTest(); + AppAdminRoleTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java b/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java index c3ebebd47b..64b2420ac8 100644 --- a/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java +++ b/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java @@ -47,7 +47,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - GetReadableContainersAPITest init = (GetReadableContainersAPITest) getCurrentTest(); + GetReadableContainersAPITest init = getCurrentTest(); init.doSetup(); } @@ -202,7 +202,7 @@ private List> getReadableContainersErrors(Boolean includeSub } else { - throw new RuntimeException("Did not find errors in response: \n" + response.toString()); + throw new RuntimeException("Did not find errors in response: \n" + response); } } diff --git a/src/org/labkey/test/tests/core/security/TroubleshooterRoleTest.java b/src/org/labkey/test/tests/core/security/TroubleshooterRoleTest.java index d7c1bcd508..807c435bed 100644 --- a/src/org/labkey/test/tests/core/security/TroubleshooterRoleTest.java +++ b/src/org/labkey/test/tests/core/security/TroubleshooterRoleTest.java @@ -32,7 +32,7 @@ public class TroubleshooterRoleTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - TroubleshooterRoleTest init = (TroubleshooterRoleTest) getCurrentTest(); + TroubleshooterRoleTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/core/webdav/WebDavPerfTest.java b/src/org/labkey/test/tests/core/webdav/WebDavPerfTest.java index 4951a0c2e4..e00aa61eaf 100644 --- a/src/org/labkey/test/tests/core/webdav/WebDavPerfTest.java +++ b/src/org/labkey/test/tests/core/webdav/WebDavPerfTest.java @@ -51,7 +51,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - WebDavPerfTest init = (WebDavPerfTest) getCurrentTest(); + WebDavPerfTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/elisa/ElisaMultiPlateAssayTest.java b/src/org/labkey/test/tests/elisa/ElisaMultiPlateAssayTest.java index 1895dee01b..48c0353559 100644 --- a/src/org/labkey/test/tests/elisa/ElisaMultiPlateAssayTest.java +++ b/src/org/labkey/test/tests/elisa/ElisaMultiPlateAssayTest.java @@ -51,7 +51,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void setupProject() { - ElisaMultiPlateAssayTest init = (ElisaMultiPlateAssayTest) getCurrentTest(); + ElisaMultiPlateAssayTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/elispotassay/ElispotAssayTest.java b/src/org/labkey/test/tests/elispotassay/ElispotAssayTest.java index 2d06c3af95..7e4a65938b 100644 --- a/src/org/labkey/test/tests/elispotassay/ElispotAssayTest.java +++ b/src/org/labkey/test/tests/elispotassay/ElispotAssayTest.java @@ -104,7 +104,7 @@ protected BrowserType bestBrowser() @BeforeClass public static void initProject() throws Exception { - ElispotAssayTest init = (ElispotAssayTest)getCurrentTest(); + ElispotAssayTest init = getCurrentTest(); init.setupFolder(); } @@ -359,14 +359,14 @@ private void assertElispotData() for (int i = 0; i < cellWell.size(); i++) { int cpw = NumberUtils.toInt(cellWell.get(i), 0); - Float sc = NumberUtils.toFloat(spotCount.get(i)); - Float nsc = NumberUtils.toFloat(normalizedSpotCount.get(i)); - Float computed = sc; + float sc = NumberUtils.toFloat(spotCount.get(i)); + float nsc = NumberUtils.toFloat(normalizedSpotCount.get(i)); + float computed = sc; if (cpw != 0) computed = sc / cpw * 1000000; - assertEquals(computed.intValue(), nsc.intValue()); + assertEquals((int) computed, (int) nsc); } _customizeViewsHelper.openCustomizeViewPanel(); _customizeViewsHelper.revertUnsavedView(); @@ -656,14 +656,14 @@ public void testMeanAndMedian() if (!"TNTC".equals(spotCount.get(i))) { int cpw = NumberUtils.toInt(cellWell.get(i), 0); - Float sc = NumberUtils.toFloat(spotCount.get(i)); - Float nsc = NumberUtils.toFloat(normalizedSpotCount.get(i)); - Float computed = sc; + float sc = NumberUtils.toFloat(spotCount.get(i)); + float nsc = NumberUtils.toFloat(normalizedSpotCount.get(i)); + float computed = sc; if (cpw != 0) computed = sc / cpw * 1000000; - assertEquals(computed.intValue(), nsc.intValue()); + assertEquals((int) computed, (int) nsc); } else { diff --git a/src/org/labkey/test/tests/experiment/SampleTypeLookupDisplayColumnTest.java b/src/org/labkey/test/tests/experiment/SampleTypeLookupDisplayColumnTest.java index 063f00ab42..4d37079d80 100644 --- a/src/org/labkey/test/tests/experiment/SampleTypeLookupDisplayColumnTest.java +++ b/src/org/labkey/test/tests/experiment/SampleTypeLookupDisplayColumnTest.java @@ -38,7 +38,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() throws Exception { - SampleTypeLookupDisplayColumnTest init = (SampleTypeLookupDisplayColumnTest) getCurrentTest(); + SampleTypeLookupDisplayColumnTest init = getCurrentTest(); init.doSetup(); diff --git a/src/org/labkey/test/tests/filecontent/FileBrowserIconsTest.java b/src/org/labkey/test/tests/filecontent/FileBrowserIconsTest.java index 774979a8a6..0ad400f83d 100644 --- a/src/org/labkey/test/tests/filecontent/FileBrowserIconsTest.java +++ b/src/org/labkey/test/tests/filecontent/FileBrowserIconsTest.java @@ -71,7 +71,7 @@ public void preTest() @BeforeClass public static void initTest() { - FileBrowserIconsTest init = (FileBrowserIconsTest)getCurrentTest(); + FileBrowserIconsTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/filecontent/FileContentActionButtonsTest.java b/src/org/labkey/test/tests/filecontent/FileContentActionButtonsTest.java index cbd4066b2d..6580ca69fc 100644 --- a/src/org/labkey/test/tests/filecontent/FileContentActionButtonsTest.java +++ b/src/org/labkey/test/tests/filecontent/FileContentActionButtonsTest.java @@ -48,7 +48,7 @@ public class FileContentActionButtonsTest extends BaseWebDriverTest @BeforeClass public static void doSetup() throws Exception { - FileContentActionButtonsTest initTest = (FileContentActionButtonsTest)getCurrentTest(); + FileContentActionButtonsTest initTest = getCurrentTest(); initTest.doSetupSteps(); } @@ -250,7 +250,7 @@ public void testActionsWithSpecialCharactersInFileName() log("Drag and Drop file '" + uploadFileName + "'"); _fileBrowserHelper.dragDropUpload(TestFileUtils.getSampleData(uploadFolderName + "/" + uploadFileName)); - assertEquals("File not uploaded via drag and drop", _fileBrowserHelper.getFileList().get(0), uploadFileName); + assertEquals("File not uploaded via drag and drop", uploadFileName, _fileBrowserHelper.getFileList().get(0)); } diff --git a/src/org/labkey/test/tests/filecontent/FileContentUploadTest.java b/src/org/labkey/test/tests/filecontent/FileContentUploadTest.java index 0fe83c2482..1b24e83e25 100644 --- a/src/org/labkey/test/tests/filecontent/FileContentUploadTest.java +++ b/src/org/labkey/test/tests/filecontent/FileContentUploadTest.java @@ -101,7 +101,7 @@ protected String getProjectName() @BeforeClass public static void doSetup() { - FileContentUploadTest initTest = (FileContentUploadTest)getCurrentTest(); + FileContentUploadTest initTest = getCurrentTest(); initTest.doSetupSteps(); } diff --git a/src/org/labkey/test/tests/filecontent/FileRootMigrationTest.java b/src/org/labkey/test/tests/filecontent/FileRootMigrationTest.java index 4c5f1ef8a0..526ee5383d 100644 --- a/src/org/labkey/test/tests/filecontent/FileRootMigrationTest.java +++ b/src/org/labkey/test/tests/filecontent/FileRootMigrationTest.java @@ -47,8 +47,8 @@ public class FileRootMigrationTest extends BaseWebDriverTest { private static final String FOLDER = "subfolder"; private final File targetFileRoot = new File(TestFileUtils.getTestTempDir(), "target"); - private File defaultProjectFileRoot = TestFileUtils.getDefaultFileRoot(getProjectName()); - private File defaultFolderFileRoot = TestFileUtils.getDefaultFileRoot(getProjectName() + "/" + FOLDER); + private final File defaultProjectFileRoot = TestFileUtils.getDefaultFileRoot(getProjectName()); + private final File defaultFolderFileRoot = TestFileUtils.getDefaultFileRoot(getProjectName() + "/" + FOLDER); @Override protected void doCleanup(boolean afterTest) throws TestTimeoutException @@ -59,7 +59,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - FileRootMigrationTest init = (FileRootMigrationTest) getCurrentTest(); + FileRootMigrationTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/filecontent/FilesQueryTest.java b/src/org/labkey/test/tests/filecontent/FilesQueryTest.java index 52035ea8f3..883ab16fad 100644 --- a/src/org/labkey/test/tests/filecontent/FilesQueryTest.java +++ b/src/org/labkey/test/tests/filecontent/FilesQueryTest.java @@ -62,7 +62,7 @@ public List getAssociatedModules() @BeforeClass public static void doSetup() { - FilesQueryTest initTest = (FilesQueryTest)getCurrentTest(); + FilesQueryTest initTest = getCurrentTest(); initTest.doSetupSteps(); } diff --git a/src/org/labkey/test/tests/filecontent/FilesWebpartFileRootTest.java b/src/org/labkey/test/tests/filecontent/FilesWebpartFileRootTest.java index 3e4c2a28a0..06cb305823 100644 --- a/src/org/labkey/test/tests/filecontent/FilesWebpartFileRootTest.java +++ b/src/org/labkey/test/tests/filecontent/FilesWebpartFileRootTest.java @@ -57,7 +57,7 @@ public List getAssociatedModules() @BeforeClass public static void initTest() { - FilesWebpartFileRootTest init = (FilesWebpartFileRootTest)getCurrentTest(); + FilesWebpartFileRootTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/flow/BaseFlowTest.java b/src/org/labkey/test/tests/flow/BaseFlowTest.java index 49fe0577ab..1821b32679 100644 --- a/src/org/labkey/test/tests/flow/BaseFlowTest.java +++ b/src/org/labkey/test/tests/flow/BaseFlowTest.java @@ -81,7 +81,7 @@ protected String getContainerPath() @BeforeClass public static void setupProject() { - BaseFlowTest initTest = (BaseFlowTest)getCurrentTest(); + BaseFlowTest initTest = getCurrentTest(); initTest.init(); } @@ -444,12 +444,12 @@ protected void importAnalysis_reviewSamples(String containerPath, boolean resolv assertTextPresent("Matched"); } - if (selectedGroupNames != null && selectedGroupNames.size() > 0) + if (selectedGroupNames != null && !selectedGroupNames.isEmpty()) { selectOptionByValue(Locator.id("importGroupNames"), StringUtils.join(selectedGroupNames, ",")); fireEvent(Locator.id("importGroupNames"), SeleniumEvent.change); // TODO: Workaround for reselection not changing checkboxes } - else if (selectedSampleIds != null && selectedSampleIds.size() > 0) + else if (selectedSampleIds != null && !selectedSampleIds.isEmpty()) { // UNDONE: Select individual rows for import } @@ -522,7 +522,7 @@ protected static class ImportAnalysisOptions { private final String _containerPath; private final String _workspacePath; - private SelectFCSFileOption _selectFCSFilesOption; + private final SelectFCSFileOption _selectFCSFilesOption; private final List _keywordDirs; private final List _selectedGroupNames; private final List _selectedSampleIds; diff --git a/src/org/labkey/test/tests/flow/FlowDuplicateSamplesTest.java b/src/org/labkey/test/tests/flow/FlowDuplicateSamplesTest.java index 7b9ccd8d77..1d3f9a2c23 100644 --- a/src/org/labkey/test/tests/flow/FlowDuplicateSamplesTest.java +++ b/src/org/labkey/test/tests/flow/FlowDuplicateSamplesTest.java @@ -21,6 +21,7 @@ public class FlowDuplicateSamplesTest extends BaseFlowTest { + @Override protected void importFCSFiles() { waitAndClickAndWait(Locator.linkWithText("Browse for FCS files to be imported")); diff --git a/src/org/labkey/test/tests/flow/FlowImportTest.java b/src/org/labkey/test/tests/flow/FlowImportTest.java index 1c2006a395..bf3ee254a3 100644 --- a/src/org/labkey/test/tests/flow/FlowImportTest.java +++ b/src/org/labkey/test/tests/flow/FlowImportTest.java @@ -54,8 +54,8 @@ public void importTest() throws ParseException importAnalysis(getContainerPath(), workspacePath, SelectFCSFileOption.None, null, analysisFolder, false, true); beginAt(WebTestHelper.getContextPath() + "/query" + getContainerPath() + "/executeQuery.view?query.queryName=Runs&schemaName=flow"); DataRegionTable table = new DataRegionTable("query", this); - assertEquals("Expected a single run", table.getDataRowCount(), 1); - assertEquals("Expected an Analysis run", table.getDataAsText(0, "Protocol Step"), "Analysis"); + assertEquals("Expected a single run", 1, table.getDataRowCount()); + assertEquals("Expected an Analysis run", "Analysis", table.getDataAsText(0, "Protocol Step")); log("** import same FlowJo workspace again, with FCS files"); importAnalysis_begin(getContainerPath()); @@ -78,11 +78,11 @@ public void importTest() throws ParseException // assert one keyword run created, one additional analysis run created beginAt(WebTestHelper.getContextPath() + "/query" + getContainerPath() + "/executeQuery.view?query.queryName=Runs&schemaName=flow"); table = new DataRegionTable("query", this); - assertEquals("Expected three runs", table.getDataRowCount(), 3); + assertEquals("Expected three runs", 3, table.getDataRowCount()); table.setSort("ProtocolStep", SortDirection.DESC); - assertEquals("Expected a Keywords run", table.getDataAsText(0, "Protocol Step"), "Keywords"); - assertEquals("Expected an Analysis run", table.getDataAsText(1, "Protocol Step"), "Analysis"); - assertEquals("Expected an Analysis run", table.getDataAsText(2, "Protocol Step"), "Analysis"); + assertEquals("Expected a Keywords run", "Keywords", table.getDataAsText(0, "Protocol Step")); + assertEquals("Expected an Analysis run", "Analysis", table.getDataAsText(1, "Protocol Step")); + assertEquals("Expected an Analysis run", "Analysis", table.getDataAsText(2, "Protocol Step")); // UNDONE: Check Runs.Workspace column // check for flow.FCSFiles has a FileDate column and verify the values @@ -124,6 +124,6 @@ public void importTest() throws ParseException beginAt(WebTestHelper.getContextPath() + "/query" + getContainerPath() + "/executeQuery.view?query.queryName=Runs&schemaName=flow"); table = new DataRegionTable("query", this); - assertEquals("Expected four runs", table.getDataRowCount(), 4); + assertEquals("Expected four runs", 4, table.getDataRowCount()); } } diff --git a/src/org/labkey/test/tests/flow/FlowSpecimenTest.java b/src/org/labkey/test/tests/flow/FlowSpecimenTest.java index e1b677de4b..9fb152e282 100644 --- a/src/org/labkey/test/tests/flow/FlowSpecimenTest.java +++ b/src/org/labkey/test/tests/flow/FlowSpecimenTest.java @@ -50,7 +50,7 @@ public class FlowSpecimenTest extends BaseFlowTest @BeforeClass public static void initFlowFolders() { - FlowSpecimenTest initTest = (FlowSpecimenTest)getCurrentTest(); + FlowSpecimenTest initTest = getCurrentTest(); initTest.initializeStudyFolder(); } diff --git a/src/org/labkey/test/tests/flow/FlowTest.java b/src/org/labkey/test/tests/flow/FlowTest.java index 9640ebca5b..3987aad49a 100644 --- a/src/org/labkey/test/tests/flow/FlowTest.java +++ b/src/org/labkey/test/tests/flow/FlowTest.java @@ -72,7 +72,7 @@ public class FlowTest extends BaseFlowTest @BeforeClass public static void initR() { - FlowTest init = (FlowTest)getCurrentTest(); + FlowTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/issues/IssueAPITest.java b/src/org/labkey/test/tests/issues/IssueAPITest.java index 6bc07392b4..8422cef180 100644 --- a/src/org/labkey/test/tests/issues/IssueAPITest.java +++ b/src/org/labkey/test/tests/issues/IssueAPITest.java @@ -51,7 +51,7 @@ public class IssueAPITest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - IssueAPITest init = (IssueAPITest) getCurrentTest(); + IssueAPITest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/issues/IssueDomainSharingTest.java b/src/org/labkey/test/tests/issues/IssueDomainSharingTest.java index 2fc45c594d..2e32071309 100644 --- a/src/org/labkey/test/tests/issues/IssueDomainSharingTest.java +++ b/src/org/labkey/test/tests/issues/IssueDomainSharingTest.java @@ -53,8 +53,8 @@ public class IssueDomainSharingTest extends BaseWebDriverTest private static final String SHARED_LIST_DEF = "SharedTestDef"; private final String FOLDER_PATH = "/" + getProjectName() + "/" + FOLDER; - private IssuesHelper _issuesHelper = new IssuesHelper(this); - private ApiPermissionsHelper _permissionsHelper = new ApiPermissionsHelper(this); + private final IssuesHelper _issuesHelper = new IssuesHelper(this); + private final ApiPermissionsHelper _permissionsHelper = new ApiPermissionsHelper(this); @Override protected void doCleanup(boolean afterTest) throws TestTimeoutException @@ -72,7 +72,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - IssueDomainSharingTest init = (IssueDomainSharingTest) getCurrentTest(); + IssueDomainSharingTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/issues/IssueDomainTest.java b/src/org/labkey/test/tests/issues/IssueDomainTest.java index af511d3ae8..7d5cd70c53 100644 --- a/src/org/labkey/test/tests/issues/IssueDomainTest.java +++ b/src/org/labkey/test/tests/issues/IssueDomainTest.java @@ -28,7 +28,7 @@ @BaseWebDriverTest.ClassTimeout(minutes = 2) public class IssueDomainTest extends BaseWebDriverTest { - private IssuesHelper _issuesHelper = new IssuesHelper(this); + private final IssuesHelper _issuesHelper = new IssuesHelper(this); private final String DOMAIN_NAME = "issues";//schemaName private final String ISSUES_NAME = "testdomainissue"; @@ -53,7 +53,7 @@ public List getAssociatedModules() @BeforeClass public static void doSetup() { - IssueDomainTest initTest = (IssueDomainTest) getCurrentTest(); + IssueDomainTest initTest = getCurrentTest(); initTest.setup(); } diff --git a/src/org/labkey/test/tests/issues/IssuesAdminTest.java b/src/org/labkey/test/tests/issues/IssuesAdminTest.java index 72084eb9f6..67278136d7 100644 --- a/src/org/labkey/test/tests/issues/IssuesAdminTest.java +++ b/src/org/labkey/test/tests/issues/IssuesAdminTest.java @@ -43,7 +43,6 @@ import java.util.Map; import static org.junit.Assert.assertEquals; -import static org.labkey.test.util.PasswordUtil.getUsername; @Category({Issues.class, Daily.class}) @BaseWebDriverTest.ClassTimeout(minutes = 5) @@ -58,13 +57,13 @@ public class IssuesAdminTest extends BaseWebDriverTest private static final String PROJECT2 = "IssuesAdminWithoutModule"; private static final String PROJECT3 = "CustomIssueName Project"; - private IssuesHelper _issuesHelper = new IssuesHelper(this); - private ApiPermissionsHelper _permissionsHelper = new ApiPermissionsHelper(this); + private final IssuesHelper _issuesHelper = new IssuesHelper(this); + private final ApiPermissionsHelper _permissionsHelper = new ApiPermissionsHelper(this); @BeforeClass public static void setupProject() { - IssuesAdminTest init = (IssuesAdminTest) getCurrentTest(); + IssuesAdminTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/issues/IssuesAttachmentTest.java b/src/org/labkey/test/tests/issues/IssuesAttachmentTest.java index 9d4fe03c9b..18c636c80e 100644 --- a/src/org/labkey/test/tests/issues/IssuesAttachmentTest.java +++ b/src/org/labkey/test/tests/issues/IssuesAttachmentTest.java @@ -56,7 +56,7 @@ public class IssuesAttachmentTest extends BaseWebDriverTest implements NonWindow public static final String LIST_DEF_NAME = "Issues"; - private IssuesHelper issuesHelper = new IssuesHelper(this); + private final IssuesHelper issuesHelper = new IssuesHelper(this); @Override protected void doCleanup(boolean afterTest) @@ -75,7 +75,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void setupProject() throws Exception { - IssuesAttachmentTest init = (IssuesAttachmentTest) getCurrentTest(); + IssuesAttachmentTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/issues/IssuesTest.java b/src/org/labkey/test/tests/issues/IssuesTest.java index f487db1448..68c5965a93 100644 --- a/src/org/labkey/test/tests/issues/IssuesTest.java +++ b/src/org/labkey/test/tests/issues/IssuesTest.java @@ -35,7 +35,6 @@ import org.labkey.test.components.dumbster.EmailRecordTable; import org.labkey.test.components.dumbster.EmailRecordTable.EmailMessage; import org.labkey.test.components.html.BootstrapMenu; -import org.labkey.test.pages.issues.BaseIssuePage; import org.labkey.test.pages.issues.ClosePage; import org.labkey.test.pages.issues.DetailsPage; import org.labkey.test.pages.issues.EmailPrefsPage; @@ -112,7 +111,7 @@ public IssuesTest() @BeforeClass public static void doSetup() { - IssuesTest initTest = (IssuesTest) getCurrentTest(); + IssuesTest initTest = getCurrentTest(); initTest.doInit(); } @@ -840,7 +839,7 @@ public void defaultAssignedToTest() // check for no default clickButton("New Issue"); - assertEquals(getSelectedOptionText(Locator.name("assignedTo")), ""); + assertEquals("", getSelectedOptionText(Locator.name("assignedTo"))); clickButton("Cancel"); /// check reader cannot be set as default user (issue 20598) @@ -876,7 +875,7 @@ public void defaultAssignedToTest() // check for no default clickButton("New Issue"); - assertEquals(getSelectedOptionText(Locator.name("assignedTo")), ""); + assertEquals("", getSelectedOptionText(Locator.name("assignedTo"))); clickButton("Cancel"); // issue 20699 - NPE b/c default assign to user deleted! diff --git a/src/org/labkey/test/tests/list/ColumnResizeTest.java b/src/org/labkey/test/tests/list/ColumnResizeTest.java index 6369e048a0..667cd9a914 100644 --- a/src/org/labkey/test/tests/list/ColumnResizeTest.java +++ b/src/org/labkey/test/tests/list/ColumnResizeTest.java @@ -113,7 +113,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException @BeforeClass public static void setupProject() { - ColumnResizeTest init = (ColumnResizeTest)getCurrentTest(); + ColumnResizeTest init = getCurrentTest(); init._containerHelper.createProject(PROJECT_NAME, null); } diff --git a/src/org/labkey/test/tests/list/ListDateAndTimeTest.java b/src/org/labkey/test/tests/list/ListDateAndTimeTest.java index 211181d651..6665e4a170 100644 --- a/src/org/labkey/test/tests/list/ListDateAndTimeTest.java +++ b/src/org/labkey/test/tests/list/ListDateAndTimeTest.java @@ -68,7 +68,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() throws IOException, CommandException { - ListDateAndTimeTest init = (ListDateAndTimeTest)getCurrentTest(); + ListDateAndTimeTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/list/ListIndexingTest.java b/src/org/labkey/test/tests/list/ListIndexingTest.java index c0d079e44b..3f67f079a1 100644 --- a/src/org/labkey/test/tests/list/ListIndexingTest.java +++ b/src/org/labkey/test/tests/list/ListIndexingTest.java @@ -49,7 +49,7 @@ public List getAssociatedModules() @BeforeClass public static void setupProject() { - ListIndexingTest init = (ListIndexingTest) getCurrentTest(); + ListIndexingTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/list/ListMissingValuesTest.java b/src/org/labkey/test/tests/list/ListMissingValuesTest.java index c15f1c320a..17b1f92d2f 100644 --- a/src/org/labkey/test/tests/list/ListMissingValuesTest.java +++ b/src/org/labkey/test/tests/list/ListMissingValuesTest.java @@ -27,7 +27,7 @@ public class ListMissingValuesTest extends MissingValueIndicatorsTest @BeforeClass public static void beforeTestClass() { - ListMissingValuesTest init = (ListMissingValuesTest)getCurrentTest(); + ListMissingValuesTest init = getCurrentTest(); init.setupProject(); } diff --git a/src/org/labkey/test/tests/list/ListTest.java b/src/org/labkey/test/tests/list/ListTest.java index b87fe726bc..1bcac723db 100644 --- a/src/org/labkey/test/tests/list/ListTest.java +++ b/src/org/labkey/test/tests/list/ListTest.java @@ -19,13 +19,10 @@ import org.apache.commons.lang3.StringUtils; import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.labkey.remoteapi.CommandException; import org.labkey.remoteapi.domain.Domain; import org.labkey.remoteapi.domain.DomainResponse; import org.labkey.remoteapi.domain.PropertyDescriptor; @@ -73,7 +70,6 @@ import java.io.File; import java.io.IOException; -import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/org/labkey/test/tests/microarray/BaseExpressionMatrixTest.java b/src/org/labkey/test/tests/microarray/BaseExpressionMatrixTest.java index 2887656fad..04c5b7aa73 100644 --- a/src/org/labkey/test/tests/microarray/BaseExpressionMatrixTest.java +++ b/src/org/labkey/test/tests/microarray/BaseExpressionMatrixTest.java @@ -55,7 +55,7 @@ protected int getFeatureSetId() @BeforeClass public static void doSetup() { - BaseExpressionMatrixTest initTest = (BaseExpressionMatrixTest)getCurrentTest(); + BaseExpressionMatrixTest initTest = getCurrentTest(); initTest.doSetupSteps(); } diff --git a/src/org/labkey/test/tests/nab/NAbResultCalcTest.java b/src/org/labkey/test/tests/nab/NAbResultCalcTest.java index d328c8ce3c..02f48dc295 100644 --- a/src/org/labkey/test/tests/nab/NAbResultCalcTest.java +++ b/src/org/labkey/test/tests/nab/NAbResultCalcTest.java @@ -33,7 +33,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void setupProject() { - NAbResultCalcTest init = (NAbResultCalcTest) getCurrentTest(); + NAbResultCalcTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/nab/NabAssayTest.java b/src/org/labkey/test/tests/nab/NabAssayTest.java index 40f904a6bb..5d013a74bc 100644 --- a/src/org/labkey/test/tests/nab/NabAssayTest.java +++ b/src/org/labkey/test/tests/nab/NabAssayTest.java @@ -124,7 +124,7 @@ protected BrowserType bestBrowser() @BeforeClass public static void setupProject() throws Exception { - NabAssayTest init = (NabAssayTest)getCurrentTest(); + NabAssayTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/nab/NabAssayThawListTest.java b/src/org/labkey/test/tests/nab/NabAssayThawListTest.java index 8669cc1994..196317bc8d 100644 --- a/src/org/labkey/test/tests/nab/NabAssayThawListTest.java +++ b/src/org/labkey/test/tests/nab/NabAssayThawListTest.java @@ -84,7 +84,7 @@ protected BrowserType bestBrowser() @BeforeClass public static void setupProject() throws Exception { - NabAssayThawListTest init = (NabAssayThawListTest)getCurrentTest(); + NabAssayThawListTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/nab/NabHighThroughputAssayTest.java b/src/org/labkey/test/tests/nab/NabHighThroughputAssayTest.java index a8b43e902a..2c307df4ae 100644 --- a/src/org/labkey/test/tests/nab/NabHighThroughputAssayTest.java +++ b/src/org/labkey/test/tests/nab/NabHighThroughputAssayTest.java @@ -68,7 +68,7 @@ public class NabHighThroughputAssayTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - NabHighThroughputAssayTest init = (NabHighThroughputAssayTest)getCurrentTest(); + NabHighThroughputAssayTest init = getCurrentTest(); init.doInit(); } diff --git a/src/org/labkey/test/tests/nab/NabMultiVirusPlateTest.java b/src/org/labkey/test/tests/nab/NabMultiVirusPlateTest.java index 74f6e91489..7aa9986b5a 100644 --- a/src/org/labkey/test/tests/nab/NabMultiVirusPlateTest.java +++ b/src/org/labkey/test/tests/nab/NabMultiVirusPlateTest.java @@ -91,7 +91,7 @@ protected BrowserType bestBrowser() @BeforeClass public static void initProject() { - NabMultiVirusPlateTest init = (NabMultiVirusPlateTest)getCurrentTest(); + NabMultiVirusPlateTest init = getCurrentTest(); init.doCreateSteps(); } diff --git a/src/org/labkey/test/tests/perf/StudyImportPerfTest.java b/src/org/labkey/test/tests/perf/StudyImportPerfTest.java index c5b0e37f91..fa3f084b5a 100644 --- a/src/org/labkey/test/tests/perf/StudyImportPerfTest.java +++ b/src/org/labkey/test/tests/perf/StudyImportPerfTest.java @@ -20,8 +20,6 @@ import org.labkey.test.TestFileUtils; import org.labkey.test.categories.Perf; -import java.io.File; - @Category(Perf.class) public class StudyImportPerfTest extends PerformanceTest { diff --git a/src/org/labkey/test/tests/pipeline/PipelineProtocolArchiveTest.java b/src/org/labkey/test/tests/pipeline/PipelineProtocolArchiveTest.java index 9dc8372964..15c836c84b 100644 --- a/src/org/labkey/test/tests/pipeline/PipelineProtocolArchiveTest.java +++ b/src/org/labkey/test/tests/pipeline/PipelineProtocolArchiveTest.java @@ -67,7 +67,7 @@ protected String getProjectName() @BeforeClass public static void setupProject() { - PipelineProtocolArchiveTest init = (PipelineProtocolArchiveTest) getCurrentTest(); + PipelineProtocolArchiveTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/query/QueryMetadataTest.java b/src/org/labkey/test/tests/query/QueryMetadataTest.java index b9e393f1b2..3d4f914daa 100644 --- a/src/org/labkey/test/tests/query/QueryMetadataTest.java +++ b/src/org/labkey/test/tests/query/QueryMetadataTest.java @@ -35,7 +35,7 @@ protected void doCleanup(boolean afterTest) @BeforeClass public static void setupProject() throws Exception { - QueryMetadataTest init = (QueryMetadataTest) getCurrentTest(); + QueryMetadataTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/remoteapi/BulkUpdateGroupApiTest.java b/src/org/labkey/test/tests/remoteapi/BulkUpdateGroupApiTest.java index 5d6ad486cb..2a23a82af9 100644 --- a/src/org/labkey/test/tests/remoteapi/BulkUpdateGroupApiTest.java +++ b/src/org/labkey/test/tests/remoteapi/BulkUpdateGroupApiTest.java @@ -89,7 +89,7 @@ private void deleteTestUsers(String suffix) @BeforeClass public static void setupProject() { - BulkUpdateGroupApiTest init = (BulkUpdateGroupApiTest) getCurrentTest(); + BulkUpdateGroupApiTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/visualization/ColumnChartTest.java b/src/org/labkey/test/tests/visualization/ColumnChartTest.java index 51d61a0caa..d6c0323219 100644 --- a/src/org/labkey/test/tests/visualization/ColumnChartTest.java +++ b/src/org/labkey/test/tests/visualization/ColumnChartTest.java @@ -69,7 +69,7 @@ public class ColumnChartTest extends BaseWebDriverTest @BeforeClass public static void setupProject() { - ColumnChartTest init = (ColumnChartTest)getCurrentTest(); + ColumnChartTest init = getCurrentTest(); init.doSetup(); } diff --git a/src/org/labkey/test/tests/visualization/GenericChartsTest.java b/src/org/labkey/test/tests/visualization/GenericChartsTest.java index 6281146dc0..1e810331dc 100644 --- a/src/org/labkey/test/tests/visualization/GenericChartsTest.java +++ b/src/org/labkey/test/tests/visualization/GenericChartsTest.java @@ -44,8 +44,8 @@ public abstract class GenericChartsTest extends ReportTest protected static final String MOUSE_GROUP_CATEGORY = "Cat Mice Let"; protected static final String CHART_TITLE = "Test Title"; - private List _plots = new ArrayList<>(); - private List _plotDescriptions = new ArrayList<>(); + private final List _plots = new ArrayList<>(); + private final List _plotDescriptions = new ArrayList<>(); @Override @LogMethod diff --git a/src/org/labkey/test/tests/visualization/TimeChartTest.java b/src/org/labkey/test/tests/visualization/TimeChartTest.java index 01f6fc0660..74d7f5beec 100644 --- a/src/org/labkey/test/tests/visualization/TimeChartTest.java +++ b/src/org/labkey/test/tests/visualization/TimeChartTest.java @@ -70,7 +70,7 @@ protected final String getFolderName() @BeforeClass public static void doInit() { - TimeChartTest init = (TimeChartTest) getCurrentTest(); + TimeChartTest init = getCurrentTest(); init._containerHelper.createProject(init.getProjectName()); } diff --git a/src/org/labkey/test/tests/wiki/EmbeddedWebPartTest.java b/src/org/labkey/test/tests/wiki/EmbeddedWebPartTest.java index 0c92de1c38..dabdfd647e 100644 --- a/src/org/labkey/test/tests/wiki/EmbeddedWebPartTest.java +++ b/src/org/labkey/test/tests/wiki/EmbeddedWebPartTest.java @@ -19,7 +19,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.labkey.test.BaseWebDriverTest; -import org.labkey.test.Locator; import org.labkey.test.Locators; import org.labkey.test.TestFileUtils; import org.labkey.test.categories.Daily; diff --git a/src/org/labkey/test/tests/wiki/WikiAliasesTest.java b/src/org/labkey/test/tests/wiki/WikiAliasesTest.java index 92f3ebebeb..9081311f11 100644 --- a/src/org/labkey/test/tests/wiki/WikiAliasesTest.java +++ b/src/org/labkey/test/tests/wiki/WikiAliasesTest.java @@ -23,12 +23,12 @@ @BaseWebDriverTest.ClassTimeout(minutes = 4) public class WikiAliasesTest extends BaseWebDriverTest { - private static String wikiName = "Sample Wiki for testing aliases"; - private static String wikiName2 = "Sample Wiki for testing aliases - Wiki 2"; - private static String wikiTitle = "Title for " + wikiName; - private static String wikiBody = "Wiki body for " + wikiName; + private static final String wikiName = "Sample Wiki for testing aliases"; + private static final String wikiName2 = "Sample Wiki for testing aliases - Wiki 2"; + private static final String wikiTitle = "Title for " + wikiName; + private static final String wikiBody = "Wiki body for " + wikiName; - private static String SUBFOLDER = "Subfolder for wiki"; + private static final String SUBFOLDER = "Subfolder for wiki"; @BeforeClass public static void setupProject() diff --git a/src/org/labkey/test/tests/wiki/WikiTest.java b/src/org/labkey/test/tests/wiki/WikiTest.java index b095259c5e..c1260552de 100644 --- a/src/org/labkey/test/tests/wiki/WikiTest.java +++ b/src/org/labkey/test/tests/wiki/WikiTest.java @@ -28,7 +28,6 @@ import org.labkey.test.Locator; import org.labkey.test.categories.Daily; import org.labkey.test.categories.Wiki; -import org.labkey.test.components.WebPartPanel; import org.labkey.test.pages.admin.ExternalSourcesPage; import org.labkey.test.pages.admin.ExternalSourcesPage.Directive; import org.labkey.test.pages.search.SearchResultsPage; diff --git a/src/org/labkey/test/util/APIAssayHelper.java b/src/org/labkey/test/util/APIAssayHelper.java index 432c7a68d1..5fccfe1889 100644 --- a/src/org/labkey/test/util/APIAssayHelper.java +++ b/src/org/labkey/test/util/APIAssayHelper.java @@ -200,7 +200,7 @@ public int getIdFromAssayName(String assayName, String projectPath, boolean fail { AssayListCommand alc = new AssayListCommand(); alc.setName(assayName); - AssayListResponse alr = null; + AssayListResponse alr; try { alr = alc.execute(_test.createDefaultConnection(), projectPath); diff --git a/src/org/labkey/test/util/AbstractAssayHelper.java b/src/org/labkey/test/util/AbstractAssayHelper.java index 69a4a26d57..4d58e13662 100644 --- a/src/org/labkey/test/util/AbstractAssayHelper.java +++ b/src/org/labkey/test/util/AbstractAssayHelper.java @@ -159,7 +159,7 @@ public enum AssayDefaultAreas RUN_FIELDS("Run Fields"), EXCEL_FILE_RUN_PROPERTIES("Excel File Run Properties"); - private String menuSuffix; + private final String menuSuffix; AssayDefaultAreas(String menuSuffix) { diff --git a/src/org/labkey/test/util/AbstractDataRegionExportOrSignHelper.java b/src/org/labkey/test/util/AbstractDataRegionExportOrSignHelper.java index e57ad054d3..b8277a10c3 100644 --- a/src/org/labkey/test/util/AbstractDataRegionExportOrSignHelper.java +++ b/src/org/labkey/test/util/AbstractDataRegionExportOrSignHelper.java @@ -137,7 +137,7 @@ public enum ExcelFileType XLS(1), IQY(2); - private int _radioIndex; + private final int _radioIndex; ExcelFileType(int radioIndex) { @@ -162,7 +162,7 @@ public enum TextSeparator COLON("csv"), SEMICOLON("csv"); - private String fileExtension; + private final String fileExtension; TextSeparator(String ext) { diff --git a/src/org/labkey/test/util/ApiPermissionsHelper.java b/src/org/labkey/test/util/ApiPermissionsHelper.java index 2383702b77..c44d25ef0a 100644 --- a/src/org/labkey/test/util/ApiPermissionsHelper.java +++ b/src/org/labkey/test/util/ApiPermissionsHelper.java @@ -115,7 +115,7 @@ public void assertPermissionSetting(String userOrGroupName, String permissionSet roles.addAll(getGroupRoles(container, userOrGroupName)); Assert.assertTrue(String.format("%s did not have role: %s\nFound: %s", userOrGroupName, expectedRole, StringUtils.join("\n", roles)), - roles.contains(expectedRole) || "No Permissions".equals(permissionSetting) && roles.size() == 0); + roles.contains(expectedRole) || "No Permissions".equals(permissionSetting) && roles.isEmpty()); } public List getGroupRoles(String container, String groupName) diff --git a/src/org/labkey/test/util/AssayImportOptions.java b/src/org/labkey/test/util/AssayImportOptions.java index b543a20a2b..a11c5f5a18 100644 --- a/src/org/labkey/test/util/AssayImportOptions.java +++ b/src/org/labkey/test/util/AssayImportOptions.java @@ -31,25 +31,25 @@ public enum VisitResolverType LookupList } - private String assayId; - private String cutoff1; - private String cutoff2; - private String cutoff3; - private String virusName; - private String virusId; - private String curveFitMethod; - private File metadataFile; - private File runFile; - private String[] ptids; - private String[] visits; - private String[] initialDilutions; - private String[] dilutionFactors; - private String[] methods; - private String[] sampleIds; - private String[] dates; - private VisitResolverType visitResolver; - private boolean useDefaultResolver = false; - private boolean resetDefaults = false; + private final String assayId; + private final String cutoff1; + private final String cutoff2; + private final String cutoff3; + private final String virusName; + private final String virusId; + private final String curveFitMethod; + private final File metadataFile; + private final File runFile; + private final String[] ptids; + private final String[] visits; + private final String[] initialDilutions; + private final String[] dilutionFactors; + private final String[] methods; + private final String[] sampleIds; + private final String[] dates; + private final VisitResolverType visitResolver; + private boolean useDefaultResolver; + private boolean resetDefaults; private AssayImportOptions(ImportOptionsBuilder builder) { diff --git a/src/org/labkey/test/util/AssayImporter.java b/src/org/labkey/test/util/AssayImporter.java index 4d0f1a827f..4c439119c8 100644 --- a/src/org/labkey/test/util/AssayImporter.java +++ b/src/org/labkey/test/util/AssayImporter.java @@ -20,8 +20,8 @@ public class AssayImporter { - private BaseWebDriverTest test; - private AssayImportOptions options; + private final BaseWebDriverTest test; + private final AssayImportOptions options; public AssayImporter(BaseWebDriverTest test, AssayImportOptions options) { diff --git a/src/org/labkey/test/util/BaseSearchHelper.java b/src/org/labkey/test/util/BaseSearchHelper.java index 6a1a596263..2642c4a486 100644 --- a/src/org/labkey/test/util/BaseSearchHelper.java +++ b/src/org/labkey/test/util/BaseSearchHelper.java @@ -115,7 +115,7 @@ private void verifySearchResults(String expectedResultsContainer, @NotNull Strin if (!lastTry) { - TestLogger.log(String.format("Bad search results for %s. Waiting %d seconds before trying again...", notFound.toString(), i*5)); + TestLogger.log(String.format("Bad search results for %s. Waiting %d seconds before trying again...", notFound, i*5)); WebDriverWrapper.sleep(i*5000); } } diff --git a/src/org/labkey/test/util/ChartHelper.java b/src/org/labkey/test/util/ChartHelper.java index 6fe46ad082..ac51c673f2 100644 --- a/src/org/labkey/test/util/ChartHelper.java +++ b/src/org/labkey/test/util/ChartHelper.java @@ -15,7 +15,6 @@ */ package org.labkey.test.util; -import org.labkey.test.Locator; import org.labkey.test.WebDriverWrapper; import java.util.Map; diff --git a/src/org/labkey/test/util/DataClassHelper.java b/src/org/labkey/test/util/DataClassHelper.java index 1ddf9ed2a6..67dd56f9b4 100644 --- a/src/org/labkey/test/util/DataClassHelper.java +++ b/src/org/labkey/test/util/DataClassHelper.java @@ -18,7 +18,6 @@ import org.labkey.test.Locator; import org.labkey.test.WebDriverWrapper; import org.labkey.test.WebTestHelper; -import org.labkey.test.components.ext4.Window; import org.labkey.test.pages.ImportDataPage; import org.labkey.test.pages.experiment.CreateDataClassPage; import org.labkey.test.params.FieldDefinition; @@ -34,7 +33,6 @@ import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.labkey.test.util.exp.DataClassAPIHelper.DATA_CLASS_DATA_REGION_NAME; /** diff --git a/src/org/labkey/test/util/DataRegionExportHelper.java b/src/org/labkey/test/util/DataRegionExportHelper.java index b3abd0f374..6ed8d48e04 100644 --- a/src/org/labkey/test/util/DataRegionExportHelper.java +++ b/src/org/labkey/test/util/DataRegionExportHelper.java @@ -152,7 +152,7 @@ public enum ScriptExportType SAS(5), URL(6); - private Locator fileTypeRadio; + private final Locator fileTypeRadio; ScriptExportType(int radioIndex) { diff --git a/src/org/labkey/test/util/DataRegionTable.java b/src/org/labkey/test/util/DataRegionTable.java index 0b1d3d827b..b82e57a43e 100644 --- a/src/org/labkey/test/util/DataRegionTable.java +++ b/src/org/labkey/test/util/DataRegionTable.java @@ -868,7 +868,7 @@ private String getFlagValue(WebElement flag) } else if (isFlagDisabled(flag)) { - assertEquals("Expect unset flag title to be 'Flag for review'", title, "Flag for review"); + assertEquals("Expect unset flag title to be 'Flag for review'", "Flag for review", title); return null; } throw new AssertionError("Expected flag class to be either 'lk-flag-enabled' or 'lk-flag-disabled'"); diff --git a/src/org/labkey/test/util/DilutionAssayHelper.java b/src/org/labkey/test/util/DilutionAssayHelper.java index cfd041ceb8..fdb9bc1ed9 100644 --- a/src/org/labkey/test/util/DilutionAssayHelper.java +++ b/src/org/labkey/test/util/DilutionAssayHelper.java @@ -25,7 +25,7 @@ */ public class DilutionAssayHelper { - private BaseWebDriverTest _test; + private final BaseWebDriverTest _test; public DilutionAssayHelper(BaseWebDriverTest test) { diff --git a/src/org/labkey/test/util/Ext4Helper.java b/src/org/labkey/test/util/Ext4Helper.java index 7d6d7e43e2..857e11b752 100644 --- a/src/org/labkey/test/util/Ext4Helper.java +++ b/src/org/labkey/test/util/Ext4Helper.java @@ -626,7 +626,7 @@ private List _componentQuery(String componentSel List ids = new ArrayList<>(); for (String id : unfilteredIds) { - if (Locator.id(id).findElements(_test.getDriver()).size() > 0) + if (!Locator.id(id).findElements(_test.getDriver()).isEmpty()) ids.add(id); // ignore uninitialized ext components } return componentsFromIds(ids, clazz); @@ -635,7 +635,7 @@ private List _componentQuery(String componentSel public Type queryOne(String componentSelector, Class clazz) { List cmpRefs = componentQuery(componentSelector, clazz); - if (null == cmpRefs || cmpRefs.size() == 0) + if (null == cmpRefs || cmpRefs.isEmpty()) return null; return cmpRefs.get(0); diff --git a/src/org/labkey/test/util/LabKeyExpectedConditions.java b/src/org/labkey/test/util/LabKeyExpectedConditions.java index f04f0b2472..fc87aedf33 100644 --- a/src/org/labkey/test/util/LabKeyExpectedConditions.java +++ b/src/org/labkey/test/util/LabKeyExpectedConditions.java @@ -51,15 +51,18 @@ private LabKeyExpectedConditions() */ public static ExpectedCondition presenceOfNestedElementLocatedBy(final SearchContext context, final By childLocator) { - return new ExpectedCondition() { + return new ExpectedCondition<>() + { @Override - public WebElement apply(WebDriver webDriver) { + public WebElement apply(WebDriver webDriver) + { return context.findElement(childLocator); } @Override - public String toString() { + public String toString() + { return String.format("visibility of element located by %s", childLocator); } }; @@ -180,7 +183,7 @@ public static ExpectedCondition clickUntilStale(final WebElement elemen { return new ExpectedCondition<>() { - ExpectedCondition staleCheck = ExpectedConditions.stalenessOf(element); + final ExpectedCondition staleCheck = ExpectedConditions.stalenessOf(element); @Override public Boolean apply(WebDriver ignored) diff --git a/src/org/labkey/test/util/LogMethod.java b/src/org/labkey/test/util/LogMethod.java index ef0f2c64c0..5e4c5c07cd 100644 --- a/src/org/labkey/test/util/LogMethod.java +++ b/src/org/labkey/test/util/LogMethod.java @@ -33,7 +33,7 @@ MethodType category() default MethodType.UNSPECIFIED; @Deprecated - public static enum MethodType + enum MethodType { BEFORE, SETUP, diff --git a/src/org/labkey/test/util/MetadataEditorHelper.java b/src/org/labkey/test/util/MetadataEditorHelper.java index 6f41a0a8ea..ca555fc4e6 100644 --- a/src/org/labkey/test/util/MetadataEditorHelper.java +++ b/src/org/labkey/test/util/MetadataEditorHelper.java @@ -25,7 +25,7 @@ //TODO: Move domain helpers that aren't list-specific from ListHelper public class MetadataEditorHelper { - private BaseWebDriverTest _test; + private final BaseWebDriverTest _test; public MetadataEditorHelper(BaseWebDriverTest test) { diff --git a/src/org/labkey/test/util/OlapHelper.java b/src/org/labkey/test/util/OlapHelper.java index 2e31f29479..4b89288f3d 100644 --- a/src/org/labkey/test/util/OlapHelper.java +++ b/src/org/labkey/test/util/OlapHelper.java @@ -30,12 +30,12 @@ */ public class OlapHelper { - private String _baseUrl = WebTestHelper.getBaseURL(); - private String _username = PasswordUtil.getUsername(); - private String _password = PasswordUtil.getPassword(); + private final String _baseUrl = WebTestHelper.getBaseURL(); + private final String _username = PasswordUtil.getUsername(); + private final String _password = PasswordUtil.getPassword(); private String _configId; private String _schemaName; - private String _folderPath; + private final String _folderPath; public OlapHelper(String configId, String schemaName, String folderPath) { @@ -46,9 +46,6 @@ public OlapHelper(String configId, String schemaName, String folderPath) /** * Execute an MDX query and return the full response - * @param query - * @return - * @throws Exception */ public MdxResponse executeMdx(String query) throws Exception { diff --git a/src/org/labkey/test/util/PageFactory.java b/src/org/labkey/test/util/PageFactory.java index 7cfdb8cece..2c1a6e4b46 100644 --- a/src/org/labkey/test/util/PageFactory.java +++ b/src/org/labkey/test/util/PageFactory.java @@ -25,7 +25,7 @@ public class PageFactory

    { private final RelativeUrl url; private final Function pageConstructor; - private String containerPath = null; + private final String containerPath = null; PageFactory(RelativeUrl url, Function pageConstructor) { diff --git a/src/org/labkey/test/util/PasswordUtil.java b/src/org/labkey/test/util/PasswordUtil.java index 1dae9ae9f9..5dd143495a 100644 --- a/src/org/labkey/test/util/PasswordUtil.java +++ b/src/org/labkey/test/util/PasswordUtil.java @@ -33,8 +33,8 @@ public class PasswordUtil private static class Credentials { - private String _username; - private String _password; + private final String _username; + private final String _password; public Credentials(String username, String password) { _username = username; diff --git a/src/org/labkey/test/util/PortalHelper.java b/src/org/labkey/test/util/PortalHelper.java index c389c83297..8ff252b79e 100644 --- a/src/org/labkey/test/util/PortalHelper.java +++ b/src/org/labkey/test/util/PortalHelper.java @@ -252,7 +252,6 @@ public List getSideWebParts() /** * Allows test code to navigate to a Webpart Ext-based navigation menu. * @param webPartTitle title (not name) of webpart to be clicked. Multiple web parts with the same title not supported. - * @param items */ public void clickWebpartMenuItem(String webPartTitle, String... items) { @@ -436,9 +435,6 @@ public void openWebpartPermissionWindow(String webpart) } /** - * @param webpart - * @param permission - * @param folder null=current folder */ public void setWebpartPermission(String webpart, String permission, String folder) { @@ -460,8 +456,6 @@ public void setWebpartPermission(String webpart, String permission, String folde } /** - * @param webpart - * @param expectedPermission The permission that is expected to be set. * @param expectedFolder The folder that is expected to be selected, null=current folder */ public void checkWebpartPermission(String webpart, String expectedPermission, String expectedFolder) @@ -492,8 +486,8 @@ public enum Direction LEFT("Left", Axis.HORIZONTAL), RIGHT("Right", Axis.HORIZONTAL); - private String _dir; - private Axis _axis; + private final String _dir; + private final Axis _axis; Direction (String dir, Axis axis) { diff --git a/src/org/labkey/test/util/PythonHelper.java b/src/org/labkey/test/util/PythonHelper.java index 5f43a8837b..b3f4d955c4 100644 --- a/src/org/labkey/test/util/PythonHelper.java +++ b/src/org/labkey/test/util/PythonHelper.java @@ -176,7 +176,7 @@ private String getPythonVersion(File python) } catch(IOException ex) { - if (versionOutput.length() > 0) _test.log("python --version > " + versionOutput); + if (!versionOutput.isEmpty()) _test.log("python --version > " + versionOutput); throw new RuntimeException("Unable to determine python version: " + python.getAbsolutePath(), ex); } } diff --git a/src/org/labkey/test/util/QuickBootstrapPseudoTest.java b/src/org/labkey/test/util/QuickBootstrapPseudoTest.java index ad7a4aa7e4..eca3f60605 100644 --- a/src/org/labkey/test/util/QuickBootstrapPseudoTest.java +++ b/src/org/labkey/test/util/QuickBootstrapPseudoTest.java @@ -2,12 +2,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.labkey.test.BaseWebDriverTest; import org.labkey.test.LabKeySiteWrapper; -import java.util.Arrays; -import java.util.List; - /** * Bootstrap a server without the initial user validation done by {@link LabKeySiteWrapper#signIn()} * Not actually a test. Just piggy-backing on the test harness to make it easier to run. diff --git a/src/org/labkey/test/util/RReportHelper.java b/src/org/labkey/test/util/RReportHelper.java index 94658ae524..e2a13b1d2b 100644 --- a/src/org/labkey/test/util/RReportHelper.java +++ b/src/org/labkey/test/util/RReportHelper.java @@ -237,7 +237,7 @@ public String ensureRConfig(boolean useDocker) _test.log("Check if R already is configured"); - String rVersion = null; + String rVersion; if (useDocker) { rVersion = RDOCKER; @@ -417,7 +417,7 @@ private String getRVersion(File r) } catch(IOException ex) { - if (versionOutput.length() > 0) + if (!versionOutput.isEmpty()) _test.log("R --version > " + versionOutput); throw new RuntimeException("Unable to determine R version: " + r.getAbsolutePath(), ex); } @@ -517,9 +517,6 @@ public void createRReport(String name, boolean shareView) /** * pre-condition: at folder that the report is to be created from - * @param reportName - * @param reportSource - * @param shareView * @return labkey-output content of report */ public String createAndRunRReport(String reportName, String reportSource, boolean shareView) diff --git a/src/org/labkey/test/util/SimpleHttpRequest.java b/src/org/labkey/test/util/SimpleHttpRequest.java index d2661989da..ec3962a0b4 100644 --- a/src/org/labkey/test/util/SimpleHttpRequest.java +++ b/src/org/labkey/test/util/SimpleHttpRequest.java @@ -230,7 +230,7 @@ private void useCopiedSession(HttpURLConnection con) if (cookie.getKey().equals(Connection.JSESSIONID)) con.setRequestProperty((String)cookie.getKey(), (String)cookie.getValue()); - if (cookieString.length() > 0) + if (!cookieString.isEmpty()) cookieString.append("; "); cookieString.append(cookie.getKey()); diff --git a/src/org/labkey/test/util/StudyHelper.java b/src/org/labkey/test/util/StudyHelper.java index d6fd05a75f..5ec816dfb6 100644 --- a/src/org/labkey/test/util/StudyHelper.java +++ b/src/org/labkey/test/util/StudyHelper.java @@ -201,7 +201,7 @@ public void editCustomParticipantGroup(String groupName, String participantStrin else { String currentIds = _test.getFormElement(Locator.xpath("//textarea[@name='participantIdentifiers']")); - if (currentIds != null && currentIds.length() > 0) + if (currentIds != null && !currentIds.isEmpty()) _test.setFormElement(Locator.xpath("//textarea[@name='participantIdentifiers']"), currentIds + "," + csp); } } @@ -636,11 +636,13 @@ public enum Panel implements IPanel this.labelColumn = labelColumn; } + @Override public String getPanelTitle() { return panelTitle; } + @Override public String getLabelColumn() { return labelColumn; diff --git a/src/org/labkey/test/util/SummaryStatisticsHelper.java b/src/org/labkey/test/util/SummaryStatisticsHelper.java index 21df669fce..18e748206c 100644 --- a/src/org/labkey/test/util/SummaryStatisticsHelper.java +++ b/src/org/labkey/test/util/SummaryStatisticsHelper.java @@ -61,8 +61,8 @@ public class SummaryStatisticsHelper )); } - private WebDriverWrapper _wrapper; - private boolean _hasPremiumModule; + private final WebDriverWrapper _wrapper; + private final boolean _hasPremiumModule; public SummaryStatisticsHelper(BaseWebDriverTest test) { diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index 071b7343fa..ef24d50be6 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -545,7 +545,7 @@ public static String randomDomainName(int numEndChars) */ public static String randomDomainName(@Nullable String namePart, int numEndChars) { - String domainName = ""; + String domainName; do { String firstChar = namePart != null ? namePart.charAt(0) + "" : randomString(1, null, ALPHANUMERIC_STRING); // domain needs to start with alphanumeric char; diff --git a/src/org/labkey/test/util/TestDataValidator.java b/src/org/labkey/test/util/TestDataValidator.java index 8d0bdb8efa..f7a641ebc4 100644 --- a/src/org/labkey/test/util/TestDataValidator.java +++ b/src/org/labkey/test/util/TestDataValidator.java @@ -50,7 +50,7 @@ public String enumerateMissingRows(List> rowMaps, List> matchingRows = findRowsWithMatchingColumnValues(row, ignoreColumns); - if (matchingRows.size()==0) + if (matchingRows.isEmpty()) { for (Object key : row.keySet()) { diff --git a/src/org/labkey/test/util/UIPermissionsHelper.java b/src/org/labkey/test/util/UIPermissionsHelper.java index a2f8c15e58..a362b07252 100644 --- a/src/org/labkey/test/util/UIPermissionsHelper.java +++ b/src/org/labkey/test/util/UIPermissionsHelper.java @@ -399,7 +399,7 @@ public Integer createPermissionsGroup(String groupName, String... memberNames) namesList.append(member).append("\n"); } - _driver.log("Adding [" + namesList.toString() + "] to group " + groupName + "..."); + _driver.log("Adding [" + namesList + "] to group " + groupName + "..."); addUserToGroupFromGroupScreen(namesList.toString()); enterPermissionsUI(); diff --git a/src/org/labkey/test/util/VagrantUtil.java b/src/org/labkey/test/util/VagrantUtil.java index ee0f93c911..910fea6224 100644 --- a/src/org/labkey/test/util/VagrantUtil.java +++ b/src/org/labkey/test/util/VagrantUtil.java @@ -134,7 +134,7 @@ private void processOutput(List output, Process p) } else if (!_outputPassthrough) { - if(output.size() > 0) + if(!output.isEmpty()) TestLogger.log(output.get(output.size() -1)); } } diff --git a/src/org/labkey/test/util/WebServicesUtil.java b/src/org/labkey/test/util/WebServicesUtil.java index 147a2bbb70..291730d1fe 100644 --- a/src/org/labkey/test/util/WebServicesUtil.java +++ b/src/org/labkey/test/util/WebServicesUtil.java @@ -51,13 +51,13 @@ static public void assertServicesAvailable(String hostIp, int... ports) comma = ", "; } } - if (sb.length() > 0) + if (!sb.isEmpty()) { sb.insert(0, "Could not connect to port(s): "); } } - assertTrue(sb.toString(), sb.length() == 0); + assertTrue(sb.toString(), sb.isEmpty()); } static public boolean isHostReachable(String hostIp) diff --git a/src/org/labkey/test/util/WikiHelper.java b/src/org/labkey/test/util/WikiHelper.java index 57bad98134..18daa35c73 100644 --- a/src/org/labkey/test/util/WikiHelper.java +++ b/src/org/labkey/test/util/WikiHelper.java @@ -28,7 +28,7 @@ public class WikiHelper { - private BaseWebDriverTest _test; + private final BaseWebDriverTest _test; public WikiHelper(BaseWebDriverTest test) { @@ -133,7 +133,7 @@ public void saveWikiPage() public void saveWikiPage(boolean expectSuccess) { String title = Locator.id("wiki-input-title").findElement(_test.getDriver()).getText(); - if (title.equals("")) title = Locator.id("wiki-input-name").findElement(_test.getDriver()).getText(); + if (title.isEmpty()) title = Locator.id("wiki-input-name").findElement(_test.getDriver()).getText(); if (expectSuccess) { _test.clickButton("Save & Close"); diff --git a/src/org/labkey/test/util/core/webdav/WebDavUtils.java b/src/org/labkey/test/util/core/webdav/WebDavUtils.java index e2c90f41a2..a7413211b4 100644 --- a/src/org/labkey/test/util/core/webdav/WebDavUtils.java +++ b/src/org/labkey/test/util/core/webdav/WebDavUtils.java @@ -43,7 +43,6 @@ private WebDavUtils() /** * Create a Sardine WebDav connection. Use a session key * @param user User email - * @return */ public static Sardine beginSardine(String user) { diff --git a/src/org/labkey/test/util/di/DataIntegrationHelper.java b/src/org/labkey/test/util/di/DataIntegrationHelper.java index b096d429ba..41a2d6980b 100644 --- a/src/org/labkey/test/util/di/DataIntegrationHelper.java +++ b/src/org/labkey/test/util/di/DataIntegrationHelper.java @@ -50,9 +50,9 @@ public class DataIntegrationHelper { private String _baseUrl = WebTestHelper.getBaseURL(); - private String _username = PasswordUtil.getUsername(); - private String _password = PasswordUtil.getPassword(); - private String _folderPath; + private final String _username = PasswordUtil.getUsername(); + private final String _password = PasswordUtil.getPassword(); + private final String _folderPath; public final static String DI_SCHEMA = "dataintegration"; public DataIntegrationHelper(String folderPath) @@ -68,7 +68,7 @@ public DataIntegrationHelper(String folderPath, String baseUrl) public SelectRowsResponse selectRows(String folderPath, String schemaName, String queryName) throws IOException, CommandException { - SelectRowsResponse rsp = null; + SelectRowsResponse rsp; Connection cn = new Connection(_baseUrl, _username, _password); SelectRowsCommand cmd = new SelectRowsCommand(schemaName, queryName); rsp = cmd.execute(cn, folderPath); @@ -77,7 +77,7 @@ public SelectRowsResponse selectRows(String folderPath, String schemaName, Strin public SelectRowsResponse executeQuery(String folderPath, String schemaName, String queryStatement) throws IOException, CommandException { - SelectRowsResponse exRsp = null; + SelectRowsResponse exRsp; Connection cn = new Connection(_baseUrl, _username, _password); ExecuteSqlCommand exCmd = new ExecuteSqlCommand(schemaName, queryStatement); exRsp = exCmd.execute(cn, folderPath); @@ -86,7 +86,7 @@ public SelectRowsResponse executeQuery(String folderPath, String schemaName, Str public SaveRowsResponse executeInsert(String folderPath, String schemaName, String tableName, Map rows) throws Exception { - SaveRowsResponse response = null; + SaveRowsResponse response; Connection cn = new Connection(_baseUrl, _username, _password); InsertRowsCommand insCmd = new InsertRowsCommand(schemaName, tableName); insCmd.addRow(rows); diff --git a/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java b/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java index a34266513a..e367505d9d 100644 --- a/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java +++ b/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java @@ -54,7 +54,6 @@ public static TestDataGenerator createEmptySampleType(String containerPath, Samp /** * A set of FieldDefinition provided for convenience - * @return */ public static List sampleTypeTestFields(boolean withFileField) { @@ -126,7 +125,6 @@ public static Map getSortedRowIdToSamplesMap(String containerPa * @param sampleTypeName The name of the sample type. * @param sampleNames A list of sample name you want to get the id's for. * @return A map of containing sample names and their corresponding row ids. - * @throws Exception Because this uses the Select Rows Command it can throw a few different type of exceptions. */ public static Map getRowIdsForSamples(String containerPath, String sampleTypeName, List sampleNames) throws IOException, CommandException { diff --git a/src/org/labkey/test/util/perf/JsonPerfScenarioHelper.java b/src/org/labkey/test/util/perf/JsonPerfScenarioHelper.java index b38308ee91..4334aa356f 100644 --- a/src/org/labkey/test/util/perf/JsonPerfScenarioHelper.java +++ b/src/org/labkey/test/util/perf/JsonPerfScenarioHelper.java @@ -1,13 +1,10 @@ package org.labkey.test.util.perf; -import org.labkey.remoteapi.Command; import org.labkey.remoteapi.CommandException; import org.labkey.remoteapi.CommandResponse; import org.labkey.remoteapi.Connection; import org.labkey.remoteapi.PostCommand; -import org.labkey.remoteapi.ResponseObject; import org.labkey.remoteapi.assay.ImportRunCommand; -import org.labkey.remoteapi.assay.ImportRunResponse; import org.labkey.remoteapi.miniprofiler.RequestInfo; import org.labkey.remoteapi.query.ImportDataCommand; import org.labkey.remoteapi.query.ImportDataResponse; From c15b42792adecbe304b3400f6829a802a3f56b44 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sun, 8 Jun 2025 16:25:49 -0700 Subject: [PATCH 2/5] Fix DomainDesignerTest, reduce usage of deprecated methods --- .../labkey/test/tests/DomainDesignerTest.java | 132 ++++++------------ .../test/tests/DomainFieldTypeChangeTest.java | 3 +- .../test/tests/EditMetadataDomainTest.java | 3 +- .../test/tests/SampleTypeLimitsTest.java | 3 +- .../tests/SampleTypeNameExpressionTest.java | 5 +- .../test/tests/SampleTypeRemoteAPITest.java | 14 +- .../labkey/test/tests/issues/IssuesTest.java | 14 +- src/org/labkey/test/tests/list/ListTest.java | 41 +++--- .../labkey/test/util/TestDataGenerator.java | 14 +- 9 files changed, 85 insertions(+), 144 deletions(-) diff --git a/src/org/labkey/test/tests/DomainDesignerTest.java b/src/org/labkey/test/tests/DomainDesignerTest.java index 3644727342..8e4cd16241 100644 --- a/src/org/labkey/test/tests/DomainDesignerTest.java +++ b/src/org/labkey/test/tests/DomainDesignerTest.java @@ -107,9 +107,7 @@ public void preTest() throws Exception public void testListNumericFormatting() throws Exception { String listName = "NumericFieldsList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) // just make the list + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) // just make the list .withColumns(List.of( new FieldDefinition("Number", FieldDefinition.ColumnType.Integer) )); @@ -136,7 +134,7 @@ public void testListNumericFormatting() throws Exception .setLabel("DecimalField"); domainDesignerPage.clickFinish(); - dgen = new TestDataGenerator(lookupInfo) // now put some test data in the new fields + dgen = new TestDataGenerator("lists", listName, getProjectName()) // now put some test data in the new fields .withColumns(List.of( new FieldDefinition("Key", FieldDefinition.ColumnType.Integer), new FieldDefinition("integerField", FieldDefinition.ColumnType.Integer) @@ -170,9 +168,7 @@ public void testListNumericFormatting() throws Exception public void testSampleStringFields() throws Exception { String sampleType = "StringSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("stringField", FieldDefinition.ColumnType.String), @@ -216,9 +212,8 @@ public void testSampleStringFields() throws Exception public void testDeleteDomainField() throws Exception { String sampleType = "deleteColumnSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("deleteMe", FieldDefinition.ColumnType.String) @@ -265,8 +260,7 @@ public void testInvalidLookupDomainField() throws IOException, CommandException _listHelper.createList(getProjectName(), "anotherList", "Id"); log("Creating a sample type with look up field to above list"); - FieldDefinition.LookupInfo lookupInfo1 = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo1) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String))); @@ -318,9 +312,8 @@ public void testInvalidLookupDomainField() throws IOException, CommandException public void testAddDomainField() throws Exception { String sampleType = "addColumnSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String))); dgen.createDomain(createDefaultConnection(), SAMPLE_TYPE_DOMAIN_KIND); @@ -365,8 +358,7 @@ public void testBlankNameFieldOnAddedField() throws Exception { String sampleType = "errorColumnSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("firstCol", FieldDefinition.ColumnType.String))); @@ -403,8 +395,7 @@ public void testDuplicateFieldName() throws Exception { String sampleType = "errorDuplicateFieldSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("firstCol", FieldDefinition.ColumnType.String))); @@ -443,8 +434,7 @@ public void testUserCannotEditListKeyFields() throws Exception { String list = "testUserCannotEditKeyFieldsList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", list); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", list, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("firstCol", FieldDefinition.ColumnType.String))); @@ -467,8 +457,7 @@ public void testDeleteFieldInListWithData() throws Exception { String list = "testDeleteFieldList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", list); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", list, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String))); @@ -504,8 +493,7 @@ public void testDeleteRequiredField() throws Exception String list = "testDeleteRequiredFieldList"; // create the list - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", list); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", list, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String) .setRequired(true), // <-- marked 'required' @@ -535,8 +523,7 @@ public void testDeleteNewField() throws Exception String list = "testDeleteNewFieldList"; // create the list with no fields to start - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", list); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo); + TestDataGenerator dgen = new TestDataGenerator("lists", list, getProjectName()); dgen.createDomain(createDefaultConnection(), "IntList", Map.of("keyName", "id")); // go to the new domain designer and do some work here @@ -561,8 +548,7 @@ public void testConfirmNameFieldFromSampleTypeNotShown() throws Exception { String sampleType = "hiddenNameFieldSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("firstCol", FieldDefinition.ColumnType.String))); @@ -582,8 +568,7 @@ public void testFieldNameErrors() throws Exception { String sampleType = "fieldsWithReservedNamesSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("firstCol", FieldDefinition.ColumnType.String))); @@ -630,8 +615,7 @@ public void verifySavedFieldCannotBeRenamedReservedName() throws Exception { String sampleType = "renameColToReservedNameTest"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -671,8 +655,7 @@ public void showHideFieldOnDefaultGridView() throws Exception { String sampleType = "showFieldOnDefaultGridViewSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -703,8 +686,7 @@ public void showHideFieldOnInsertGridView() throws Exception { String sampleType = "showFieldOnInsertGridViewSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -736,8 +718,7 @@ public void showHideFieldOnUpdateForm() throws Exception { String sampleType = "showFieldOnUpdateForm"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -770,8 +751,7 @@ public void setPhiLevel() throws Exception { String sampleType = "phiLevelSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -814,8 +794,7 @@ public void setMissingValue() throws Exception { String sampleType = "setMissingValueTest"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -844,8 +823,7 @@ public void setFieldAsDimension() throws Exception { String sampleType = "setFieldAsDimension"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -873,8 +851,7 @@ public void setFieldAsMeasure() throws Exception { String sampleType = "setFieldAsMeasure"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -903,8 +880,7 @@ public void setFieldAsVariable() throws Exception { String sampleType = "setFieldAsVariable"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -933,15 +909,13 @@ public void testLookUpFieldSampleType() throws IOException, CommandException String sampleType = "setFieldAsLookup"; String listName = "lookUpList1"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen1 = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen1 = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String))); DomainResponse createResponse = dgen1.createDomain(createDefaultConnection(), "IntList", Map.of("keyName", "id")); - FieldDefinition.LookupInfo lookupInfo1 = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo1) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("extraField", FieldDefinition.ColumnType.String), @@ -967,7 +941,7 @@ public void testLookUpFieldSampleType() throws IOException, CommandException Connection cn = createDefaultConnection(); DomainDetailsResponse domainResponse = dgen.getQueryHelper(cn).getDomainDetails(); PropertyDescriptor lookupFieldDescriptor = getColumn(domainResponse.getDomain(), "lookUpField"); - assertEquals("lookUpField from folder is incorrect", null, lookupFieldDescriptor.getAllProperties().get("lookupContainer")); + assertNull("lookUpField from folder is incorrect", lookupFieldDescriptor.getAllProperties().get("lookupContainer")); assertEquals("lookUpField schema name is incorrect", "lists", lookupFieldDescriptor.getAllProperties().get("lookupSchema")); assertEquals("lookUpField target table is incorrect", listName, lookupFieldDescriptor.getAllProperties().get("lookupQuery")); @@ -979,15 +953,13 @@ public void testLookUpFieldList() throws IOException, CommandException String mainListName = "setFieldAsLookupinList"; String lookUplistName = "lookUpList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", lookUplistName); - TestDataGenerator dgen1 = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen1 = new TestDataGenerator("lists", lookUplistName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String))); DomainResponse createResponse = dgen1.createDomain(createDefaultConnection(), "IntList", Map.of("keyName", "id")); - FieldDefinition.LookupInfo lookupInfo1 = new FieldDefinition.LookupInfo(getProjectName(), "lists", mainListName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo1) + TestDataGenerator dgen = new TestDataGenerator("lists", mainListName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("testCol", FieldDefinition.ColumnType.String))); @@ -1021,16 +993,14 @@ public void testLookUpFieldList() throws IOException, CommandException public void testLookupPropertyValidator() throws Exception { String listName = "lookupValidatorTestList"; // this is the main list - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String))); DomainResponse createResponse = dgen.createDomain(createDefaultConnection(), "IntList", Map.of("keyName", "id")); String listName1 = "lookupValidatorLookupList"; // this list will contain lookup values String lookupList1Item = listName1 + " (Integer)"; - FieldDefinition.LookupInfo lookupInfo1 = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName1); - TestDataGenerator dgen1 = new TestDataGenerator(lookupInfo1) + TestDataGenerator dgen1 = new TestDataGenerator("lists", listName1, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String))); @@ -1064,8 +1034,7 @@ public void testLookupPropertyValidator() throws Exception public void testDefaultValues() throws Exception { String listName = "defaultValuesTestList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String))); @@ -1109,8 +1078,7 @@ public void verifyExpectedWarningOnNavigateWithUncomittedChanges() throws Except String homeUrl = getDriver().getCurrentUrl(); String listName = "dirtyListNavigationTest"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("favoriteIceCream", FieldDefinition.ColumnType.String), @@ -1167,8 +1135,7 @@ public void testUserWarningOnRequiredFieldWithEmptyValues() throws Exception { String sampleTypeName = "hasRowsWithBlankValuesWarnSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleTypeName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleTypeName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String), @@ -1205,8 +1172,7 @@ public void testMarkFieldRequired() throws Exception { String sampleTypeName = "testSampleTypeWithRequiredField"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleTypeName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleTypeName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("color", FieldDefinition.ColumnType.String), @@ -1244,8 +1210,7 @@ public void verifyNameFieldClickExpandsRow() throws Exception { String listName = "sillyListJustHereForTestPurposes"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen1 = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen1 = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("favoriteIceCream", FieldDefinition.ColumnType.String), @@ -1267,8 +1232,7 @@ public void testRangeValidator() throws Exception { String listName = "listForRangeValidator"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("favoriteIceCream", FieldDefinition.ColumnType.String), @@ -1303,8 +1267,7 @@ public void testConditionalFormat() throws Exception { String listName = "conditionalFormatList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("favoriteIceCream", FieldDefinition.ColumnType.String), @@ -1342,8 +1305,7 @@ public void testRegexValidator() throws Exception { String listName = "regexValidatorList"; String fieldNameWithReg = "favoriteSnack"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("favoriteIceCream", FieldDefinition.ColumnType.String), @@ -1403,8 +1365,7 @@ public void addUpdateRemoveRegexValidator() throws Exception { String listName = "regexCrudList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("favoriteSnack", FieldDefinition.ColumnType.String))); @@ -1490,8 +1451,7 @@ public void addUpdateRemoveRangeValidator() throws Exception { String listName = "rangeValidatorCrudList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("size", FieldDefinition.ColumnType.Integer))); @@ -1556,8 +1516,7 @@ public void addUpdateRemoveConditionalFormat() throws Exception { String listName = "conditionalFormatCrudList"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("superHero", FieldDefinition.ColumnType.String))); @@ -1624,9 +1583,8 @@ public void testExportImportListFields() throws Exception String listName = "exportFieldsTestList"; // create a list - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); List fields = importExportTestFields(); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(fields); // collect the fields from the server response List createdFields = dgen.createList(createDefaultConnection(), "Key") @@ -1675,10 +1633,9 @@ public void testFileImportFieldsToNewSampleType() throws Exception { String sampleType = "importFieldsTestSampleType"; - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", sampleType); List fields = importExportTestFields(); fields.add(new FieldDefinition("name", FieldDefinition.ColumnType.String)); // need to add a 'name' field to a sampletype - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", sampleType, getProjectName()) .withColumns(fields); // get the fields from the server after creating the sampletype on the server List createdFields = dgen.createDomain(createDefaultConnection(), "SampleSet") @@ -1736,9 +1693,8 @@ public void testImportListFieldsToNonList() throws Exception String listName = "listForFieldImportKeyTest"; // create a list - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); List fields = importExportTestFields(); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(fields); // collect the fields from the server response List createdFields = dgen.createList(createDefaultConnection(), "Key") diff --git a/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java b/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java index 304a24d4e7..267cb964ba 100644 --- a/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java +++ b/src/org/labkey/test/tests/DomainFieldTypeChangeTest.java @@ -61,8 +61,7 @@ public void testProvisionedDomainFieldChanges() throws IOException, CommandExcep String listName = "SampleListWithAllDataTypes"; log("Creating list with variety of data fields"); - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("testInteger", FieldDefinition.ColumnType.Integer), diff --git a/src/org/labkey/test/tests/EditMetadataDomainTest.java b/src/org/labkey/test/tests/EditMetadataDomainTest.java index 2384463771..930d02495f 100644 --- a/src/org/labkey/test/tests/EditMetadataDomainTest.java +++ b/src/org/labkey/test/tests/EditMetadataDomainTest.java @@ -44,8 +44,7 @@ private void doSetup() throws IOException, CommandException new PortalHelper(getDriver()).addBodyWebPart("Lists"); log("Creating a sample list"); - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(List.of( new FieldDefinition("name", FieldDefinition.ColumnType.String), new FieldDefinition("firstCol", FieldDefinition.ColumnType.String))); diff --git a/src/org/labkey/test/tests/SampleTypeLimitsTest.java b/src/org/labkey/test/tests/SampleTypeLimitsTest.java index 3911dd5f7d..5ed02fbb0f 100644 --- a/src/org/labkey/test/tests/SampleTypeLimitsTest.java +++ b/src/org/labkey/test/tests/SampleTypeLimitsTest.java @@ -77,8 +77,7 @@ private void doSetup() log("Creating the sample type of 10000 samples"); try { - FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", SAMPLE_TYPE_NAME); - TestDataGenerator dgen = new TestDataGenerator(lookupInfo) + TestDataGenerator dgen = new TestDataGenerator("exp.materials", SAMPLE_TYPE_NAME, getProjectName()) .withColumns(List.of( TestDataGenerator.simpleFieldDef("name", FieldDefinition.ColumnType.String), TestDataGenerator.simpleFieldDef("label", FieldDefinition.ColumnType.String))); diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java index 96b69d6547..9fca4cba34 100644 --- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java +++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java @@ -452,12 +452,11 @@ public void testParentAliasExpression() public void testLookupNameExpression() throws Exception { String lookupList = "Colors"; - FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.LookupInfo(getProjectName(), "lists", lookupList) - .setTableType(FieldDefinition.ColumnType.Integer); + FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.IntLookup("lists", lookupList, getProjectName()); String nameExpSamples = "NameExpressionSamples"; // begin by creating a lookupList of colors, the sampleType will reference it - TestDataGenerator colorsGen = new TestDataGenerator(colorsLookup) + TestDataGenerator colorsGen = new TestDataGenerator("lists", lookupList, getProjectName()) .withColumns(List.of(new FieldDefinition("ColorName", FieldDefinition.ColumnType.String), new FieldDefinition("ColorCode", FieldDefinition.ColumnType.String))); colorsGen.addCustomRow(Map.of("ColorName", "green", "ColorCode", "gr")); diff --git a/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java b/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java index 008540b420..9ca537308a 100644 --- a/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java +++ b/src/org/labkey/test/tests/SampleTypeRemoteAPITest.java @@ -455,8 +455,7 @@ public void insertSamplesOverSaveBatchAPI() throws Exception String assaySubfolder = "TestAssayFolder"; String assayName = "AssayForSampleDerivation"; generateAssay(assaySubfolder, assayName); - List dataGenerators = generateAssayData(new FieldDefinition.LookupInfo(getProjectName() + "/" + assaySubfolder, - "assay.General.AssayForSampleDerivation_assay", "Runs")); + List dataGenerators = generateAssayData("assay.General.AssayForSampleDerivation_assay", "Runs", getProjectName() + "/" + assaySubfolder); insertAssayData(assayName, dataGenerators); // get the sampleID, it will be needed later @@ -591,8 +590,7 @@ public void deriveSamplesOverSaveBatchAPI() throws Exception String assaySubfolder = "DeriveAssayFolder"; String assayName = "AssayForSaveBatchDerivation"; generateAssay(assaySubfolder, assayName); - List dataGenerators = generateAssayData(new FieldDefinition.LookupInfo(getProjectName() + "/" + assaySubfolder, - "assay.General.AssayForSaveBatchDerivation_assay", "Runs")); + List dataGenerators = generateAssayData("assay.General.AssayForSaveBatchDerivation_assay", "Runs", getProjectName() + "/" + assaySubfolder); insertAssayData(assayName, dataGenerators); // get the sampleID, it will be needed later @@ -721,7 +719,7 @@ private void generateAssay(String subfolderName, String assayName) * generates data (runs) for the gpat assay used by tests in this class. * @param assayLookup : specifies the container, schema, name of the assay's run table */ - private List generateAssayData(FieldDefinition.LookupInfo assayLookup) + private List generateAssayData(String schema, String table, String containerPath) { List resultsFieldset = List.of( new FieldDefinition("ParticipantID",FieldDefinition.ColumnType.String), @@ -729,21 +727,21 @@ private List generateAssayData(FieldDefinition.LookupInfo ass new FieldDefinition("SampleName", FieldDefinition.ColumnType.String), new FieldDefinition("SampleVolume", FieldDefinition.ColumnType.DateAndTime)); - TestDataGenerator dgen1 = new TestDataGenerator(assayLookup) + TestDataGenerator dgen1 = new TestDataGenerator(schema, table, containerPath) .withColumns(resultsFieldset) .addCustomRow(Map.of("ParticipantID", "Jeff", "Date", "11/11/2018", "SampleName", "Green", "SampleVolume", 12.5)) .addCustomRow(Map.of("ParticipantID", "Jim", "Date", "11/12/2018", "SampleName", "Red", "SampleVolume", 14.5)) .addCustomRow(Map.of("ParticipantID", "Billy", "Date", "11/13/2018", "SampleName", "Yellow", "SampleVolume", 17.5)) .addCustomRow(Map.of("ParticipantID", "Michael", "Date", "11/14/2018", "SampleName", "Orange", "SampleVolume", 11.5)); - TestDataGenerator dgen2 = new TestDataGenerator(assayLookup) + TestDataGenerator dgen2 = new TestDataGenerator(schema, table, containerPath) .withColumns(resultsFieldset) .addCustomRow(Map.of("ParticipantID", "Harry", "Date", "10/11/2018", "SampleName", "Green", "SampleVolume", 12.5)) .addCustomRow(Map.of("ParticipantID", "William", "Date", "10/12/2018", "SampleName", "Red", "SampleVolume", 14.5)) .addCustomRow(Map.of("ParticipantID", "Jenny", "Date", "10/13/2018", "SampleName", "Yellow", "SampleVolume", 17.5)) .addCustomRow(Map.of("ParticipantID", "Hermione", "Date", "10/14/2018", "SampleName", "Orange", "SampleVolume", 11.5)); - TestDataGenerator dgen3 = new TestDataGenerator(assayLookup) + TestDataGenerator dgen3 = new TestDataGenerator(schema, table, containerPath) .withColumns(resultsFieldset) .addCustomRow(Map.of("ParticipantID", "George", "Date", "10/11/2018", "SampleName", "Green", "SampleVolume", 12.5)) .addCustomRow(Map.of("ParticipantID", "Arthur", "Date", "10/12/2018", "SampleName", "Red", "SampleVolume", 14.5)) diff --git a/src/org/labkey/test/tests/issues/IssuesTest.java b/src/org/labkey/test/tests/issues/IssuesTest.java index 68c5965a93..5f347e2fac 100644 --- a/src/org/labkey/test/tests/issues/IssuesTest.java +++ b/src/org/labkey/test/tests/issues/IssuesTest.java @@ -249,18 +249,18 @@ public void generalTest() throws Exception fields.add(new FieldDefinition("MyInteger", FieldDefinition.ColumnType.Integer)); fields.add(new FieldDefinition("MySecondInteger", FieldDefinition.ColumnType.Integer)); - fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "MyFirstString")))); + fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFirstString"), null))); fields.add(new FieldDefinition("MyThirdString", FieldDefinition.ColumnType.String)); fields.add(new FieldDefinition("MyFourthString", FieldDefinition.ColumnType.String)); - fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "MyFifthString")))); + fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFifthString"), null))); - fields.add(new FieldDefinition("Client", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Client")))); - fields.add(new FieldDefinition("UserStory", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "UserStory")))); + fields.add(new FieldDefinition("Client", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Client"), null))); + fields.add(new FieldDefinition("UserStory", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "UserStory"), null))); fields.add(new FieldDefinition("SupportTicket", FieldDefinition.ColumnType.Integer)); fields.add(new FieldDefinition("TeamCity", FieldDefinition.ColumnType.String).setLabel("TeamCity Note")); - fields.add(new FieldDefinition("Triage", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Triage")))); - fields.add(new FieldDefinition("Note", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Note")))); - fields.add(new FieldDefinition("Module", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Module")))); + fields.add(new FieldDefinition("Triage", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Triage"), null))); + fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Note"), null))); + fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Module"), null))); clickProject(getProjectName()); waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME)); diff --git a/src/org/labkey/test/tests/list/ListTest.java b/src/org/labkey/test/tests/list/ListTest.java index 1bcac723db..e12df2a166 100644 --- a/src/org/labkey/test/tests/list/ListTest.java +++ b/src/org/labkey/test/tests/list/ListTest.java @@ -49,7 +49,6 @@ import org.labkey.test.pages.list.EditListDefinitionPage; import org.labkey.test.pages.list.GridPage; import org.labkey.test.params.FieldDefinition; -import org.labkey.test.params.FieldDefinition.LookupInfo; import org.labkey.test.params.FieldDefinition.StringLookup; import org.labkey.test.tests.AuditLogTest; import org.labkey.test.util.AbstractDataRegionExportOrSignHelper.ColumnHeaderType; @@ -169,7 +168,7 @@ public class ListTest extends BaseWebDriverTest private final static ColumnType LIST3_KEY_TYPE = ColumnType.String; private final static String LIST3_KEY_NAME = "Owner"; private final FieldDefinition _list3Col2 = new FieldDefinition("Wealth", ColumnType.String); - protected final FieldDefinition _list3Col1 = new FieldDefinition(LIST3_KEY_NAME, new LookupInfo("/" + PROJECT_OTHER, "lists", LIST3_NAME_OWNERS).setTableType(ColumnType.String)).setDescription("Who owns the car"); + protected final FieldDefinition _list3Col1 = new FieldDefinition(LIST3_KEY_NAME, new StringLookup("lists", LIST3_NAME_OWNERS, "/" + PROJECT_OTHER)).setDescription("Who owns the car"); private final static String LIST3_COL2 = "Rich"; private final String LIST2_DATA = LIST2_KEY_NAME + "\t" + LIST_KEY_NAME2_BULK + "\t" + LIST3_KEY_NAME + "\n" + @@ -509,7 +508,7 @@ public void testNameTrimming() /* Issue 51572: Bug with creating a new list by uploading a csv file in "UTF-8 with BOM" format */ @Test - public void testCreateListWithBOMFile() throws IOException + public void testCreateListWithBOMFile() { String listName = TestDataGenerator.randomDomainName("From BOM File", 4); File bomFile = TestFileUtils.getSampleData("lists/TestUTF8_BOM.csv"); @@ -870,8 +869,7 @@ public void testAddListColumnOverRemoteAPI() throws Exception new FieldDefinition("dewey", ColumnType.Decimal) ); String listName = "remoteApiListTestAddColumn"; - LookupInfo info = new LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(info) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(cols); DomainResponse createResponse = dgen.createList(createDefaultConnection(), "key"); Domain listDomain = createResponse.getDomain(); @@ -880,9 +878,9 @@ public void testAddListColumnOverRemoteAPI() throws Exception listDomain.setFields(listFields); // now save with an extra field - SaveDomainCommand saveCmd = new SaveDomainCommand(info.getSchema(), info.getTable()); + SaveDomainCommand saveCmd = new SaveDomainCommand(dgen.getSchema(), dgen.getQueryName()); saveCmd.setDomainDesign(listDomain); - DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), info.getFolder()); + DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), dgen.getContainerPath()); // now verify assertEquals(listFields.size(), saveResponse.getDomain().getFields().size()); @@ -905,8 +903,7 @@ public void testRemoveColumnOverAPI() throws Exception new FieldDefinition("removeMe", ColumnType.Decimal) ); String listName = "remoteApiListTestRemoveColumn"; - LookupInfo info = new LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(info) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(cols); DomainResponse createResponse = dgen.createList(createDefaultConnection(), "key"); Domain listDomain = createResponse.getDomain(); @@ -914,9 +911,9 @@ public void testRemoveColumnOverAPI() throws Exception listFields.removeIf(a-> a.getName().equals("removeMe")); listDomain.setFields(listFields); - SaveDomainCommand saveCmd = new SaveDomainCommand(info.getSchema(), info.getTable()); + SaveDomainCommand saveCmd = new SaveDomainCommand(dgen.getSchema(), dgen.getQueryName()); saveCmd.setDomainDesign(listDomain); - DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), info.getFolder()); + DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), dgen.getContainerPath()); checker().verifyFalse("'removeMe' field was not deleted.", saveResponse.getDomain().getFields().stream() @@ -932,8 +929,7 @@ public void testChangeListNameOverAPI() throws Exception new FieldDefinition("dewey", ColumnType.Decimal) ); String listName = "remoteAPIBeforeRename"; - LookupInfo info = new LookupInfo(getProjectName(), "lists", listName); - TestDataGenerator dgen = new TestDataGenerator(info) + TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName()) .withColumns(cols); DomainResponse createResponse = dgen.createList(createDefaultConnection(), "key"); Domain listDomain = createResponse.getDomain(); @@ -941,7 +937,7 @@ public void testChangeListNameOverAPI() throws Exception SaveDomainCommand saveCmd = new SaveDomainCommand(listDomain.getDomainId()); saveCmd.setDomainDesign(listDomain); - DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), info.getFolder()); + DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), dgen.getContainerPath()); assertEquals("remoteAPIAfterRename", saveResponse.getDomain().getName()); } @@ -994,7 +990,6 @@ public void listSelfJoinTest() final String dummyCol = dummyBase + TRICKY_CHARACTERS; final String lookupField = "lookupField" + TRICKY_CHARACTERS; final String lookupSchema = "lists"; - final String lookupTable = listName; final String keyCol = "Key &%<+"; log("Issue 6883: test list self join"); @@ -1003,7 +998,7 @@ public void listSelfJoinTest() new FieldDefinition(dummyCol, ColumnType.String) }; FieldDefinition lookupCol = new FieldDefinition(lookupField, - new LookupInfo(null, lookupSchema, lookupTable).setTableType(ColumnType.Integer)); + new FieldDefinition.IntLookup(lookupSchema, listName, null)); // create the list _listHelper.createList(PROJECT_VERIFY, listName, keyCol, columns); // now add the lookup column (which references the new table) @@ -1036,7 +1031,7 @@ private void crossContainerLookupTest() goToProjectHome(PROJECT_OTHER); //create list with look up A String lookupColumn = "lookup"; - FieldDefinition[] cols = new FieldDefinition[]{col(PROJECT_VERIFY, lookupColumn, ColumnType.Integer, "A" )}; + FieldDefinition[] cols = new FieldDefinition[]{col(PROJECT_VERIFY, lookupColumn, "A" )}; _listHelper.createList(PROJECT_OTHER, crossContainerLookupList, "Key", cols); _listHelper.goToList(crossContainerLookupList); _listHelper.clickImportData(); @@ -1880,14 +1875,14 @@ FieldDefinition col(String name, ColumnType type) return new FieldDefinition(name, type); } - FieldDefinition col(String name, ColumnType type, String table) + FieldDefinition col(String name, String table) { - return col(null, name, type, table); + return col(null, name, table); } - FieldDefinition col(String folder, String name, ColumnType type, String table) + FieldDefinition col(String folder, String name, String table) { - return new FieldDefinition(name, new LookupInfo(folder, "lists", table).setTableType(type)); + return new FieldDefinition(name, new FieldDefinition.IntLookup("lists", table, folder)); } FieldDefinition colURL(String name, ColumnType type, String url) @@ -1898,7 +1893,7 @@ FieldDefinition colURL(String name, ColumnType type, String url) List Acolumns = Arrays.asList( col("A", ColumnType.Integer), colURL("title", ColumnType.String, "/junit/echoForm.view?key=${A}&title=${title}&table=A"), - col("Bfk", ColumnType.Integer, "B") + col("Bfk", "B") ); String[][] Adata = new String[][] { @@ -1908,7 +1903,7 @@ FieldDefinition colURL(String name, ColumnType type, String url) List Bcolumns = Arrays.asList( col("B", ColumnType.Integer), colURL("title", ColumnType.String, "org.labkey.core.junit.JunitController$EchoFormAction.class?key=${B}&title=${title}&table=B"), - col("Cfk", ColumnType.Integer, "C") + col("Cfk", "C") ); String[][] Bdata = new String[][] { diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index ef24d50be6..ccc16975c5 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -110,15 +110,6 @@ public TestDataGenerator(String schema, String queryName, String containerPath) _containerPath = containerPath; } - /** - * @deprecated This isn't actually a lookup - */ - @Deprecated (since = "22.4") - public TestDataGenerator(FieldDefinition.LookupInfo lookupInfo) - { - this(lookupInfo.getSchema(), lookupInfo.getTable(), lookupInfo.getFolder()); - } - public static File writeCsvFile(List fields, List> entityData, String fileName) throws IOException { List> rows = TestDataUtils.replaceColumnHeaders( @@ -261,6 +252,11 @@ public String getQueryName() return _queryName; } + public String getContainerPath() + { + return _containerPath; + } + public void setExcludedChars(String excludedChars) { _excludedChars = excludedChars; From f01937d12d848da9b57fdde7d45dad7003ffa6d7 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sun, 8 Jun 2025 18:44:52 -0700 Subject: [PATCH 3/5] Update expected texts --- src/org/labkey/test/tests/BasicTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/BasicTest.java b/src/org/labkey/test/tests/BasicTest.java index e90f67adee..0c9f1a1dcb 100644 --- a/src/org/labkey/test/tests/BasicTest.java +++ b/src/org/labkey/test/tests/BasicTest.java @@ -70,10 +70,10 @@ public void testStartupLogging() // Issue 52684: Ensure Log4J is capturing startup logging from: assertTextPresent( - "Starting LabKeyServer using", // Our "embedded" code (the primary entry point) + "Starting LabKeyServer ", // Our "embedded" code (the primary entry point) "Starting Servlet engine", // Spring Boot and Tomcat "Exploding module archives", // Our "bootstrap" code (extracts modules and sets up webapp classloading) - "LabKey-managed modules to ensure they're recent enough to upgrade" // Our code inside the webapp + "Deploying to context path" // Our code inside the webapp ); } From e35596742889f55ab91668be4c0d82a26daa9c5d Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 9 Jun 2025 09:10:21 -0700 Subject: [PATCH 4/5] Fix argument order --- src/org/labkey/test/tests/issues/IssuesTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/labkey/test/tests/issues/IssuesTest.java b/src/org/labkey/test/tests/issues/IssuesTest.java index 5f347e2fac..725bb30629 100644 --- a/src/org/labkey/test/tests/issues/IssuesTest.java +++ b/src/org/labkey/test/tests/issues/IssuesTest.java @@ -249,18 +249,18 @@ public void generalTest() throws Exception fields.add(new FieldDefinition("MyInteger", FieldDefinition.ColumnType.Integer)); fields.add(new FieldDefinition("MySecondInteger", FieldDefinition.ColumnType.Integer)); - fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFirstString"), null))); + fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "MyFirstString")))); fields.add(new FieldDefinition("MyThirdString", FieldDefinition.ColumnType.String)); fields.add(new FieldDefinition("MyFourthString", FieldDefinition.ColumnType.String)); - fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFifthString"), null))); + fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.StringLookup(null, getLookupTableName("issues", "MyFifthString")))); - fields.add(new FieldDefinition("Client", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Client"), null))); - fields.add(new FieldDefinition("UserStory", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "UserStory"), null))); + fields.add(new FieldDefinition("Client", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Client")))); + fields.add(new FieldDefinition("UserStory", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "UserStory")))); fields.add(new FieldDefinition("SupportTicket", FieldDefinition.ColumnType.Integer)); fields.add(new FieldDefinition("TeamCity", FieldDefinition.ColumnType.String).setLabel("TeamCity Note")); - fields.add(new FieldDefinition("Triage", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Triage"), null))); - fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Note"), null))); - fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Module"), null))); + fields.add(new FieldDefinition("Triage", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Triage")))); + fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Note")))); + fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Module")))); clickProject(getProjectName()); waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME)); From 7424dcc088c65d65d5d073f76a64a856d52cd35d Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 9 Jun 2025 14:03:52 -0700 Subject: [PATCH 5/5] Remove unnecessary overrides and fix lookup parameter order --- .../test/components/domain/DetailPopover.java | 6 ------ .../test/components/react/QueryChartPanel.java | 6 ------ .../test/components/react/SelectInputOption.java | 7 ------- .../ui/files/FileAttachmentContainer.java | 6 ------ .../components/ui/files/FileAttachmentEntry.java | 6 ------ src/org/labkey/test/tests/issues/IssuesTest.java | 14 +++++++------- src/org/labkey/test/tests/list/ListTest.java | 6 +++--- 7 files changed, 10 insertions(+), 41 deletions(-) diff --git a/src/org/labkey/test/components/domain/DetailPopover.java b/src/org/labkey/test/components/domain/DetailPopover.java index c720ddd6e5..f738086115 100644 --- a/src/org/labkey/test/components/domain/DetailPopover.java +++ b/src/org/labkey/test/components/domain/DetailPopover.java @@ -69,12 +69,6 @@ protected ElementCache newElementCache() return new ElementCache(); } - @Override - protected ElementCache elementCache() - { - return super.elementCache(); - } - protected class ElementCache extends Component.ElementCache { public WebElement popover = Locator.tagWithClass("div", "header-details-hover") diff --git a/src/org/labkey/test/components/react/QueryChartPanel.java b/src/org/labkey/test/components/react/QueryChartPanel.java index 4711e99b31..6f4b856508 100644 --- a/src/org/labkey/test/components/react/QueryChartPanel.java +++ b/src/org/labkey/test/components/react/QueryChartPanel.java @@ -82,12 +82,6 @@ protected ElementCache newElementCache() return new ElementCache(); } - @Override - protected ElementCache elementCache() - { - return super.elementCache(); - } - protected class ElementCache extends Component.ElementCache { public final WebElement headingEl = Locator.tagWithClass("div", "chart-panel__heading") diff --git a/src/org/labkey/test/components/react/SelectInputOption.java b/src/org/labkey/test/components/react/SelectInputOption.java index 664831fb31..4645fe2a2d 100644 --- a/src/org/labkey/test/components/react/SelectInputOption.java +++ b/src/org/labkey/test/components/react/SelectInputOption.java @@ -61,13 +61,6 @@ protected ElementCache newElementCache() return new ElementCache(); } - @Override - protected ElementCache elementCache() - { - return super.elementCache(); - } - - protected class ElementCache extends Component.ElementCache { public Locator.XPathLocator fieldLabelLoc = Locator.tagWithClass("span", "identifying_field_label"); diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java index ab84872260..bb6acebe86 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java @@ -46,12 +46,6 @@ protected ElementCache newElementCache() return new ElementCache(); } - @Override - protected ElementCache elementCache() - { - return super.elementCache(); - } - public boolean isMulti() { return elementCache().fileInput.getComponentElement().getAttribute("multiple") != null; diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java b/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java index 69518191f5..fc30dd8cc6 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java @@ -65,12 +65,6 @@ protected ElementCache newElementCache() return new ElementCache(); } - @Override - protected ElementCache elementCache() - { - return super.elementCache(); - } - protected class ElementCache extends Component.ElementCache { public Locator removeIconLoc = Locator.byClass("attached-file__remove-icon"); diff --git a/src/org/labkey/test/tests/issues/IssuesTest.java b/src/org/labkey/test/tests/issues/IssuesTest.java index 725bb30629..6c749c14af 100644 --- a/src/org/labkey/test/tests/issues/IssuesTest.java +++ b/src/org/labkey/test/tests/issues/IssuesTest.java @@ -249,18 +249,18 @@ public void generalTest() throws Exception fields.add(new FieldDefinition("MyInteger", FieldDefinition.ColumnType.Integer)); fields.add(new FieldDefinition("MySecondInteger", FieldDefinition.ColumnType.Integer)); - fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "MyFirstString")))); + fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFirstString")))); fields.add(new FieldDefinition("MyThirdString", FieldDefinition.ColumnType.String)); fields.add(new FieldDefinition("MyFourthString", FieldDefinition.ColumnType.String)); - fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.StringLookup(null, getLookupTableName("issues", "MyFifthString")))); + fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFifthString")))); - fields.add(new FieldDefinition("Client", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Client")))); - fields.add(new FieldDefinition("UserStory", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "UserStory")))); + fields.add(new FieldDefinition("Client", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Client")))); + fields.add(new FieldDefinition("UserStory", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "UserStory")))); fields.add(new FieldDefinition("SupportTicket", FieldDefinition.ColumnType.Integer)); fields.add(new FieldDefinition("TeamCity", FieldDefinition.ColumnType.String).setLabel("TeamCity Note")); - fields.add(new FieldDefinition("Triage", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Triage")))); - fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Note")))); - fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup(null, "lists", getLookupTableName("issues", "Module")))); + fields.add(new FieldDefinition("Triage", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Triage")))); + fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Note")))); + fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Module")))); clickProject(getProjectName()); waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME)); diff --git a/src/org/labkey/test/tests/list/ListTest.java b/src/org/labkey/test/tests/list/ListTest.java index e12df2a166..2e415164f2 100644 --- a/src/org/labkey/test/tests/list/ListTest.java +++ b/src/org/labkey/test/tests/list/ListTest.java @@ -168,7 +168,7 @@ public class ListTest extends BaseWebDriverTest private final static ColumnType LIST3_KEY_TYPE = ColumnType.String; private final static String LIST3_KEY_NAME = "Owner"; private final FieldDefinition _list3Col2 = new FieldDefinition("Wealth", ColumnType.String); - protected final FieldDefinition _list3Col1 = new FieldDefinition(LIST3_KEY_NAME, new StringLookup("lists", LIST3_NAME_OWNERS, "/" + PROJECT_OTHER)).setDescription("Who owns the car"); + protected final FieldDefinition _list3Col1 = new FieldDefinition(LIST3_KEY_NAME, new StringLookup(PROJECT_OTHER, "lists", LIST3_NAME_OWNERS)).setDescription("Who owns the car"); private final static String LIST3_COL2 = "Rich"; private final String LIST2_DATA = LIST2_KEY_NAME + "\t" + LIST_KEY_NAME2_BULK + "\t" + LIST3_KEY_NAME + "\n" + @@ -998,7 +998,7 @@ public void listSelfJoinTest() new FieldDefinition(dummyCol, ColumnType.String) }; FieldDefinition lookupCol = new FieldDefinition(lookupField, - new FieldDefinition.IntLookup(lookupSchema, listName, null)); + new FieldDefinition.IntLookup(lookupSchema, listName)); // create the list _listHelper.createList(PROJECT_VERIFY, listName, keyCol, columns); // now add the lookup column (which references the new table) @@ -1882,7 +1882,7 @@ FieldDefinition col(String name, String table) FieldDefinition col(String folder, String name, String table) { - return new FieldDefinition(name, new FieldDefinition.IntLookup("lists", table, folder)); + return new FieldDefinition(name, new FieldDefinition.IntLookup(folder, "lists", table)); } FieldDefinition colURL(String name, ColumnType type, String url)