Skip to content

Test for copying a folder containing moved Skyline documents to Panorama Public #502

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-jeckels merged 6 commits into from
Feb 18, 2025
Merged

Test for copying a folder containing moved Skyline documents to Panorama Public #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f4ac98
Added test for moving Skyline documents across LabKey folders.
vagisha Feb 4, 2025
41ffb43
Attempt to fix test failing on TeamCity.
vagisha Feb 13, 2025
816fba8
Do not fail if container cannot be deleted because it does not exist.
vagisha Feb 13, 2025
10f18e6
Attempt to fix test failing on TeamCity. Move documents from project …
vagisha Feb 16, 2025
bab4c9f
Merge branch 'release24.11-SNAPSHOT' into 24.11_fb_fix-filepathroot-o…
vagisha Feb 16, 2025
c70bd27
Reverted back to using test folder with tricky characters
vagisha Feb 16, 2025
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
10 changes: 5 additions & 5 deletions panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ private void submitForm()
clickAndWait(Locator.linkWithText("Back to Experiment Details")); // Navigate to the experiment details page.
}

void copyExperimentAndVerify(String projectName, String folderName, String experimentTitle, String destinationFolder, String shortAccessUrl)
void copyExperimentAndVerify(String projectName, @Nullable String folderName, String experimentTitle, String destinationFolder, String shortAccessUrl)
{
copyExperimentAndVerify(projectName, folderName, null, experimentTitle, null, false, true, destinationFolder, shortAccessUrl);
}
Expand All @@ -325,15 +325,15 @@ void makeCopy(String shortAccessUrl, String experimentTitle, String destinationF
makeCopy(shortAccessUrl, experimentTitle, recopy, deleteOldCopy, destinationFolder, true);
}

void copyExperimentAndVerify(String projectName, String folderName, @Nullable List<String> subfolders, String experimentTitle,
void copyExperimentAndVerify(String projectName, @Nullable String folderName, @Nullable List<String> subfolders, String experimentTitle,
@Nullable Integer version, boolean recopy, boolean deleteOldCopy, String destinationFolder,
String shortAccessUrl)
{
copyExperimentAndVerify(projectName, folderName, subfolders, experimentTitle, version, recopy, deleteOldCopy,
destinationFolder, shortAccessUrl, true);
}

void copyExperimentAndVerify(String projectName, String folderName, @Nullable List<String> subfolders, String experimentTitle,
void copyExperimentAndVerify(String projectName, @Nullable String folderName, @Nullable List<String> subfolders, String experimentTitle,
@Nullable Integer version, boolean recopy, boolean deleteOldCopy, String destinationFolder,
String shortAccessUrl, boolean symlinks)
{
Expand Down Expand Up @@ -406,7 +406,7 @@ protected final void uncheck(String label)
}
}

private void verifyCopy(String shortAccessUrl, String experimentTitle, @Nullable Integer version, String projectName, String folderName, List<String> subfolders, boolean recopy)
private void verifyCopy(String shortAccessUrl, String experimentTitle, @Nullable Integer version, String projectName, @Nullable String folderName, List<String> subfolders, boolean recopy)
{
// Verify the copy
goToProjectHome(PANORAMA_PUBLIC);
Expand Down Expand Up @@ -454,7 +454,7 @@ private void verifyCopy(String shortAccessUrl, String experimentTitle, @Nullable
text += "\nEmail: " + REVIEWER_PREFIX;
}
String messageText = new BodyWebPart(getDriver(), "View Message").getComponentElement().getText();
var srcFolderTxt = "Source folder: " + "/" + projectName + "/" + folderName;
var srcFolderTxt = "Source folder: " + "/" + projectName + (folderName == null ? "" : "/" + folderName);
assertTextPresent(new TextSearcher(messageText), text, srcFolderTxt);

// Unescaped special Markdown characters in the message may cause the password to render incorrectly.
Expand Down
117 changes: 117 additions & 0 deletions ...amapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMoveSkyDocTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
package org.labkey.test.tests.panoramapublic;

import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.TestFileUtils;
import org.labkey.test.categories.External;
import org.labkey.test.categories.MacCossLabModules;
import org.labkey.test.components.CustomizeView;
import org.labkey.test.util.DataRegionTable;

import static org.junit.Assert.fail;


@Category({External.class, MacCossLabModules.class})
@BaseWebDriverTest.ClassTimeout(minutes = 5)
public class PanoramaPublicMoveSkyDocTest extends PanoramaPublicBaseTest
{
private static final String SKY_FILE_1 = "MRMer.zip";
private static final String SKY_FILE_2 = "MRMer_renamed_protein.zip";
private static final String SKY_FILE_3 = "SmMolLibA.sky.zip";

@Test
public void testExperimentCopy()
{
String projectName = getProjectName();
String sourceFolder = "SourceFolder";
String sourceSubfolder = "SourceSubFolder";
String targetFolder = "TargetFolder";

log("Creating source folder " + sourceFolder);
setupSourceFolder(projectName, sourceFolder, SUBMITTER);
log("Creating subfolder, " + sourceSubfolder + " in folder " + sourceFolder);
setupSubfolder(projectName, sourceFolder, sourceSubfolder, FolderType.Experiment, SUBMITTER);

goToProjectHome();
log("Creating target folder " + targetFolder);
setupSourceFolder(projectName, targetFolder, SUBMITTER);

impersonate(SUBMITTER);
updateSubmitterAccountInfo("One");

goToProjectFolder(projectName, sourceFolder);
log("Importing " + SKY_FILE_1 + " in folder " + sourceFolder);
importData(SKY_FILE_1, 1);
goToDashboard();
log("Moving " + SKY_FILE_1 + " FROM " + sourceFolder + " TO " + targetFolder);
moveDocument(SKY_FILE_1, targetFolder, 1);

var skyDocSourceFolder = sourceFolder + "/" + sourceSubfolder;
goToProjectFolder(projectName, skyDocSourceFolder);
log("Importing " + SKY_FILE_2 + " in folder " + skyDocSourceFolder);
importData(SKY_FILE_2, 1);
goToDashboard();
log("Moving " + SKY_FILE_2 + " FROM " + skyDocSourceFolder + "TO " + targetFolder);
moveDocument(SKY_FILE_2, targetFolder, 2);

goToProjectFolder(projectName, targetFolder);
log("Importing " + SKY_FILE_3 + " in folder " + skyDocSourceFolder);
importData(SKY_FILE_3, 3);

log("Creating and submitting an experiment");
String experimentTitle = "Experiment to test moving Skyline documents from other folders";
var expWebPart = createExperimentCompleteMetadata(experimentTitle);
expWebPart.clickSubmit();
String shortAccessLink = submitWithoutPXId();

// Copy the experiment to the Panorama Public project
var panoramaCopyFolder = "Copy of " + targetFolder;
log("Copying experiment to folder " + panoramaCopyFolder +" in the Panorama Public project");
copyExperimentAndVerify(projectName, targetFolder, experimentTitle, panoramaCopyFolder, shortAccessLink);
goToProjectFolder(PANORAMA_PUBLIC, panoramaCopyFolder);
verifyRunFilePathRoot(SKY_FILE_1, PANORAMA_PUBLIC, panoramaCopyFolder);
verifyRunFilePathRoot(SKY_FILE_2, PANORAMA_PUBLIC, panoramaCopyFolder);
verifyRunFilePathRoot(SKY_FILE_3, PANORAMA_PUBLIC, panoramaCopyFolder);
}

private void moveDocument(String skylineDocName, String targetFolder, int jobCount)
{
DataRegionTable table = new DataRegionTable.DataRegionFinder(getDriver()).withName("TargetedMSRuns").waitFor();
table.checkCheckbox(0);
table.clickHeaderButton("Move");
waitAndClickAndWait(Locator.linkWithText(targetFolder));
waitForPipelineJobsToComplete(jobCount, false);

goToDashboard();

// Verify that the document moved
table = new DataRegionTable.DataRegionFinder(getDriver()).withName("TargetedMSRuns").waitFor();
int rowIndex = table.getRowIndex("File", skylineDocName);
if (rowIndex < 0)
fail("Unable to find row for moved Skyline document: " + skylineDocName);

verifyRunFilePathRoot(skylineDocName, getProjectName(), targetFolder);
}

private void verifyRunFilePathRoot(String skylineDocName, String projectName, String targetFolder)
{
// Verify that exp.run filePathRoot is set to the target folder
portalHelper.navigateToQuery("exp", "Runs");
DataRegionTable queryGrid = new DataRegionTable("query", this);
CustomizeView view = queryGrid.openCustomizeGrid();
view.showHiddenItems();
view.addColumn("FilePathRoot");
view.applyCustomView();
int rowIndex = queryGrid.getRowIndex("Name", skylineDocName);
if (rowIndex < 0)
fail("Unable to find row for Skyline document in exp.Runs query grid: " + skylineDocName);

var expectedFileRoot = TestFileUtils.getDefaultFileRoot(projectName + "/" + targetFolder).getPath();
var filePathRoot = queryGrid.getDataAsText(rowIndex, "FilePathRoot");

Assert.assertEquals("Unexpected FilePathRoot ",expectedFileRoot, filePathRoot);
}
}