Skip to content

Commit b21ab57

Browse files
committed
Fix data region column name references
Remove unnecessary logging parameters from CustomizeViewHelper Update CustomizeViewHelper to use FieldKey
1 parent 23dbaa4 commit b21ab57

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

OConnorExperiments/test/src/org/labkey/test/tests/OConnorExperimentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ protected void verifyExperimentWebpart(int row, String description, @Nullable St
146146
assertEquals(description, table.getDataAsText(row, "Description"));
147147
if (type != null)
148148
{
149-
assertEquals(type, table.getDataAsText(row, "ExperimentType"));
149+
assertEquals(type, table.getDataAsText(row, "ExperimentTypeId"));
150150
}
151151

152152
// Make sure each component of the ParentExperiments column is rendered with a link to the begin page for that experiment

genotyping/test/src/org/labkey/test/tests/HaplotypeAssayTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ private void verifyFirstRun()
286286
verifyColumnDataValues(drt, "Animal", "ID-1", "ID-2", "ID-3", "ID-4", "ID-5");
287287
verifyColumnDataValues(drt, "TotalReads", "1000", "2000", "3000", "4000", "5000");
288288
verifyColumnDataValues(drt, "IdentifiedReads", "300", "1000", "600", "2500", "3250");
289-
verifyColumnDataValues(drt, "%Unknown", "70.0", "50.0", "80.0", "37.5", "35.0");
289+
verifyColumnDataValues(drt, "PercentUnknown", "70.0", "50.0", "80.0", "37.5", "35.0");
290290
verifyColumnDataValues(drt, "MHC-AHaplotype1", "A001", "A023", "A001", "A004", "A002a");
291291
verifyColumnDataValues(drt, "MHC-AHaplotype2", "A023", "A021", "A001", "A023", "A002a");
292292
verifyColumnDataValues(drt, "MHC-BHaplotype1", "B015c", "B012b", "B001c", "B012b", "B002");
@@ -344,7 +344,7 @@ private void verifySecondRun(String prefix)
344344
verifyColumnDataValues(drt, "Animal", "ID-4", "ID-5", "ID-6", "ID-7", "ID-8", "ID-9");
345345
verifyColumnDataValues(drt, "TotalReads", "4000", "5000", "6000", "7000", " ", "0");
346346
verifyColumnDataValues(drt, "IdentifiedReads", "2500", "3250", "3000", "3500", " ", "1");
347-
verifyColumnDataValues(drt, "%Unknown", "37.5", "35.0", "50.0", "50.0", " ", " ");
347+
verifyColumnDataValues(drt, "PercentUnknown", "37.5", "35.0", "50.0", "50.0", " ", " ");
348348
verifyColumnDataValues(drt, prefix+"-AHaplotype1", "A001", " ", "A033", "A004", "A004", "A004");
349349
verifyColumnDataValues(drt, prefix+"-AHaplotype2", "A023", " ", "A033", " ", "A004", "A004");
350350
verifyColumnDataValues(drt, prefix+"-BHaplotype1", "B015c", " ", "B012b", "B033", "B033", "B033");

0 commit comments

Comments
 (0)