Merge branch 'develop' into fb_auditDiffCheckDeleteMove

cnathe · cnathe · commit 493d2e20af7d · 2025-06-13T07:42:41.000-05:00
diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java
@@ -452,7 +452,7 @@ public void testParentAliasExpression()
     public void testLookupNameExpression() throws Exception
     {
         String lookupList = "Colors";
-        FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.IntLookup("lists", lookupList, getProjectName());
+        FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.IntLookup(getProjectName(), "lists", lookupList);
         String nameExpSamples = "NameExpressionSamples";
 
         // begin by creating a lookupList of colors, the sampleType will reference it

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ public void testParentAliasExpression()`
`452`	`452`	`public void testLookupNameExpression() throws Exception`
`453`	`453`	`{`
`454`	`454`	`String lookupList = "Colors";`
`455`		`- FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.IntLookup("lists", lookupList, getProjectName());`
	`455`	`+ FieldDefinition.LookupInfo colorsLookup = new FieldDefinition.IntLookup(getProjectName(), "lists", lookupList);`
`456`	`456`	`String nameExpSamples = "NameExpressionSamples";`
`457`	`457`
`458`	`458`	`// begin by creating a lookupList of colors, the sampleType will reference it`