Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@labkey-adam
labkey-adam committed Feb 20, 2024
1 parent c9c0a95 commit 40981c4
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 65 deletions.
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/AdminConsoleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void testRibbonBar()
Locator ribbonLink = Locator.tagWithClassContaining("div", "alert").append(Locator.linkContainingText("and also click this..."));
assertElementPresent(ribbonLink);
String href = ribbonLink.findElement(getDriver()).getAttribute("href");
String expected = WebTestHelper.getBaseURL() + "/project/home/begin.view";
String expected = WebTestHelper.getBaseURL() + "/home/project-begin.view";
assertEquals("Incorrect URL", expected, href);

goToHome();
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class CrossSiteScriptingForDeleteTest extends BaseWebDriverTest
{
protected static final String PROJECT_NAME = "CrossSiteScriptingForDeleteTest";
protected static final String REPORT_NAME = BaseWebDriverTest.INJECT_CHARS_1;
private static final String LINK_REPORT_URL = "/project/home/begin.view";
private static final String LINK_REPORT_URL = "/home/project-begin.view";

@BeforeClass
public static void initTest()
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/NonStudyReportsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class NonStudyReportsTest extends ReportTest
private static final String DISCUSSION_BODY_3 = "Editing a discussion response";
private static final String LINK_REPORT1_NAME = "Link report 1" + BaseWebDriverTest.INJECT_CHARS_2;
private static final String LINK_REPORT1_DESCRIPTION = "Link report 1" + BaseWebDriverTest.INJECT_CHARS_2;
private static final String LINK_REPORT1_URL = "/project/home/begin.view";
private static final String LINK_REPORT1_URL = "/home/project-begin.view";
private static final String LINK_REPORT2_NAME = "Link report 2" + BaseWebDriverTest.INJECT_CHARS_2;
private static final String LINK_REPORT2_DESCRIPTION = "This link report points links to an external page.";
protected final PortalHelper portalHelper = new PortalHelper(this);
Expand Down
138 changes: 76 additions & 62 deletions src/org/labkey/test/tests/SimpleModuleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,12 @@ public class SimpleModuleTest extends BaseWebDriverTest
public static final String VEHICLE_SCHEMA = "vehicle";
public static final String CORE_SCHEMA = "core";
public static final String LIST_NAME = "People";
public static final String LIST_DATA = "Name\tAge\tCrazy\n" +
"Dave\t39\tTrue\n" +
"Adam\t65\tTrue\n" +
"Britt\t30\tFalse\n" +
"Josh\t30\tTrue";
public static final String LIST_DATA = """
Name\tAge\tCrazy
Dave\t39\tTrue
Adam\t65\tTrue
Britt\t30\tFalse
Josh\t30\tTrue""";

public static final String STUDY_FOLDER_TAB_NAME = "Study Container Tab";
public static final String ASSAY_FOLDER_TAB_NAME = "Assay Container Tab 2";
Expand Down Expand Up @@ -132,57 +133,62 @@ public class SimpleModuleTest extends BaseWebDriverTest
private static final File CAMRY_THUMBNAIL = TestFileUtils.getSampleData("thumbnails/camry.jpg");
private static final File FOCUS_POPUP = TestFileUtils.getSampleData("thumbnails/focusPopup.jpg");

private static final String XML_METADATA = "<tables xmlns=\"http://labkey.org/data/xml\"> \n" +
" <table tableName=\"Models\" tableDbType=\"TABLE\">\n" +
" <columns>\n" +
" <column columnName=\"Image\">\n" +
" <datatype>varchar</datatype>\n" +
" <displayColumnFactory>\n" +
" <className>org.labkey.api.data.URLDisplayColumn$Factory</className>\n" +
" <properties>\n" +
" <property name=\"thumbnailImageUrl\">/_webdav/SimpleModuleTest%20Project/%40files/${thumbnailImage}</property>\n" +
" <property name=\"popupImageUrl\">/_webdav/SimpleModuleTest%20Project/%40files/${popupImage}</property>\n" +
" <property name=\"popupImageWidth\">150px</property>\n" +
" </properties>\n" +
" </displayColumnFactory>\n" +
" <url>/_webdav/SimpleModuleTest%20Project/%40files/${Image}</url>\n" +
" </column>\n" +
" </columns>\n" +
" </table>\n" +
"</tables>\n";

private static final String XML_METADATA_NO_POPUP = "<tables xmlns=\"http://labkey.org/data/xml\"> \n" +
" <table tableName=\"Models\" tableDbType=\"TABLE\">\n" +
" <columns>\n" +
" <column columnName=\"Image\">\n" +
" <datatype>varchar</datatype>\n" +
" <displayColumnFactory>\n" +
" <className>org.labkey.api.data.URLDisplayColumn$Factory</className>\n" +
" <properties>\n" +
" <property name=\"thumbnailImageUrl\">/_webdav/SimpleModuleTest%20Project/%40files/${thumbnailImage}</property>\n" +
" <property name=\"popupImageUrl\"></property>\n" +
" </properties>\n" +
" </displayColumnFactory>\n" +
" <url>/_webdav/SimpleModuleTest%20Project/%40files/${Image}</url>\n" +
" </column>\n" +
" </columns>\n" +
" </table>\n" +
"</tables>\n";

private static final String XML_METADATA_CUSTOM_QUERY = "<tables xmlns=\"http://labkey.org/data/xml\">\n" +
" <table tableName=\"SelectOnColors\" tableDbType=\"NOT_IN_DB\">\n" +
" <pkColumnName>Name</pkColumnName>\n" +
" <insertUrl>/query/insertQueryRow.view?schemaName=vehicle&amp;queryName=Colors</insertUrl> \n" +
" <updateUrl>/query/updateQueryRow.view?schemaName=vehicle&amp;queryName=Colors&amp;Name=${Name}</updateUrl> \n" +
" <importUrl>/query/import.view?schemaName=vehicle&amp;queryName=Colors</importUrl> \n" +
" <deleteUrl>/query/deleteQueryRows.view?schemaName=vehicle&amp;queryName=Colors</deleteUrl> \n" +
" <columns>\n" +
" \t<column columnName=\"Name\">\n" +
" \t<isKeyField>true</isKeyField>\n" +
" </column>\n" +
" </columns>\n" +
" </table>\n" +
"</tables>";
private static final String XML_METADATA = """
<tables xmlns="http://labkey.org/data/xml">
<table tableName="Models" tableDbType="TABLE">
<columns>
<column columnName="Image">
<datatype>varchar</datatype>
<displayColumnFactory>
<className>org.labkey.api.data.URLDisplayColumn$Factory</className>
<properties>
<property name="thumbnailImageUrl">/_webdav/SimpleModuleTest%20Project/%40files/${thumbnailImage}</property>
<property name="popupImageUrl">/_webdav/SimpleModuleTest%20Project/%40files/${popupImage}</property>
<property name="popupImageWidth">150px</property>
</properties>
</displayColumnFactory>
<url>/_webdav/SimpleModuleTest%20Project/%40files/${Image}</url>
</column>
</columns>
</table>
</tables>
""";

private static final String XML_METADATA_NO_POPUP = """
<tables xmlns="http://labkey.org/data/xml">
<table tableName="Models" tableDbType="TABLE">
<columns>
<column columnName="Image">
<datatype>varchar</datatype>
<displayColumnFactory>
<className>org.labkey.api.data.URLDisplayColumn$Factory</className>
<properties>
<property name="thumbnailImageUrl">/_webdav/SimpleModuleTest%20Project/%40files/${thumbnailImage}</property>
<property name="popupImageUrl"></property>
</properties>
</displayColumnFactory>
<url>/_webdav/SimpleModuleTest%20Project/%40files/${Image}</url>
</column>
</columns>
</table>
</tables>
""";

private static final String XML_METADATA_CUSTOM_QUERY = """
<tables xmlns="http://labkey.org/data/xml">
<table tableName="SelectOnColors" tableDbType="NOT_IN_DB">
<pkColumnName>Name</pkColumnName>
<insertUrl>/query/insertQueryRow.view?schemaName=vehicle&amp;queryName=Colors</insertUrl>\s
<updateUrl>/query/updateQueryRow.view?schemaName=vehicle&amp;queryName=Colors&amp;Name=${Name}</updateUrl>\s
<importUrl>/query/import.view?schemaName=vehicle&amp;queryName=Colors</importUrl>\s
<deleteUrl>/query/deleteQueryRows.view?schemaName=vehicle&amp;queryName=Colors</deleteUrl>\s
<columns>
<column columnName="Name">
<isKeyField>true</isKeyField>
</column>
</columns>
</table>
</tables>""";

private final PortalHelper portalHelper = new PortalHelper(this);

Expand Down Expand Up @@ -855,7 +861,7 @@ private void validateThumbnails(String thumbnailImage, @Nullable String thumbnai
@LogMethod
private void doTestViewEditing()
{
beginAt("/query/" + getProjectName() + "/executeQuery.view?schemaName=" + VEHICLE_SCHEMA + "&query.queryName=Vehicles");
beginAt("/" + getProjectName() + "/query-executeQuery.view?schemaName=" + VEHICLE_SCHEMA + "&query.queryName=Vehicles");

DataRegionTable dr = new DataRegionTable("query", this);

Expand Down Expand Up @@ -1181,7 +1187,6 @@ private void doTestReportThumbnails()
@LogMethod
private void doTestReportIcon()
{

log("Verify custom module report icon image");
setFormElement(Locator.xpath("//table[contains(@class, 'dataset-search')]//input"), KNITR_PEOPLE);
waitForElementToDisappear(Locator.tag("tr").withClass("x4-grid-row").containing(WANT_TO_BE_COOL).notHidden());
Expand Down Expand Up @@ -1394,11 +1399,22 @@ private void doTestFilterSort() throws Exception
assertEquals("Expected first row to be 2000.", 2000, selectResp.getRows().get(1).get("ModelYear"));
assertTrue("Expected the column 'ModelId/ManufacturerId/Name' to be included based on the default view", selectResp.getColumnModel("ModelId/ManufacturerId/Name") != null);
assertEquals("Expected to return 6 columns, based on the default view", 6, selectResp.getColumnModel().size());

}

private final String subfolderPath = getProjectName() + "/" + FOLDER_NAME + "/project-begin.view";

private final static String GET_MODULE_PROPS_SCRIPT = """
library('Rlabkey')
baseUrl = labkey.url.base
folderPath = "SimpleModuleTest Project/subfolder"
moduleName = "simpletest"
labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName = "TestProp1")
labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName = "TestProp2")
labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName = "TestTextArea")
labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName = "TestCheckbox")
labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName = "TestSelect")
labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName = "TestCombo")""";

private static final String SET_MODULE_PROPS_SCRIPT = """
library('Rlabkey')
baseUrl = labkey.url.base
Expand All @@ -1420,7 +1436,6 @@ private void doTestFilterSort() throws Exception
folderPath = "SimpleModuleTest Project/subfolder2"
labkey.setModuleProperty(baseUrl, folderPath, moduleName, propName = "TestTextArea", propValue = "$$folder2value$$")""";


private static final String ENSURE_RLIBPATHS_SOURCE = """
library('Rlabkey')
baseUrl = labkey.url.base
Expand Down Expand Up @@ -1491,7 +1506,7 @@ public void testModuleProperties() throws Exception
validateValues(propList);

log("Verify get module properties using Rlabkey api");
String apiModulePropResults = rReportHelper.createAndRunRReport("getModuleProps", SET_MODULE_PROPS_SCRIPT, false);
String apiModulePropResults = rReportHelper.createAndRunRReport("getModuleProps", GET_MODULE_PROPS_SCRIPT, false);
List<String> expectedProps = Arrays.asList("[1] \"Prop1Value\"\n",
"[1] \"FolderValue\"\n",
"[1] \"updated1\\nupdated2\"\n",
Expand Down Expand Up @@ -1548,7 +1563,6 @@ public void testModuleProperties() throws Exception

goToProjectHome();
assertEquals("Module context not set properly", "DefaultValue", executeScript("return LABKEY.getModuleContext('simpletest')." + prop2));

}

private String getContainerRoot(String containerPath)
Expand Down

0 comments on commit 40981c4

Please sign in to comment.