Skip to content

Cast response property to List instead of ArrayList #1282

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
merged 1 commit into from
Oct 26, 2022
Merged

Cast response property to List instead of ArrayList #1282

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
11 changes: 5 additions & 6 deletions src/org/labkey/test/tests/DomainDesignerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.hamcrest.CoreMatchers;
import org.json.JSONArray;
import org.json.JSONTokener;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
Expand Down Expand Up @@ -1367,7 +1366,7 @@ public void addUpdateRemoveRegexValidator() throws Exception
// now confirm 2 validators on the field
DomainResponse newResponse = dgen.getDomain(createDefaultConnection());
PropertyDescriptor snackField = getColumn(newResponse.getDomain(), "favoriteSnack");
List<Map<String, Object>> validators = (ArrayList<Map<String, Object>>)snackField.getAllProperties().get("propertyValidators");
List<Map<String, Object>> validators = (List<Map<String, Object>>)snackField.getAllProperties().get("propertyValidators");

// Domain designer UI only handles Range, Regex and Lookup validators
validators = validators.stream().filter(val ->
Expand Down Expand Up @@ -1438,7 +1437,7 @@ public void addUpdateRemoveRangeValidator() throws Exception
// now verify we have 2 formats on the size field
DomainResponse updatedResponse = dgen.getDomain(createDefaultConnection());
PropertyDescriptor updatedSizeCol = getColumn(updatedResponse.getDomain(), "size");
List<Map<String, Object>> validators = (ArrayList<Map<String, Object>>)updatedSizeCol.getAllProperties().get("propertyValidators");
List<Map<String, Object>> validators = (List<Map<String, Object>>)updatedSizeCol.getAllProperties().get("propertyValidators");
assertEquals("expect only 2 validators on the field",2, validators.size());
Map<String, Object> editedLte2 = getPropertyValidator(updatedSizeCol, "lte2");
Map<String, Object> editedEquals3 = getPropertyValidator(updatedSizeCol, "equals3");
Expand Down Expand Up @@ -1501,7 +1500,7 @@ public void addUpdateRemoveConditionalFormat() throws Exception
DomainResponse validationResponse = dgen.getDomain(createDefaultConnection());
PropertyDescriptor editedHeroCol = getColumn(validationResponse.getDomain(), "superHero");

List<Map<String, Object>> formats = (ArrayList<Map<String, Object>>)editedHeroCol.getAllProperties().get("conditionalFormats");
List<Map<String, Object>> formats = (List<Map<String, Object>>)editedHeroCol.getAllProperties().get("conditionalFormats");
assertEquals(2, formats.size());

Map<String, Object> editedThor = getConditionalFormats(editedHeroCol, "format.column~eq=Thor");
Expand Down Expand Up @@ -1750,7 +1749,7 @@ public PropertyDescriptor getColumn(Domain domain, String columnName)

public Map<String, Object> getPropertyValidator(PropertyDescriptor column, String name)
{
List<Map<String, Object>> validators = (ArrayList<Map<String, Object>>)column.getAllProperties().get("propertyValidators");
List<Map<String, Object>> validators = (List<Map<String, Object>>)column.getAllProperties().get("propertyValidators");
Map<String, Object> validator = validators.stream()
.filter(a-> a.get("name").equals(name))
.findFirst().orElse(null);
Expand All @@ -1760,7 +1759,7 @@ public Map<String, Object> getPropertyValidator(PropertyDescriptor column, Strin

public Map<String, Object> getConditionalFormats(PropertyDescriptor column, String filterExpression)
{
List<Map<String, Object>> formats = (ArrayList<Map<String, Object>>)column.getAllProperties().get("conditionalFormats");
List<Map<String, Object>> formats = (List<Map<String, Object>>)column.getAllProperties().get("conditionalFormats");
Map<String, Object> conditionalFormat = formats.stream()
.filter(a-> a.get("filter").equals(filterExpression))
.findFirst().orElse(null);
Expand Down