Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 19 additions & 2 deletions src/org/labkey/test/tests/SampleTypeLineageTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.labkey.remoteapi.CommandException;
import org.labkey.remoteapi.SimpleGetCommand;
import org.labkey.remoteapi.experiment.LineageCommand;
import org.labkey.remoteapi.experiment.LineageNode;
import org.labkey.remoteapi.experiment.LineageResponse;
Expand All @@ -14,6 +15,7 @@
import org.labkey.test.Locator;
import org.labkey.test.TestFileUtils;
import org.labkey.test.TestTimeoutException;
import org.labkey.test.WebTestHelper;
import org.labkey.test.categories.Daily;
import org.labkey.test.components.ext4.Window;
import org.labkey.test.params.FieldDefinition;
Expand Down Expand Up @@ -55,7 +57,7 @@ public class SampleTypeLineageTest extends BaseWebDriverTest
@Override
public List<String> getAssociatedModules()
{
return Arrays.asList("experiment");
return List.of("experiment");
}

@Override
Expand Down Expand Up @@ -842,7 +844,7 @@ public void testDeleteLineageParent() throws IOException, CommandException
// create a sample type with the following explicit domain columns
SampleTypeDefinition sampleType = new SampleTypeDefinition("Family");
TestDataGenerator sampleGenerator = sampleType.create(createDefaultConnection(), getProjectName());

sampleGenerator.addRow(List.of("A"));
sampleGenerator.addRow(List.of("B"));
sampleGenerator.addCustomRow(Map.of("name", "C", "MaterialInputs/Family", "A,B"));
Expand Down Expand Up @@ -1216,4 +1218,19 @@ public void testDeleteSamplesSomeWithDerivedSamples()

}

@Test
public void testDiagnosticActions() throws IOException, CommandException
{
// CycleCheckAction: confirm the page loads and the acyclic test data reports no cycles
beginAt(WebTestHelper.buildURL("experiment", PROJECT_NAME, "cycleCheck"));
assertTextPresent("This operation can use a lot of memory.");
clickButton("Continue");
assertTextPresent("No cycles found");

// CheckEdgesAction: confirm the API returns success with an empty cycle list
var cmd = new SimpleGetCommand("experiment", "checkEdges");
Map<String, Object> response = cmd.execute(createDefaultConnection(), "/" + PROJECT_NAME).getParsedData();
assertEquals("CheckEdgesAction should report success", Boolean.TRUE, response.get("success"));
assertEquals("CheckEdgesAction should find no cycle edges", List.of(), response.get("result"));
}
}