diff --git a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java index 09c295aa77..4a4f1d6231 100644 --- a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java +++ b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java @@ -566,8 +566,12 @@ public void testExportImportSampleTypesWithSubfolder() List 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 exportedNames = table.getColumnDataAsText("Name"); + ExportFolderPage exportPage = goToFolderManagement() .goToExportTab(); exportPage.includeSubfolders(true); @@ -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 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