Skip to content

Commit c15b427

Browse files
labkey-jeckelslabkey-jeckels
committed
Fix DomainDesignerTest, reduce usage of deprecated methods
1 parent cab5354 commit c15b427

File tree

9 files changed

+85
-144
lines changed

9 files changed

+85
-144
lines changed

‎src/org/labkey/test/tests/DomainDesignerTest.java‎

Lines changed: 44 additions & 88 deletions
Large diffs are not rendered by default.

‎src/org/labkey/test/tests/DomainFieldTypeChangeTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ public void testProvisionedDomainFieldChanges() throws IOException, CommandExcep
6161
String listName = "SampleListWithAllDataTypes";
6262

6363
log("Creating list with variety of data fields");
64-
FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName);
65-
TestDataGenerator dgen = new TestDataGenerator(lookupInfo)
64+
TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName())
6665
.withColumns(List.of(
6766
new FieldDefinition("name", FieldDefinition.ColumnType.String),
6867
new FieldDefinition("testInteger", FieldDefinition.ColumnType.Integer),

‎src/org/labkey/test/tests/EditMetadataDomainTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ private void doSetup() throws IOException, CommandException
4444
new PortalHelper(getDriver()).addBodyWebPart("Lists");
4545

4646
log("Creating a sample list");
47-
FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "lists", listName);
48-
TestDataGenerator dgen = new TestDataGenerator(lookupInfo)
47+
TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName())
4948
.withColumns(List.of(
5049
new FieldDefinition("name", FieldDefinition.ColumnType.String),
5150
new FieldDefinition("firstCol", FieldDefinition.ColumnType.String)));

‎src/org/labkey/test/tests/SampleTypeLimitsTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ private void doSetup()
7777
log("Creating the sample type of 10000 samples");
7878
try
7979
{
80-
FieldDefinition.LookupInfo lookupInfo = new FieldDefinition.LookupInfo(getProjectName(), "exp.materials", SAMPLE_TYPE_NAME);
81-
TestDataGenerator dgen = new TestDataGenerator(lookupInfo)
80+
TestDataGenerator dgen = new TestDataGenerator("exp.materials", SAMPLE_TYPE_NAME, getProjectName())
8281
.withColumns(List.of(
8382
TestDataGenerator.simpleFieldDef("name", FieldDefinition.ColumnType.String),
8483
TestDataGenerator.simpleFieldDef("label", FieldDefinition.ColumnType.String)));

‎src/org/labkey/test/tests/SampleTypeNameExpressionTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,12 +452,11 @@ public void testParentAliasExpression()
452452
public void testLookupNameExpression() throws Exception
453453
{
454454
String lookupList = "Colors";
455-
FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.LookupInfo(getProjectName(), "lists", lookupList)
456-
.setTableType(FieldDefinition.ColumnType.Integer);
455+
FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.IntLookup("lists", lookupList, getProjectName());
457456
String nameExpSamples = "NameExpressionSamples";
458457

459458
// begin by creating a lookupList of colors, the sampleType will reference it
460-
TestDataGenerator colorsGen = new TestDataGenerator(colorsLookup)
459+
TestDataGenerator colorsGen = new TestDataGenerator("lists", lookupList, getProjectName())
461460
.withColumns(List.of(new FieldDefinition("ColorName", FieldDefinition.ColumnType.String),
462461
new FieldDefinition("ColorCode", FieldDefinition.ColumnType.String)));
463462
colorsGen.addCustomRow(Map.of("ColorName", "green", "ColorCode", "gr"));

‎src/org/labkey/test/tests/SampleTypeRemoteAPITest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,7 @@ public void insertSamplesOverSaveBatchAPI() throws Exception
455455
String assaySubfolder = "TestAssayFolder";
456456
String assayName = "AssayForSampleDerivation";
457457
generateAssay(assaySubfolder, assayName);
458-
List<TestDataGenerator> dataGenerators = generateAssayData(new FieldDefinition.LookupInfo(getProjectName() + "/" + assaySubfolder,
459-
"assay.General.AssayForSampleDerivation_assay", "Runs"));
458+
List<TestDataGenerator> dataGenerators = generateAssayData("assay.General.AssayForSampleDerivation_assay", "Runs", getProjectName() + "/" + assaySubfolder);
460459
insertAssayData(assayName, dataGenerators);
461460

462461
// get the sampleID, it will be needed later
@@ -591,8 +590,7 @@ public void deriveSamplesOverSaveBatchAPI() throws Exception
591590
String assaySubfolder = "DeriveAssayFolder";
592591
String assayName = "AssayForSaveBatchDerivation";
593592
generateAssay(assaySubfolder, assayName);
594-
List<TestDataGenerator> dataGenerators = generateAssayData(new FieldDefinition.LookupInfo(getProjectName() + "/" + assaySubfolder,
595-
"assay.General.AssayForSaveBatchDerivation_assay", "Runs"));
593+
List<TestDataGenerator> dataGenerators = generateAssayData("assay.General.AssayForSaveBatchDerivation_assay", "Runs", getProjectName() + "/" + assaySubfolder);
596594
insertAssayData(assayName, dataGenerators);
597595

598596
// get the sampleID, it will be needed later
@@ -721,29 +719,29 @@ private void generateAssay(String subfolderName, String assayName)
721719
* generates data (runs) for the gpat assay used by tests in this class.
722720
* @param assayLookup : specifies the container, schema, name of the assay's run table
723721
*/
724-
private List<TestDataGenerator> generateAssayData(FieldDefinition.LookupInfo assayLookup)
722+
private List<TestDataGenerator> generateAssayData(String schema, String table, String containerPath)
725723
{
726724
List<PropertyDescriptor> resultsFieldset = List.of(
727725
new FieldDefinition("ParticipantID",FieldDefinition.ColumnType.String),
728726
new FieldDefinition("Date", FieldDefinition.ColumnType.DateAndTime),
729727
new FieldDefinition("SampleName", FieldDefinition.ColumnType.String),
730728
new FieldDefinition("SampleVolume", FieldDefinition.ColumnType.DateAndTime));
731729

732-
TestDataGenerator dgen1 = new TestDataGenerator(assayLookup)
730+
TestDataGenerator dgen1 = new TestDataGenerator(schema, table, containerPath)
733731
.withColumns(resultsFieldset)
734732
.addCustomRow(Map.of("ParticipantID", "Jeff", "Date", "11/11/2018", "SampleName", "Green", "SampleVolume", 12.5))
735733
.addCustomRow(Map.of("ParticipantID", "Jim", "Date", "11/12/2018", "SampleName", "Red", "SampleVolume", 14.5))
736734
.addCustomRow(Map.of("ParticipantID", "Billy", "Date", "11/13/2018", "SampleName", "Yellow", "SampleVolume", 17.5))
737735
.addCustomRow(Map.of("ParticipantID", "Michael", "Date", "11/14/2018", "SampleName", "Orange", "SampleVolume", 11.5));
738736

739-
TestDataGenerator dgen2 = new TestDataGenerator(assayLookup)
737+
TestDataGenerator dgen2 = new TestDataGenerator(schema, table, containerPath)
740738
.withColumns(resultsFieldset)
741739
.addCustomRow(Map.of("ParticipantID", "Harry", "Date", "10/11/2018", "SampleName", "Green", "SampleVolume", 12.5))
742740
.addCustomRow(Map.of("ParticipantID", "William", "Date", "10/12/2018", "SampleName", "Red", "SampleVolume", 14.5))
743741
.addCustomRow(Map.of("ParticipantID", "Jenny", "Date", "10/13/2018", "SampleName", "Yellow", "SampleVolume", 17.5))
744742
.addCustomRow(Map.of("ParticipantID", "Hermione", "Date", "10/14/2018", "SampleName", "Orange", "SampleVolume", 11.5));
745743

746-
TestDataGenerator dgen3 = new TestDataGenerator(assayLookup)
744+
TestDataGenerator dgen3 = new TestDataGenerator(schema, table, containerPath)
747745
.withColumns(resultsFieldset)
748746
.addCustomRow(Map.of("ParticipantID", "George", "Date", "10/11/2018", "SampleName", "Green", "SampleVolume", 12.5))
749747
.addCustomRow(Map.of("ParticipantID", "Arthur", "Date", "10/12/2018", "SampleName", "Red", "SampleVolume", 14.5))

‎src/org/labkey/test/tests/issues/IssuesTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,18 +249,18 @@ public void generalTest() throws Exception
249249

250250
fields.add(new FieldDefinition("MyInteger", FieldDefinition.ColumnType.Integer));
251251
fields.add(new FieldDefinition("MySecondInteger", FieldDefinition.ColumnType.Integer));
252-
fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "MyFirstString"))));
252+
fields.add(new FieldDefinition("MyFirstString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFirstString"), null)));
253253
fields.add(new FieldDefinition("MyThirdString", FieldDefinition.ColumnType.String));
254254
fields.add(new FieldDefinition("MyFourthString", FieldDefinition.ColumnType.String));
255-
fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "MyFifthString"))));
255+
fields.add(new FieldDefinition("MyFifthString", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "MyFifthString"), null)));
256256

257-
fields.add(new FieldDefinition("Client", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Client"))));
258-
fields.add(new FieldDefinition("UserStory", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "UserStory"))));
257+
fields.add(new FieldDefinition("Client", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Client"), null)));
258+
fields.add(new FieldDefinition("UserStory", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "UserStory"), null)));
259259
fields.add(new FieldDefinition("SupportTicket", FieldDefinition.ColumnType.Integer));
260260
fields.add(new FieldDefinition("TeamCity", FieldDefinition.ColumnType.String).setLabel("TeamCity Note"));
261-
fields.add(new FieldDefinition("Triage", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Triage"))));
262-
fields.add(new FieldDefinition("Note", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Note"))));
263-
fields.add(new FieldDefinition("Module", new FieldDefinition.LookupInfo(null, "lists", getLookupTableName("issues", "Module"))));
261+
fields.add(new FieldDefinition("Triage", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Triage"), null)));
262+
fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Note"), null)));
263+
fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Module"), null)));
264264

265265
clickProject(getProjectName());
266266
waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME));

‎src/org/labkey/test/tests/list/ListTest.java‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.labkey.test.pages.list.EditListDefinitionPage;
5050
import org.labkey.test.pages.list.GridPage;
5151
import org.labkey.test.params.FieldDefinition;
52-
import org.labkey.test.params.FieldDefinition.LookupInfo;
5352
import org.labkey.test.params.FieldDefinition.StringLookup;
5453
import org.labkey.test.tests.AuditLogTest;
5554
import org.labkey.test.util.AbstractDataRegionExportOrSignHelper.ColumnHeaderType;
@@ -169,7 +168,7 @@ public class ListTest extends BaseWebDriverTest
169168
private final static ColumnType LIST3_KEY_TYPE = ColumnType.String;
170169
private final static String LIST3_KEY_NAME = "Owner";
171170
private final FieldDefinition _list3Col2 = new FieldDefinition("Wealth", ColumnType.String);
172-
protected final FieldDefinition _list3Col1 = new FieldDefinition(LIST3_KEY_NAME, new LookupInfo("/" + PROJECT_OTHER, "lists", LIST3_NAME_OWNERS).setTableType(ColumnType.String)).setDescription("Who owns the car");
171+
protected final FieldDefinition _list3Col1 = new FieldDefinition(LIST3_KEY_NAME, new StringLookup("lists", LIST3_NAME_OWNERS, "/" + PROJECT_OTHER)).setDescription("Who owns the car");
173172
private final static String LIST3_COL2 = "Rich";
174173
private final String LIST2_DATA =
175174
LIST2_KEY_NAME + "\t" + LIST_KEY_NAME2_BULK + "\t" + LIST3_KEY_NAME + "\n" +
@@ -509,7 +508,7 @@ public void testNameTrimming()
509508
/* Issue 51572: Bug with creating a new list by uploading a csv file in "UTF-8 with BOM" format
510509
*/
511510
@Test
512-
public void testCreateListWithBOMFile() throws IOException
511+
public void testCreateListWithBOMFile()
513512
{
514513
String listName = TestDataGenerator.randomDomainName("From BOM File", 4);
515514
File bomFile = TestFileUtils.getSampleData("lists/TestUTF8_BOM.csv");
@@ -870,8 +869,7 @@ public void testAddListColumnOverRemoteAPI() throws Exception
870869
new FieldDefinition("dewey", ColumnType.Decimal)
871870
);
872871
String listName = "remoteApiListTestAddColumn";
873-
LookupInfo info = new LookupInfo(getProjectName(), "lists", listName);
874-
TestDataGenerator dgen = new TestDataGenerator(info)
872+
TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName())
875873
.withColumns(cols);
876874
DomainResponse createResponse = dgen.createList(createDefaultConnection(), "key");
877875
Domain listDomain = createResponse.getDomain();
@@ -880,9 +878,9 @@ public void testAddListColumnOverRemoteAPI() throws Exception
880878
listDomain.setFields(listFields);
881879

882880
// now save with an extra field
883-
SaveDomainCommand saveCmd = new SaveDomainCommand(info.getSchema(), info.getTable());
881+
SaveDomainCommand saveCmd = new SaveDomainCommand(dgen.getSchema(), dgen.getQueryName());
884882
saveCmd.setDomainDesign(listDomain);
885-
DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), info.getFolder());
883+
DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), dgen.getContainerPath());
886884

887885
// now verify
888886
assertEquals(listFields.size(), saveResponse.getDomain().getFields().size());
@@ -905,18 +903,17 @@ public void testRemoveColumnOverAPI() throws Exception
905903
new FieldDefinition("removeMe", ColumnType.Decimal)
906904
);
907905
String listName = "remoteApiListTestRemoveColumn";
908-
LookupInfo info = new LookupInfo(getProjectName(), "lists", listName);
909-
TestDataGenerator dgen = new TestDataGenerator(info)
906+
TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName())
910907
.withColumns(cols);
911908
DomainResponse createResponse = dgen.createList(createDefaultConnection(), "key");
912909
Domain listDomain = createResponse.getDomain();
913910
List<PropertyDescriptor> listFields = createResponse.getDomain().getFields();
914911
listFields.removeIf(a-> a.getName().equals("removeMe"));
915912
listDomain.setFields(listFields);
916913

917-
SaveDomainCommand saveCmd = new SaveDomainCommand(info.getSchema(), info.getTable());
914+
SaveDomainCommand saveCmd = new SaveDomainCommand(dgen.getSchema(), dgen.getQueryName());
918915
saveCmd.setDomainDesign(listDomain);
919-
DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), info.getFolder());
916+
DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), dgen.getContainerPath());
920917

921918
checker().verifyFalse("'removeMe' field was not deleted.",
922919
saveResponse.getDomain().getFields().stream()
@@ -932,16 +929,15 @@ public void testChangeListNameOverAPI() throws Exception
932929
new FieldDefinition("dewey", ColumnType.Decimal)
933930
);
934931
String listName = "remoteAPIBeforeRename";
935-
LookupInfo info = new LookupInfo(getProjectName(), "lists", listName);
936-
TestDataGenerator dgen = new TestDataGenerator(info)
932+
TestDataGenerator dgen = new TestDataGenerator("lists", listName, getProjectName())
937933
.withColumns(cols);
938934
DomainResponse createResponse = dgen.createList(createDefaultConnection(), "key");
939935
Domain listDomain = createResponse.getDomain();
940936
listDomain.setName("remoteAPIAfterRename");
941937

942938
SaveDomainCommand saveCmd = new SaveDomainCommand(listDomain.getDomainId());
943939
saveCmd.setDomainDesign(listDomain);
944-
DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), info.getFolder());
940+
DomainResponse saveResponse = saveCmd.execute(createDefaultConnection(), dgen.getContainerPath());
945941

946942
assertEquals("remoteAPIAfterRename", saveResponse.getDomain().getName());
947943
}
@@ -994,7 +990,6 @@ public void listSelfJoinTest()
994990
final String dummyCol = dummyBase + TRICKY_CHARACTERS;
995991
final String lookupField = "lookupField" + TRICKY_CHARACTERS;
996992
final String lookupSchema = "lists";
997-
final String lookupTable = listName;
998993
final String keyCol = "Key &%<+";
999994

1000995
log("Issue 6883: test list self join");
@@ -1003,7 +998,7 @@ public void listSelfJoinTest()
1003998
new FieldDefinition(dummyCol, ColumnType.String)
1004999
};
10051000
FieldDefinition lookupCol = new FieldDefinition(lookupField,
1006-
new LookupInfo(null, lookupSchema, lookupTable).setTableType(ColumnType.Integer));
1001+
new FieldDefinition.IntLookup(lookupSchema, listName, null));
10071002
// create the list
10081003
_listHelper.createList(PROJECT_VERIFY, listName, keyCol, columns);
10091004
// now add the lookup column (which references the new table)
@@ -1036,7 +1031,7 @@ private void crossContainerLookupTest()
10361031
goToProjectHome(PROJECT_OTHER);
10371032
//create list with look up A
10381033
String lookupColumn = "lookup";
1039-
FieldDefinition[] cols = new FieldDefinition[]{col(PROJECT_VERIFY, lookupColumn, ColumnType.Integer, "A" )};
1034+
FieldDefinition[] cols = new FieldDefinition[]{col(PROJECT_VERIFY, lookupColumn, "A" )};
10401035
_listHelper.createList(PROJECT_OTHER, crossContainerLookupList, "Key", cols);
10411036
_listHelper.goToList(crossContainerLookupList);
10421037
_listHelper.clickImportData();
@@ -1880,14 +1875,14 @@ FieldDefinition col(String name, ColumnType type)
18801875
return new FieldDefinition(name, type);
18811876
}
18821877

1883-
FieldDefinition col(String name, ColumnType type, String table)
1878+
FieldDefinition col(String name, String table)
18841879
{
1885-
return col(null, name, type, table);
1880+
return col(null, name, table);
18861881
}
18871882

1888-
FieldDefinition col(String folder, String name, ColumnType type, String table)
1883+
FieldDefinition col(String folder, String name, String table)
18891884
{
1890-
return new FieldDefinition(name, new LookupInfo(folder, "lists", table).setTableType(type));
1885+
return new FieldDefinition(name, new FieldDefinition.IntLookup("lists", table, folder));
18911886
}
18921887

18931888
FieldDefinition colURL(String name, ColumnType type, String url)
@@ -1898,7 +1893,7 @@ FieldDefinition colURL(String name, ColumnType type, String url)
18981893
List<FieldDefinition> Acolumns = Arrays.asList(
18991894
col("A", ColumnType.Integer),
19001895
colURL("title", ColumnType.String, "/junit/echoForm.view?key=${A}&title=${title}&table=A"),
1901-
col("Bfk", ColumnType.Integer, "B")
1896+
col("Bfk", "B")
19021897
);
19031898
String[][] Adata = new String[][]
19041899
{
@@ -1908,7 +1903,7 @@ FieldDefinition colURL(String name, ColumnType type, String url)
19081903
List<FieldDefinition> Bcolumns = Arrays.asList(
19091904
col("B", ColumnType.Integer),
19101905
colURL("title", ColumnType.String, "org.labkey.core.junit.JunitController$EchoFormAction.class?key=${B}&title=${title}&table=B"),
1911-
col("Cfk", ColumnType.Integer, "C")
1906+
col("Cfk", "C")
19121907
);
19131908
String[][] Bdata = new String[][]
19141909
{

‎src/org/labkey/test/util/TestDataGenerator.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,6 @@ public TestDataGenerator(String schema, String queryName, String containerPath)
110110
_containerPath = containerPath;
111111
}
112112

113-
/**
114-
* @deprecated This isn't actually a lookup
115-
*/
116-
@Deprecated (since = "22.4")
117-
public TestDataGenerator(FieldDefinition.LookupInfo lookupInfo)
118-
{
119-
this(lookupInfo.getSchema(), lookupInfo.getTable(), lookupInfo.getFolder());
120-
}
121-
122113
public static File writeCsvFile(List<FieldDefinition> fields, List<Map<String, Object>> entityData, String fileName) throws IOException
123114
{
124115
List<List<String>> rows = TestDataUtils.replaceColumnHeaders(
@@ -261,6 +252,11 @@ public String getQueryName()
261252
return _queryName;
262253
}
263254

255+
public String getContainerPath()
256+
{
257+
return _containerPath;
258+
}
259+
264260
public void setExcludedChars(String excludedChars)
265261
{
266262
_excludedChars = excludedChars;

0 commit comments

Comments
 (0)