Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/org/labkey/test/tests/DataClassTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ public void testFieldUniqueConstraint()
createPage.clickSave();

viewRawTableMetadata(dataClassName);
assertTextPresentCaseInsensitive("fk_rowid_"); // GitHub Issue 1117
verifyTableIndices("unique_constraint_test_", List.of("field_Name1", "fieldName_2"));
assertTextNotPresent("unique_constraint_test_fieldname_3");
verifyTableIndexNonUnique("unique_constraint_test_", "field_Name1", true);
Expand Down
13 changes: 13 additions & 0 deletions src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,19 @@ public void testExportImportDerivedSamples() throws Exception
String[] importedDataParents = matchingMap.get("Inputs/Data/parentDataClass").replace(" ", "").split(",");
assertThat("expect parent dataClass derivation to round trip with equivalent values", sourceDataParents, hasItems(importedDataParents));
}

// GitHub Issue 1117
String importFolderPath = IMPORT_PROJECT_NAME + "/" + importFolder;
verifyRowIdForeignKey(importFolderPath, "samples", testSamples);
verifyRowIdForeignKey(importFolderPath, "samples", parentSampleType);
verifyRowIdForeignKey(importFolderPath, "exp.data", dataClass);
}

private void verifyRowIdForeignKey(String containerPath, String schemaName, String queryName)
{
beginAt(WebTestHelper.buildURL("query", containerPath, "rawTableMetaData",
Map.of("schemaName", schemaName, "query.queryName", queryName)));
assertTextPresentCaseInsensitive("fk_rowid_");
}

@Test
Expand Down
1 change: 1 addition & 0 deletions src/org/labkey/test/tests/SampleTypeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,7 @@ public void testFieldUniqueConstraint()
createPage.clickSave();

viewRawTableMetadata(sampleTypeName);
assertTextPresentCaseInsensitive("fk_rowid_"); // GitHub Issue 1117
verifyTableIndices("unique_constraint_test_", List.of("field_Name1", "fieldName_2"));
assertTextNotPresent("unique_constraint_test_fieldname_3");
verifyTableIndexNonUnique("unique_constraint_test_", "field_Name1", false);
Expand Down