Skip to content

Misc test updates related to recent fuzz testing changes #2578

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
cnathe merged 3 commits into from
Jul 24, 2025
Merged

Misc test updates related to recent fuzz testing changes #2578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90e45cf
FileAttachmentColumnTest update to comment out randomFieldName usage …
cnathe Jul 24, 2025
3857f21
InlineImagesListTest update to not use randomFieldName for list field…
cnathe Jul 24, 2025
b5ab37a
TextChoiceSampleTypeTest update for how tsv import values are quoted …
cnathe Jul 24, 2025
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
4 changes: 3 additions & 1 deletion src/org/labkey/test/tests/FileAttachmentColumnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ public class FileAttachmentColumnTest extends BaseWebDriverTest
private final String RESULT_FILE_COL = "resultFile";
private final String OTHER_RESULT_FILE_COL = "otherResultFile";
private final String STUDY_DATASET_NAME = "ogreSpiteLevels";
private static final FieldInfo LIST_ATTACHMENT_FIELD = new FieldInfo(TestDataGenerator.randomFieldName("File / Attachment"), ColumnType.Attachment);
// Issue 53505: enable use of randomFieldName when issue is fixed
//private static final FieldInfo LIST_ATTACHMENT_FIELD = new FieldInfo(TestDataGenerator.randomFieldName("File / Attachment"), ColumnType.Attachment);
Comment on lines +96 to +97
Copy link
Contributor

@labkey-danield labkey-danield Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you haven't done so already, can you add a comment to 53505 referencing this test and letting whoever fixes know they need to uncomment this line of code?

Copy link
Contributor Author

@cnathe cnathe Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

private static final FieldInfo LIST_ATTACHMENT_FIELD = new FieldInfo("File / Attachment", ColumnType.Attachment);

@Override
protected void doCleanup(boolean afterTest) throws TestTimeoutException
Expand Down
16 changes: 10 additions & 6 deletions src/org/labkey/test/tests/InlineImagesListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.labkey.test.params.FieldDefinition.ColumnType;
import org.labkey.test.util.DataRegionExportHelper;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.DomainUtils;
import org.labkey.test.util.ExcelHelper;
import org.labkey.test.util.TestDataGenerator;
import org.openqa.selenium.By;
Expand All @@ -47,21 +48,24 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.labkey.test.util.TestDataGenerator.ALL_CHARS_PLACEHOLDER;
import static org.labkey.test.util.TestDataGenerator.REPEAT_PLACEHOLDER;

@Category(Daily.class)
@BaseWebDriverTest.ClassTimeout(minutes = 5)
public class InlineImagesListTest extends BaseWebDriverTest
{
protected final static String LIST_NAME = TestDataGenerator.randomDomainName("InlineImagesList");
protected final static String LIST_KEY_NAME = TestDataGenerator.randomFieldName("Key");
protected final static String LIST_NAME = TestDataGenerator.randomDomainName("InlineImagesList", DomainUtils.DomainKind.IntList);
// list key name has a smaller max length than other field names, so we use a constant numEndChars and exclude the repeat and all chars placeholders
protected final static String LIST_KEY_NAME = TestDataGenerator.randomFieldName("Key" + ALL_CHARS_PLACEHOLDER, 0, 5, "" + ALL_CHARS_PLACEHOLDER + REPEAT_PLACEHOLDER, DomainUtils.DomainKind.IntList);
protected final static ColumnType LIST_KEY_TYPE = ColumnType.Integer;

protected final static String LIST_ATTACHMENT01_NAME = TestDataGenerator.randomFieldName("Attachment01");
protected final static String LIST_ATTACHMENT01_LABEL = TestDataGenerator.randomFieldName("Attachment Column 01");
protected final static String LIST_ATTACHMENT01_NAME = TestDataGenerator.randomFieldName("Attachment01", null, DomainUtils.DomainKind.IntList);
protected final static String LIST_ATTACHMENT01_LABEL = "Attachment Column 01";
protected final static String LIST_ATTACHMENT01_DESC = "An 1st attachment column.";

protected final static String LIST_ATTACHMENT02_NAME = TestDataGenerator.randomFieldName("Attachment02");
protected final static String LIST_ATTACHMENT02_LABEL = TestDataGenerator.randomFieldName("Attachment Column 02");
protected final static String LIST_ATTACHMENT02_NAME = TestDataGenerator.randomFieldName("Attachment02", null, DomainUtils.DomainKind.IntList);
protected final static String LIST_ATTACHMENT02_LABEL = "Attachment Column 02";
protected final static String LIST_ATTACHMENT02_DESC = "An 2nd attachment column.";

protected final static ColumnType LIST_ATTACHMENT_TYPE = ColumnType.Attachment;
Expand Down
6 changes: 3 additions & 3 deletions src/org/labkey/test/tests/TextChoiceSampleTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void testTextChoiceInSampleTypeDesigner()
expectedValues.add("A");
expectedValues.add("\u00DC");
expectedValues.add("|X|Y|Z|withPipeChars");
expectedValues.add("A string with spaces and backslash at end.\\");
expectedValues.add("A string with \"spaces\" and backslash at end.\\");
expectedValues.add("B");

// Identify a couple of TextChoice values that will be used in samples.
Expand Down Expand Up @@ -173,8 +173,8 @@ public void testTextChoiceInSampleTypeDesigner()

samples.add(Map.of(textChoiceFieldName, valuesUsed.get(0), textField, ""));
samples.add(Map.of(textChoiceFieldName, "", textField, expectedConvertedValues.get(0)));
samples.add(Map.of(textChoiceFieldName, "\"" + valuesUsed.get(1)+ "\"", textField, ""));
samples.add(Map.of(textChoiceFieldName, "\"" + valuesUsed.get(1) + "\"", textField, ""));
samples.add(Map.of(textChoiceFieldName, valuesUsed.get(1), textField, ""));
samples.add(Map.of(textChoiceFieldName, valuesUsed.get(1), textField, ""));
samples.add(Map.of(textChoiceFieldName, "", textField, expectedConvertedValues.get(1)));

sampleTypeHelper.bulkImport(samples);
Expand Down