Skip to content

Add restrictions on names of domains #826

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
XingY merged 8 commits into from
Dec 16, 2024
Merged

Add restrictions on names of domains #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b25ab68
fix tests
XingY Dec 11, 2024
ceb5e93
fix tests
XingY Dec 12, 2024
f40ad38
fix more tests
XingY Dec 12, 2024
e46f414
fix tests
XingY Dec 13, 2024
9499164
debug sql server
XingY Dec 15, 2024
806c0f2
debug sql server
XingY Dec 15, 2024
1f2b2fd
debug sql server
XingY Dec 15, 2024
1add6b2
fix sql server
XingY Dec 15, 2024
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
2 changes: 1 addition & 1 deletion luminex/test/sampledata/luminex/views/LuminexGuideSet.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!-- Used as HTML wiki source, so nonce is NOT required -->
<script type="text/javascript">
var tablePrefix = "&TestAssayLuminex></% 1";
var tablePrefix = "TestAssayLuminex+- _:&()/";
var loadedQWPsOnce = false;
var logHtml = "";
var validDataId = null;
Expand Down
10 changes: 8 additions & 2 deletions luminex/test/src/org/labkey/test/tests/luminex/LuminexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.commons.lang3.StringUtils;
import org.junit.BeforeClass;
import org.labkey.api.query.QueryKey;
import org.labkey.remoteapi.CommandException;
import org.labkey.remoteapi.Connection;
import org.labkey.remoteapi.assay.GetProtocolCommand;
Expand Down Expand Up @@ -60,13 +61,18 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.labkey.test.params.FieldDefinition.DOMAIN_TRICKY_CHARACTERS;
import static org.labkey.test.util.TestDataGenerator.DOMAIN_SPECIAL_STRING;

@BaseWebDriverTest.ClassTimeout(minutes = 40)
public abstract class LuminexTest extends BaseWebDriverTest
{
protected final static String TEST_ASSAY_PRJ_LUMINEX = "LuminexTest Project"; //project for luminex test

public static final String TEST_ASSAY_LUM = "&TestAssayLuminex></% 1";// put back TRICKY_CHARACTERS_NO_QUOTES when issue 20061 is resolved
// Issue 51845:
// - Luminex assay not working well when assay name contains dot (.)
// - use DOMAIN_SPECIAL_STRING instead of DOMAIN_TRICKY_CHARACTERS since sql server is not working with unicode characters
public static final String TEST_ASSAY_LUM = "TestAssayLuminex" + DOMAIN_SPECIAL_STRING.replaceAll("\\.", "");
protected static final String TEST_ASSAY_LUM_DESC = "Description for Luminex assay";

protected static final String TEST_ASSAY_XAR_NAME = "TestLuminexAssay";
Expand Down Expand Up @@ -432,7 +438,7 @@ protected String startCreateMultipleCurveAssayRun()
@LogMethod(quiet = true)
protected void assertAnalytesHaveCorrectStandards(String assayName, int runId, Map<String, Set<String>> expectedAnalyteStandards)
{
SelectRowsCommand command = new SelectRowsCommand("assay.Luminex." + assayName, "Data");
SelectRowsCommand command = new SelectRowsCommand("assay.Luminex." + QueryKey.encodePart(assayName), "Data");
command.setRequiredVersion(9.1); // Needed in order to get display values of lookup columns
command.addFilter(new Filter("Run/RowId", runId, Filter.Operator.EQUAL));
Connection connection = createDefaultConnection(true);
Expand Down
9 changes: 6 additions & 3 deletions luminex/test/src/org/labkey/test/util/luminex/LuminexGuideSetHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public int importGuideSetRun(String assayName, File guideSetFile)
public void verifyGuideSetsNotApplied(String assayName)
{
_test.goToSchemaBrowser();
_test.selectQuery("assay.Luminex." + assayName, "AnalyteTitration");
String[] schemaPart = {"assay", "Luminex", assayName};
_test.selectQuery(schemaPart, "AnalyteTitration");
_test.waitForText("view data");
_test.clickAndWait(Locator.linkContainingText("view data"));
DataRegionTable table = new DataRegionTable("query", _test.getDriver());
Expand Down Expand Up @@ -297,7 +298,8 @@ public void verifyGuideSetsApplied(String assayName, Map<String, Integer> guideS
{
// see if the 3 uploaded runs got the correct 'current' guide set applied
_test.goToSchemaBrowser();
_test.selectQuery("assay.Luminex." + assayName, "AnalyteTitration");
String[] schemaPart = {"assay", "Luminex", assayName};
_test.selectQuery(schemaPart, "AnalyteTitration");
_test.waitForText("view data");
_test.clickAndWait(Locator.linkContainingText("view data"));
_test._customizeViewsHelper.openCustomizeViewPanel();
Expand All @@ -318,7 +320,8 @@ public void verifyGuideSetsApplied(String assayName, Map<String, Integer> guideS
public Map<String, Integer> getGuideSetIdMap(String assayName)
{
_test.goToSchemaBrowser();
_test.selectQuery("assay.Luminex." + assayName, "GuideSet");
String[] schemaPart = {"assay", "Luminex", assayName};
_test.selectQuery(schemaPart, "GuideSet");
_test.waitForText("view data");
_test.clickAndWait(Locator.linkContainingText("view data"));
Map<String, Integer> guideSetIds = new HashMap<>();
Expand Down