Skip to content

Account for sample types that may have been defined in other tests #2943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-susanh merged 1 commit into from
Apr 10, 2026
+8 −4
Merged

Account for sample types that may have been defined in other tests #2943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,12 @@ public void testExportImportSampleTypesWithSubfolder()
List<FieldDefinition> testFields = SampleTypeAPIHelper.sampleTypeTestFields(false);
SampleTypeDefinition testSampleType = new SampleTypeDefinition(projectSampleType).setFields(testFields);
SampleTypeAPIHelper.createEmptySampleType(getProjectName(), testSampleType);

goToProjectHome();
PortalHelper portalHelper = new PortalHelper(this);
portalHelper.addWebPart("Sample Types");
DataRegionTable table = DataRegionTable.DataRegion(getDriver()).withName("SampleSet").waitFor();
List<String> exportedNames = table.getColumnDataAsText("Name");

ExportFolderPage exportPage = goToFolderManagement()
.goToExportTab();
exportPage.includeSubfolders(true);
Expand All @@ -576,11 +580,11 @@ public void testExportImportSampleTypesWithSubfolder()
goToProjectHome(importProject);
importFolderFromZip(exportedFolderFile, false, 1);
goToProjectFolder(importProject, subfolder);
PortalHelper portalHelper = new PortalHelper(this);
portalHelper = new PortalHelper(this);
portalHelper.addWebPart("Sample Types");
DataRegionTable table = DataRegionTable.DataRegion(getDriver()).withName("SampleSet").waitFor();
table = DataRegionTable.DataRegion(getDriver()).withName("SampleSet").waitFor();
List<String> typeNames = table.getColumnDataAsText("Name");
checker().verifyEquals("Type names not as expected", List.of(projectSampleType), typeNames);
checker().verifyEquals("Type names not as expected", exportedNames, typeNames);
}

@Test
Expand Down
Loading