Skip to content

Selenium test for Issue 51979 and 52961 #2431

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 1 commit into from
May 2, 2025
Merged

Selenium test for Issue 51979 and 52961 #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 16 additions & 5 deletions src/org/labkey/test/tests/DataClassFolderExportImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.labkey.test.tests;

import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand All @@ -17,10 +18,12 @@
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.TestDataGenerator;
import org.labkey.test.util.exp.DataClassAPIHelper;
import org.labkey.test.util.search.SearchAdminAPIHelper;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;

import java.io.File;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -99,11 +102,11 @@ public void testExportImportSimpleDataClass() throws Exception

TestDataGenerator testDgen = DataClassAPIHelper.createEmptyDataClass(subfolderPath, testType);

testDgen.addCustomRow(Map.of("Name", "class1", "intColumn", 1, "decimalColumn", 1.1, "stringColumn", "one"));
testDgen.addCustomRow(Map.of("Name", "class2", "intColumn", 2, "decimalColumn", 2.2, "stringColumn", "two"));
testDgen.addCustomRow(Map.of("Name", "class3", "intColumn", 3, "decimalColumn", 3.3, "stringColumn", "three"));
testDgen.addCustomRow(Map.of("Name", "class4", "intColumn", 4, "decimalColumn", 4.4, "stringColumn", "four"));
testDgen.addCustomRow(Map.of("Name", "class5", "intColumn", 5, "decimalColumn", 5.5, "stringColumn", "five"));
testDgen.addCustomRow(Map.of("Name", "class1", "intColumn", 7771, "decimalColumn", 1.1, "stringColumn", "one"));
testDgen.addCustomRow(Map.of("Name", "class2", "intColumn", 7772, "decimalColumn", 2.2, "stringColumn", "two"));
testDgen.addCustomRow(Map.of("Name", "class3", "intColumn", 7773, "decimalColumn", 3.3, "stringColumn", "three"));
testDgen.addCustomRow(Map.of("Name", "class4", "intColumn", 7774, "decimalColumn", 4.4, "stringColumn", "four"));
testDgen.addCustomRow(Map.of("Name", "class5", "intColumn", 7775, "decimalColumn", 5.5, "stringColumn", "five"));
testDgen.insertRows();

PortalHelper portalHelper = new PortalHelper(this);
Expand Down Expand Up @@ -158,6 +161,14 @@ public void testExportImportSimpleDataClass() throws Exception
assertNotNull("expect all matching rows to come through", matchingMap);
assertEquals("Expect imported rows to be equivalent to exported ones", exportedRow, matchingMap);
}

SearchAdminAPIHelper.waitForIndexer();

var searchResultPage = navBar().search("7774");
// Issue 52961: DataClass: Integer fields are not index for data class, unlike sample types
checker().withScreenshot("Search by int value after folder import").awaiting(Duration.ofSeconds(2),
()-> Assertions.assertThat(searchResultPage.getResultCount() >= 2).isTrue());

}

@Test
Expand Down
45 changes: 45 additions & 0 deletions src/org/labkey/test/tests/SampleTypeRenameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.labkey.test.tests;

import org.assertj.core.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Expand All @@ -18,9 +19,11 @@
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.TestDataGenerator;
import org.labkey.test.util.exp.SampleTypeAPIHelper;
import org.labkey.test.util.search.SearchAdminAPIHelper;
import org.openqa.selenium.WebElement;

import java.io.IOException;
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -83,6 +86,48 @@ private void doSetup() throws IOException, CommandException
testDataGenerator.insertRows();
}

// Issue 51979: BadSqlGrammarException indexing sample types immediately after a field rename
@Test
public void testSampleTypeFieldRename() throws IOException, CommandException
{
final String sampleTypeName = "SampleTypeWithFieldRename" + FieldDefinition.DOMAIN_TRICKY_CHARACTERS;
SampleTypeDefinition sampleTypeDefinition = new SampleTypeDefinition(sampleTypeName);
sampleTypeDefinition.setNameExpression("S-FieldRename-${int}");
sampleTypeDefinition.addField(new FieldDefinition(FIELD_INT, FieldDefinition.ColumnType.Integer));

log("Give the sample type some data, will be used to create a chart.");
TestDataGenerator testDataGenerator = SampleTypeAPIHelper.createEmptySampleType(getCurrentContainerPath(), sampleTypeDefinition);
int intVal = 1000;
for (int i = 0; i < 1000; i++)
testDataGenerator.addCustomRow(Map.of(FIELD_INT, intVal++));
testDataGenerator.insertRows();

goToProjectHome();
SampleTypeHelper sampleHelper = new SampleTypeHelper(this);
UpdateSampleTypePage updatePage = sampleHelper.goToEditSampleType(sampleTypeName);
updatePage.getFieldsPanel().getField(FIELD_INT).setName(FIELD_INT + " Updated");
updatePage.setNameExpression("S-${genId}");
updatePage.clickSave();
goToProjectHome();
updatePage = sampleHelper.goToEditSampleType(sampleTypeName);
updatePage.getFieldsPanel().getField(FIELD_INT + " Updated").setName(FIELD_INT + " 2nd update");
updatePage.clickSave();
goToProjectHome();
updatePage = sampleHelper.goToEditSampleType(sampleTypeName);
updatePage.getFieldsPanel().getField(FIELD_INT + " 2nd update").setName(FIELD_INT + " 3rd");
updatePage.clickSave();

SearchAdminAPIHelper.waitForIndexer();

var searchResultPage = navBar().search("S-FieldRename-1999");
checker().withScreenshot("Search by sample name after field renaming").awaiting(Duration.ofSeconds(2),
()-> Assertions.assertThat(searchResultPage.hasResultLocatedBy(Locator.linkWithText("Sample - S-FieldRename-1999"))).isTrue());

var searchResultPage2 = navBar().search("1599");
checker().withScreenshot("Search by int value after field renaming").awaiting(Duration.ofSeconds(2),
()-> Assertions.assertThat(searchResultPage2.hasResultLocatedBy(Locator.linkWithText("Sample - S-FieldRename-1599"))).isTrue());
}

@Test
public void testCustomViewWithSampleTypeRename()
{
Expand Down