diff --git a/api/schemas/domainTemplate.xsd b/api/schemas/domainTemplate.xsd
index 12614675f79..e5472bfa5cc 100644
--- a/api/schemas/domainTemplate.xsd
+++ b/api/schemas/domainTemplate.xsd
@@ -46,6 +46,15 @@
+
+
+
+ Additional column names that should be considered reserved by the DomainKind for any
+ domain created from this template. These names are unioned with the DomainKind's
+ statically reserved set.
+
+
+
diff --git a/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java b/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java
index 5068f6e3218..d2f3df362f1 100644
--- a/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java
+++ b/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java
@@ -298,7 +298,7 @@ public boolean hasNullValues(Domain domain, DomainProperty prop)
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
Set names = new HashSet<>();
diff --git a/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java b/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
index 472427fbc1f..00bea3e08b9 100644
--- a/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
+++ b/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
@@ -261,13 +261,7 @@ public Set getBaseProperties(Domain domain)
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
- {
- return getReservedPropertyNames(domain, user, false);
- }
-
- @Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user, boolean forCreate)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
Set reserved = new CaseInsensitiveHashSet(RESERVED_NAMES);
diff --git a/api/src/org/labkey/api/exp/property/DomainKind.java b/api/src/org/labkey/api/exp/property/DomainKind.java
index da4cda6b2d0..0a0e70c4d50 100644
--- a/api/src/org/labkey/api/exp/property/DomainKind.java
+++ b/api/src/org/labkey/api/exp/property/DomainKind.java
@@ -61,9 +61,9 @@ abstract public class DomainKind implements Handler
abstract public String getKindName();
/**
- * Return a class of DomainKind's bean which carries domain specific properties.
- * This class will be used when marshalling/unmarshalling via Jackson during Create and Save/Update Domain
- * @return Class of DomainKind's bean with domain specific properties
+ * Return a class of DomainKind's bean which carries domain-specific properties.
+ * This class will be used when marshaling/unmarshaling via Jackson during Create and Save/Update Domain
+ * @return Class of DomainKind's bean with domain-specific properties
*/
abstract public Class getTypeClass();
@@ -108,15 +108,65 @@ public Map processArguments(Container container, User user, Map<
abstract public void deletePropertyDescriptor(Domain domain, User user, PropertyDescriptor pd);
/**
- * Return the set of names that should not be allowed for properties. E.g.
- * the names of columns from the hard table underlying this type
+ * Return the set of names that should not be allowed for properties. E.g., the names of columns
+ * from the hard table underlying this type, unioned with any names declared in the
+ * {@link DomainTemplate}'s {@code } element that this domain was created from.
+ *
+ * This method is {@code final}; subclasses contribute their kind-specific reserved set by overriding
+ * {@link #getKindReservedPropertyNames(Domain, User, boolean)}. The base class always unions that
+ * set with the template-declared set.
+ *
* @return set of strings containing the names. This will be compared ignoring case
*/
- abstract public Set getReservedPropertyNames(Domain domain, User user);
+ @NotNull
+ public final Set getReservedPropertyNames(Domain domain, User user)
+ {
+ return getReservedPropertyNames(domain, user, false);
+ }
+
+ @NotNull
+ public final Set getReservedPropertyNames(Domain domain, User user, boolean forCreate)
+ {
+ Set reserved = new CaseInsensitiveHashSet(getKindReservedPropertyNames(domain, user, forCreate));
+ reserved.addAll(getTemplateReservedPropertyNames(domain));
+ return reserved;
+ }
+
+ /**
+ * Return the kind-specific set of names that should not be allowed for properties. Subclasses override
+ * this to contribute their static/hard-coded reserved names. The base class will automatically union
+ * the result with any names declared in the {@link DomainTemplate}'s {@code }
+ * element via {@link #getReservedPropertyNames(Domain, User, boolean)}.
+ *
+ * @param forCreate true when validating names during domain creation; some kinds reserve additional
+ * names only at creation time.
+ * @return set of strings containing the names.
+ */
+ @NotNull
+ protected Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
+ {
+ return Collections.emptySet();
+ }
- public Set getReservedPropertyNames(Domain domain, User user, boolean forCreate)
+ /**
+ * Returns reserved column names declared in the {@link DomainTemplate} that this domain was created from
+ * (if any). These extend the kind's statically reserved set.
+ */
+ @NotNull
+ protected Set getTemplateReservedPropertyNames(@Nullable Domain domain)
{
- return getReservedPropertyNames(domain, user);
+ if (domain == null)
+ return Collections.emptySet();
+
+ TemplateInfo info = domain.getTemplateInfo();
+ if (info == null)
+ return Collections.emptySet();
+
+ DomainTemplate template = DomainTemplate.findTemplate(info, getKindName());
+ if (template == null)
+ return Collections.emptySet();
+
+ return template.getReservedColumnNames();
}
public Set getReservedPropertyNamePrefixes()
@@ -132,14 +182,14 @@ public Set getReservedPropertyNamePrefixes()
abstract public Set getMandatoryPropertyNames(Domain domain);
// CONSIDER: have DomainKind supply and IDomainInstance or similar
- // so that it can hold instance data (e.g. a DatasetDefinition)
+ // so that it can hold instance data (e.g., a DatasetDefinition)
/**
* Get DomainKind specific properties.
* @param domain The domain design.
* @param container Container
* @param user User
- * @return Return object that holds DomainKind specific properties.
+ * @return Return an object that holds DomainKind specific properties.
*/
abstract public @Nullable T getDomainKindProperties(GWTDomain domain, Container container, User user);
diff --git a/api/src/org/labkey/api/exp/property/DomainTemplate.java b/api/src/org/labkey/api/exp/property/DomainTemplate.java
index 5eb5ec5b761..00788895d72 100644
--- a/api/src/org/labkey/api/exp/property/DomainTemplate.java
+++ b/api/src/org/labkey/api/exp/property/DomainTemplate.java
@@ -15,6 +15,7 @@
*/
package org.labkey.api.exp.property;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
@@ -60,7 +61,6 @@
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -69,10 +69,6 @@
import java.util.Objects;
import java.util.Set;
-/**
- * User: kevink
- * Date: 1/6/16
- */
public class DomainTemplate
{
private final String _moduleName;
@@ -83,6 +79,7 @@ public class DomainTemplate
private final String _domainKind;
private final GWTDomain _domain;
private final Map _options;
+ private final Set _reservedColumnNames;
private final InitialDataSettings _initialData;
/**
@@ -132,7 +129,7 @@ public static DomainTemplate parse(String moduleName, String groupName, DomainTe
}
catch (IllegalArgumentException ex)
{
- return new DomainTemplate(Objects.toString(templateName, ""), moduleName, groupName, Arrays.asList(ex.getMessage()));
+ return new DomainTemplate(Objects.toString(templateName, ""), moduleName, groupName, List.of(ex.getMessage()));
}
}
@@ -148,8 +145,9 @@ private static DomainTemplate _parse(String templateName, String moduleName, Str
throw new IllegalArgumentException("Unknown template domain kind");
List indices = getDomainTemplateUniqueIndices(templateName, template, properties);
- Set mandatoryFieldNames = getDomainTemplateMandatoryFields(templateName, template, properties);
+ Set mandatoryFieldNames = getDomainTemplateMandatoryFields(template);
Map options = getDomainTemplateOptions(templateName, template, properties);
+ Set reservedColumnNames = getDomainTemplateReservedColumnNames(template);
GWTDomain domain = new GWTDomain<>();
domain.setName(templateName);
@@ -162,17 +160,33 @@ private static DomainTemplate _parse(String templateName, String moduleName, Str
return new DomainTemplate(
templateName, groupName, moduleName,
- domainKind, domain, options,
+ domainKind, domain, options, reservedColumnNames,
importData
);
}
+ private static Set getDomainTemplateReservedColumnNames(DomainTemplateType template)
+ {
+ if (!template.isSetReservedColumnNames())
+ return Collections.emptySet();
+
+ CaseInsensitiveHashSet set = new CaseInsensitiveHashSet();
+ for (String name : template.getReservedColumnNames().getColumnArray())
+ {
+ String validName = StringUtils.trimToNull(name);
+ if (validName != null)
+ set.add(validName);
+ }
+
+ return Collections.unmodifiableSet(set);
+ }
+
@Nullable
private static String getDomainKind(String templateName, DomainTemplateType template, List properties)
{
List> domainKinds = PropertyService.get().getDomainKinds();
- for (DomainKind domainKind : domainKinds)
+ for (DomainKind domainKind : domainKinds)
{
if (domainKind.matchesTemplateXML(templateName, template, properties))
{
@@ -198,7 +212,7 @@ private static List getDomainTemplateProperties(String te
}
}
- return Collections.unmodifiableList(new ArrayList<>(properties.values()));
+ return List.copyOf(properties.values());
}
private static List getDomainTemplateUniqueIndices(String templateName, DomainTemplateType template, List properties)
@@ -227,7 +241,7 @@ private static List getDomainTemplateUniqueIndices(String templateName
return Collections.unmodifiableList(indices);
}
- private static Set getDomainTemplateMandatoryFields(String templateName, DomainTemplateType template, List properties)
+ private static Set getDomainTemplateMandatoryFields(DomainTemplateType template)
{
CaseInsensitiveHashSet set = new CaseInsensitiveHashSet();
@@ -266,9 +280,9 @@ private static Map getDomainTemplateOptions(String templateName,
{
Map optionsMap = new HashMap<>();
- if (template instanceof ListTemplateType)
+ if (template instanceof ListTemplateType listTemplate)
{
- ListOptionsType options = ((ListTemplateType)template).getOptions();
+ ListOptionsType options = listTemplate.getOptions();
String keyName = options.getKeyCol();
optionsMap.put("keyName", keyName);
@@ -276,9 +290,9 @@ private static Map getDomainTemplateOptions(String templateName,
if (options.isSetKeyType())
optionsMap.put("keyType", options.getKeyType());
}
- else if (template instanceof DataClassTemplateType)
+ else if (template instanceof DataClassTemplateType dataClassTemplate)
{
- DataClassOptionsType options = ((DataClassTemplateType)template).getOptions();
+ DataClassOptionsType options = dataClassTemplate.getOptions();
if (options != null)
{
optionsMap.put("nameExpression", options.getNameExpression());
@@ -288,9 +302,9 @@ else if (template instanceof DataClassTemplateType)
optionsMap.put("category", options.getCategory());
}
}
- else if (template instanceof SampleSetTemplateType)
+ else if (template instanceof SampleSetTemplateType sampleTypeTemplate)
{
- SampleSetOptionsType options = ((SampleSetTemplateType)template).getOptions();
+ SampleSetOptionsType options = sampleTypeTemplate.getOptions();
if (options != null)
{
optionsMap.put("nameExpression", options.getNameExpression());
@@ -338,8 +352,9 @@ private static InitialDataSettings getImportDataSettings(String templateName, Do
}
private DomainTemplate(@NotNull String name, @NotNull String groupName, @NotNull String moduleName,
- @NotNull String domainKind, @NotNull GWTDomain domain,
- @NotNull Map options, @Nullable InitialDataSettings initialData)
+ @NotNull String domainKind, @NotNull GWTDomain domain,
+ @NotNull Map options, @NotNull Set reservedColumnNames,
+ @Nullable InitialDataSettings initialData)
{
_moduleName = moduleName;
_templateGroup = groupName;
@@ -348,6 +363,7 @@ private DomainTemplate(@NotNull String name, @NotNull String groupName, @NotNull
_errors = null;
_domain = domain;
_options = options;
+ _reservedColumnNames = reservedColumnNames;
_initialData = initialData;
}
@@ -361,6 +377,7 @@ private DomainTemplate(@NotNull String name, @NotNull String groupName, @NotNull
_domainKind = null;
_domain = null;
_options = null;
+ _reservedColumnNames = Collections.emptySet();
_initialData = null;
}
@@ -568,6 +585,11 @@ public Set getMandatoryPropertyNames()
return _domain.getMandatoryFieldNames();
}
+ @NotNull
+ public Set getReservedColumnNames()
+ {
+ return _reservedColumnNames;
+ }
private static class InitialDataSettings
{
diff --git a/api/src/org/labkey/api/exp/property/TestDomainKind.java b/api/src/org/labkey/api/exp/property/TestDomainKind.java
index 99aabb991f7..eff13d44b8c 100644
--- a/api/src/org/labkey/api/exp/property/TestDomainKind.java
+++ b/api/src/org/labkey/api/exp/property/TestDomainKind.java
@@ -148,7 +148,7 @@ public void deletePropertyDescriptor(Domain domain, User user, PropertyDescripto
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
throw new UnsupportedOperationException();
}
diff --git a/api/src/org/labkey/api/query/SimpleTableDomainKind.java b/api/src/org/labkey/api/query/SimpleTableDomainKind.java
index b857ae91139..545985ebed2 100644
--- a/api/src/org/labkey/api/query/SimpleTableDomainKind.java
+++ b/api/src/org/labkey/api/query/SimpleTableDomainKind.java
@@ -236,7 +236,7 @@ public boolean canCreateDefinition(User user, Container container)
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
SimpleUserSchema.SimpleTable table = domain != null ? getTable(domain, user) : null;
if (table != null)
diff --git a/assay/api-src/org/labkey/api/assay/AssayBatchDomainKind.java b/assay/api-src/org/labkey/api/assay/AssayBatchDomainKind.java
index 890cfec7691..9ff76997f1c 100644
--- a/assay/api-src/org/labkey/api/assay/AssayBatchDomainKind.java
+++ b/assay/api-src/org/labkey/api/assay/AssayBatchDomainKind.java
@@ -25,10 +25,6 @@
import java.util.Arrays;
import java.util.Set;
-/**
- * User: jeckels
- * Date: Jan 27, 2012
- */
public class AssayBatchDomainKind extends AssayDomainKind
{
private static final Set RESERVED_NAMES;
@@ -50,7 +46,7 @@ public String getKindName()
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
diff --git a/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java b/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java
index c6de4802ecb..6ac6c91682b 100644
--- a/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java
+++ b/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java
@@ -127,7 +127,7 @@ public DbSchema getSchema()
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
diff --git a/assay/api-src/org/labkey/api/assay/AssayRunDomainKind.java b/assay/api-src/org/labkey/api/assay/AssayRunDomainKind.java
index 2915b7a10d6..9d7a0ab3bf4 100644
--- a/assay/api-src/org/labkey/api/assay/AssayRunDomainKind.java
+++ b/assay/api-src/org/labkey/api/assay/AssayRunDomainKind.java
@@ -53,7 +53,7 @@ public String getKindName()
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
diff --git a/assay/src/org/labkey/assay/DefaultAssayDomainKind.java b/assay/src/org/labkey/assay/DefaultAssayDomainKind.java
index 56fef31c8f8..b8bdd764277 100644
--- a/assay/src/org/labkey/assay/DefaultAssayDomainKind.java
+++ b/assay/src/org/labkey/assay/DefaultAssayDomainKind.java
@@ -43,7 +43,7 @@ public String getKindName()
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return getAssayReservedPropertyNames();
}
diff --git a/assay/src/org/labkey/assay/PlateBasedAssaySampleTypeDomainKind.java b/assay/src/org/labkey/assay/PlateBasedAssaySampleTypeDomainKind.java
index 9ab3ad3a777..772e1d30907 100644
--- a/assay/src/org/labkey/assay/PlateBasedAssaySampleTypeDomainKind.java
+++ b/assay/src/org/labkey/assay/PlateBasedAssaySampleTypeDomainKind.java
@@ -55,12 +55,6 @@ public String getKindName()
{
return null;
}
-
- @Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
- {
- return Collections.emptySet();
- }
};
}
diff --git a/assay/src/org/labkey/assay/plate/PlateMetadataDomainKind.java b/assay/src/org/labkey/assay/plate/PlateMetadataDomainKind.java
index 88d82a3a52e..e160a02edb8 100644
--- a/assay/src/org/labkey/assay/plate/PlateMetadataDomainKind.java
+++ b/assay/src/org/labkey/assay/plate/PlateMetadataDomainKind.java
@@ -217,7 +217,7 @@ public SQLFragment sqlObjectIdsInDomain(Domain domain)
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
diff --git a/assay/src/org/labkey/assay/plate/PlateReplicateStatsDomainKind.java b/assay/src/org/labkey/assay/plate/PlateReplicateStatsDomainKind.java
index a25e0911006..60cfa796b1e 100644
--- a/assay/src/org/labkey/assay/plate/PlateReplicateStatsDomainKind.java
+++ b/assay/src/org/labkey/assay/plate/PlateReplicateStatsDomainKind.java
@@ -51,7 +51,7 @@ public String getKindName()
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return getAssayReservedPropertyNames();
}
diff --git a/core/src/org/labkey/core/query/UsersDomainKind.java b/core/src/org/labkey/core/query/UsersDomainKind.java
index 34f17f07dbe..db44d254cdf 100644
--- a/core/src/org/labkey/core/query/UsersDomainKind.java
+++ b/core/src/org/labkey/core/query/UsersDomainKind.java
@@ -159,7 +159,7 @@ public Domain createDomain(GWTDomain domain, JSONObject arguments, Container con
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return _reservedNames;
}
diff --git a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
index 3b9d5d1cc8e..d10b8b7700f 100644
--- a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
+++ b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
@@ -232,7 +232,7 @@ public Set getBaseProperties(Domain domain)
}
@Override
- public @NotNull Set getReservedPropertyNames(Domain domain, User user)
+ protected @NotNull Set getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
diff --git a/experiment/src/org/labkey/experiment/api/ExpDataClassDataTestCase.jsp b/experiment/src/org/labkey/experiment/api/ExpDataClassDataTestCase.jsp
index 1d316902bd2..888f2213c99 100644
--- a/experiment/src/org/labkey/experiment/api/ExpDataClassDataTestCase.jsp
+++ b/experiment/src/org/labkey/experiment/api/ExpDataClassDataTestCase.jsp
@@ -17,7 +17,6 @@
<%@ page import="org.apache.commons.lang3.StringUtils" %>
<%@ page import="org.jetbrains.annotations.NotNull" %>
<%@ page import="org.junit.After" %>
-<%@ page import="org.junit.Assume" %>
<%@ page import="org.junit.Before" %>
<%@ page import="org.junit.Test" %>
<%@ page import="org.labkey.api.action.ApiUsageException" %>
@@ -67,8 +66,6 @@
<%@ page import="org.labkey.api.gwt.client.model.GWTDomain" %>
<%@ page import="org.labkey.api.gwt.client.model.GWTIndex" %>
<%@ page import="org.labkey.api.gwt.client.model.GWTPropertyDescriptor" %>
-<%@ page import="org.labkey.api.module.Module" %>
-<%@ page import="org.labkey.api.module.ModuleLoader" %>
<%@ page import="org.labkey.api.query.BatchValidationException" %>
<%@ page import="org.labkey.api.query.DefaultSchema" %>
<%@ page import="org.labkey.api.query.FieldKey" %>
@@ -95,7 +92,6 @@
<%@ page import="org.labkey.remoteapi.query.SelectRowsResponse" %>
<%@ page import="java.sql.SQLException" %>
<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Arrays" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Collections" %>
<%@ page import="java.util.HashSet" %>
@@ -110,43 +106,52 @@
<%@ page import="static org.labkey.api.util.IntegerUtils.asInteger" %>
<%@ page import="static org.labkey.api.util.IntegerUtils.asLong" %>
<%@ page import="static org.hamcrest.Matchers.containsString" %>
+<%@ page import="org.junit.BeforeClass" %>
+<%@ page import="org.junit.AfterClass" %>
<%@ page extends="org.labkey.api.jsp.JspTest.BVT" %>
<%!
+static final String PROJECT_NAME = "_testDataClass";
ExpProvisionedTableTestHelper helper = new ExpProvisionedTableTestHelper();
Container c;
+static User _user;
+
+@BeforeClass
+public static void setUp()
+{
+ _user = TestContext.get().getUser();
+}
@Before
-public void setUp()
+public void ensureProject()
{
- // NOTE: We need to use a project to create the DataClass so we can insert rows into sub-folders
- c = ContainerManager.getForPath("_testDataClass");
- if (c != null)
- ContainerManager.deleteAll(c, TestContext.get().getUser());
- c = ContainerManager.createContainer(ContainerManager.getRoot(), "_testDataClass", TestContext.get().getUser());
+ // Some tests delete the project so ensure it is available for the next test
+ c = ContainerManager.ensureContainer(PROJECT_NAME, _user);
}
@After
-public void tearDown() throws InterruptedException
+public void drainQueue() throws InterruptedException
{
// Wait for the indexer to finish working on the data we just added to help avoid deadlocks
SearchService.get().drainQueue(SearchService.PRIORITY.crawl, 15, TimeUnit.SECONDS);
- ContainerManager.deleteAll(c, TestContext.get().getUser());
}
+@AfterClass
+public static void tearDown()
+{
+ Container project = ContainerManager.getForPath(PROJECT_NAME);
+ if (project != null)
+ ContainerManager.deleteAll(project, _user);
+}
// validate name is not null
@Test
public void nameNotNull() throws Exception
{
- final User user = TestContext.get().getUser();
-
try
{
- List props = new ArrayList<>();
- props.add(new GWTPropertyDescriptor("foo", "string"));
-
- ExperimentServiceImpl.get().createDataClass(c, user, null, null, props, emptyList(), null, null);
+ List props = List.of(new GWTPropertyDescriptor("foo", "string"));
+ ExperimentServiceImpl.get().createDataClass(c, _user, null, null, props, emptyList(), null, null);
}
catch (ApiUsageException e)
{
@@ -157,14 +162,10 @@ public void nameNotNull() throws Exception
@Test // Issue 51321
public void reservedNameFirst() throws Exception
{
- final User user = TestContext.get().getUser();
-
try
{
- List props = new ArrayList<>();
- props.add(new GWTPropertyDescriptor("foo", "string"));
-
- ExperimentServiceImpl.get().createDataClass(c, user, "First", null, props, emptyList(), null, null);
+ List props = List.of(new GWTPropertyDescriptor("foo", "string"));
+ ExperimentServiceImpl.get().createDataClass(c, _user, "First", null, props, emptyList(), null, null);
}
catch (ApiUsageException e)
{
@@ -175,14 +176,10 @@ public void reservedNameFirst() throws Exception
@Test // Issue 51321
public void reservedNameAll() throws Exception
{
- final User user = TestContext.get().getUser();
-
try
{
- List props = new ArrayList<>();
- props.add(new GWTPropertyDescriptor("foo", "string"));
-
- ExperimentServiceImpl.get().createDataClass(c, user, "All", null, props, emptyList(), null, null);
+ List props = List.of(new GWTPropertyDescriptor("foo", "string"));
+ ExperimentServiceImpl.get().createDataClass(c, _user, "All", null, props, emptyList(), null, null);
}
catch (ApiUsageException e)
{
@@ -194,15 +191,11 @@ public void reservedNameAll() throws Exception
@Test
public void nameScale() throws Exception
{
- final User user = TestContext.get().getUser();
-
try
{
- List props = new ArrayList<>();
- props.add(new GWTPropertyDescriptor("foo", "string"));
-
+ List props = List.of(new GWTPropertyDescriptor("foo", "string"));
String name = StringUtils.repeat("a", 1000);
- ExperimentServiceImpl.get().createDataClass(c, user, name, null, props, emptyList(), null, null);
+ ExperimentServiceImpl.get().createDataClass(c, _user, name, null, props, emptyList(), null, null);
}
catch (ApiUsageException e)
{
@@ -214,17 +207,12 @@ public void nameScale() throws Exception
@Test
public void nameExpressionScale() throws Exception
{
- final User user = TestContext.get().getUser();
-
try
{
- List props = new ArrayList<>();
- props.add(new GWTPropertyDescriptor("foo", "string"));
-
+ List props = List.of(new GWTPropertyDescriptor("foo", "string"));
DataClassDomainKindProperties options = new DataClassDomainKindProperties();
options.setNameExpression(StringUtils.repeat("a", 1000));
-
- ExperimentServiceImpl.get().createDataClass(c, user, "testing", options, props, emptyList(), null, null);
+ ExperimentServiceImpl.get().createDataClass(c, _user, "testing", options, props, emptyList(), null, null);
}
catch (ApiUsageException e)
{
@@ -232,25 +220,21 @@ public void nameExpressionScale() throws Exception
}
}
-
@Test
public void testDataClass() throws Exception
{
- final User user = TestContext.get().getUser();
- final Container sub = ContainerManager.createContainer(c, "sub", TestContext.get().getUser());
+ final Container sub = ContainerManager.createContainer(c, "subTestDataClass", _user);
final String dataClassName = "testing";
- List props = new ArrayList<>();
- props.add(new GWTPropertyDescriptor("aa", "int"));
- props.add(new GWTPropertyDescriptor("bb", "string"));
-
- List indices = new ArrayList<>();
- indices.add(new GWTIndex(Arrays.asList("aa"), true));
-
+ List props = List.of(
+ new GWTPropertyDescriptor("aa", "int"),
+ new GWTPropertyDescriptor("bb", "string")
+ );
+ List indices = List.of(new GWTIndex(List.of("aa"), true));
DataClassDomainKindProperties options = new DataClassDomainKindProperties();
options.setNameExpression("JUNIT-${genId}-${aa}");
- final ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, user, dataClassName, options, props, indices, null, null);
+ final ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, dataClassName, options, props, indices, null, null);
assertNotNull(dataClass);
final Domain domain = dataClass.getDomain();
@@ -263,20 +247,16 @@ public void testDataClass() throws Exception
String expectedSubName = "JUNIT-3-30";
testInsertIntoSubfolder(dataClass, table, sub, expectedSubName);
testTruncateRows(dataClass, table, expectedName, expectedSubName);
- testBulkImport(dataClass, table, user);
- testInsertAliases(dataClass, table);
- testEmptyInsert(dataClass, table, user);
- testDeleteExpData(dataClass, user, 3);
- testDeleteExpDataClass(dataClass, user, table, domain.getTypeURI());
+ testBulkImport(dataClass, table);
+ testInsertAliases(table);
+ testEmptyInsert(table, _user);
+ testDeleteExpData(dataClass, _user, 3);
+ testDeleteExpDataClass(dataClass, _user, table, domain.getTypeURI());
}
private void testNameExpressionGeneration(ExpDataClassImpl dataClass, TableInfo table, String expectedName) throws Exception
{
- List> rows = new ArrayList<>();
- Map row = new CaseInsensitiveHashMap<>();
- row.put("aa", 20);
- row.put("bb", "hi");
- rows.add(row);
+ List> rows = List.of(CaseInsensitiveHashMap.of("aa", 20, "bb", "hi"));
List> ret;
try (DbScope.Transaction tx = table.getSchema().getScope().beginTransaction())
@@ -300,13 +280,8 @@ private void testNameExpressionGeneration(ExpDataClassImpl dataClass, TableInfo
private void testInsertIntoSubfolder(ExpDataClassImpl dataClass, TableInfo table, Container sub, String expectedSubName) throws Exception
{
- List> rows = new ArrayList<>();
- Map row = new CaseInsensitiveHashMap<>();
- row.put("aa", 30);
- row.put("bb", "bye");
String expectedComment = "waving in the wind";
- row.put("flag", expectedComment);
- rows.add(row);
+ List> rows = List.of(CaseInsensitiveHashMap.of("aa", 30, "bb", "bye", "flag", expectedComment));
List> ret;
try (DbScope.Transaction tx = table.getSchema().getScope().beginTransaction())
@@ -327,11 +302,7 @@ private void testInsertIntoSubfolder(ExpDataClassImpl dataClass, TableInfo table
private void testInsertDuplicate(ExpDataClassImpl dataClass, TableInfo table) throws Exception
{
- List> rows = new ArrayList<>();
- Map row = new CaseInsensitiveHashMap<>();
- row.put("aa", 20);
- row.put("bb", "bye");
- rows.add(row);
+ List> rows = List.of(CaseInsensitiveHashMap.of("aa", 20, "bb", "bye"));
try (DbScope.Transaction tx = table.getSchema().getScope().beginTransaction())
{
@@ -356,32 +327,24 @@ private void testTruncateRows(ExpDataClassImpl dataClass, TableInfo table, Strin
{
// TODO: truncate rows API doesn't support truncating from all containers
//count = table.getUpdateService().truncateRows(user, c, null, null);
- count = ExperimentServiceImpl.get().truncateDataClass(dataClass, TestContext.get().getUser(), null);
+ count = ExperimentServiceImpl.get().truncateDataClass(dataClass, _user, null);
tx.commit();
}
- assertEquals(2, count);
+ assertEquals(2, count);
assertEquals(0, dataClass.getDatas().size());
assertNull(ExperimentService.get().getExpData(dataClass, expectedName));
assertNull(ExperimentService.get().getExpData(dataClass, expectedSubName));
}
-private void testBulkImport(ExpDataClassImpl dataClass, TableInfo table, User user) throws Exception
+private void testBulkImport(ExpDataClassImpl dataClass, TableInfo table) throws Exception
{
- List> rows = new ArrayList<>();
- Map row = new CaseInsensitiveHashMap<>();
- row.put("aa", 40);
- row.put("bb", "qq");
- row.put("alias", "a");
- rows.add(row);
-
- row = new CaseInsensitiveHashMap<>();
- row.put("aa", 50);
- row.put("bb", "zz");
- row.put("alias", "a,b,c");
- rows.add(row);
+ List> rows = List.of(
+ CaseInsensitiveHashMap.of("aa", 40, "bb", "qq", "alias", "a"),
+ CaseInsensitiveHashMap.of("aa", 50, "bb", "zz", "alias", "a,b,c")
+ );
- int count = table.getUpdateService().loadRows(user, c, MapDataIterator.of(rows), new DataIteratorContext(), null);
+ int count = table.getUpdateService().loadRows(_user, c, MapDataIterator.of(rows), new DataIteratorContext(), null);
assertEquals(2, count);
assertEquals(2, dataClass.getDatas().size());
@@ -421,24 +384,19 @@ private void testDeleteExpDataClass(ExpDataClassImpl dataClass, User user, Table
assertNull(dbTable);
}
-private void testInsertAliases(ExpDataClassImpl dataClass, TableInfo table) throws Exception
+private void testInsertAliases(TableInfo table) throws Exception
{
- List> rows = new ArrayList<>();
- Map row = new CaseInsensitiveHashMap<>();
- row.put("aa", 20);
- row.put("bb", "bye");
- row.put("alias", "aa,bb");
- rows.add(row);
+ Map row = CaseInsensitiveHashMap.of("aa", 20, "bb", "bye", "alias", "aa,bb");
long insertedRowId;
try (DbScope.Transaction tx = table.getSchema().getScope().beginTransaction())
{
- List> ret = helper.insertRows(c, rows, table.getName());
+ List> ret = helper.insertRows(c, List.of(row), table.getName());
insertedRowId = asLong(ret.getFirst().get("rowId"));
tx.commit();
}
- verifyAliases(table, insertedRowId, Set.of("aa","bb"));
+ verifyAliases(table, insertedRowId, Set.of("aa", "bb"));
}
private void verifyAliases(TableInfo table, long expDataRowId, Set expectedAliases) throws Exception
@@ -496,11 +454,10 @@ private void verifyAliasesViaSelectRows(String schemaName, String queryName, lon
}
// Issue 35013: Importing a file with zero rows into a DataClass results in NPE
-private void testEmptyInsert(ExpDataClassImpl dataClass, TableInfo table, User user) throws Exception
+private void testEmptyInsert(TableInfo table, User user) throws Exception
{
- List> rows = new ArrayList<>();
BatchValidationException errors = new BatchValidationException();
- int count = table.getUpdateService().importRows(user, c, MapDataIterator.of(rows), errors, null, null);
+ int count = table.getUpdateService().importRows(user, c, MapDataIterator.of(List.of()), errors, null, null);
if (errors.hasErrors())
throw errors;
assertEquals(0, count);
@@ -509,32 +466,18 @@ private void testEmptyInsert(ExpDataClassImpl dataClass, TableInfo table, User u
@Test
public void testDataClassFromTemplate() throws Exception
{
- if (!AppProps.getInstance().isDevMode()) // Skip test in production mode if necessary modules are not available
- {
- Assume.assumeTrue("List module is required to test data class templates", ModuleLoader.getInstance().getModule("list") != null);
- Assume.assumeTrue("simpletest module is required to test data class templates", ModuleLoader.getInstance().getModule("simpletest") != null);
- }
-
- final User user = TestContext.get().getUser();
- final Container sub = ContainerManager.createContainer(c, "sub2", TestContext.get().getUser());
+ ExpProvisionedTableTestHelper.requireSimpleTestModule(c);
+ final Container sub = ContainerManager.createContainer(c, "sub2", _user);
final String domainName = "mydataclass";
- Set activeModules = new HashSet<>(c.getActiveModules());
- Module m = ModuleLoader.getInstance().getModule("simpletest");
- assertNotNull("This test requires 'simplemodule' to be deployed", m);
- activeModules.add(m);
- c.setActiveModules(activeModules);
-
DomainTemplateGroup templateGroup = DomainTemplateGroup.get(c, "TestingFromTemplate");
assertNotNull(templateGroup);
- assertFalse(
- "Errors in template: " + StringUtils.join(templateGroup.getErrors(), ", "),
- templateGroup.hasErrors());
+ assertFalse("Errors in template: " + StringUtils.join(templateGroup.getErrors(), ", "), templateGroup.hasErrors());
DomainTemplate template = templateGroup.getTemplate("testingFromTemplate");
assertNotNull(template);
- final Domain domain = template.createAndImport(c, user, domainName, true, false);
+ final Domain domain = template.createAndImport(c, _user, domainName, true, false);
assertNotNull(domain);
TemplateInfo t = domain.getTemplateInfo();
@@ -543,16 +486,18 @@ public void testDataClassFromTemplate() throws Exception
assertEquals("TestingFromTemplate", t.getTemplateGroupName());
assertEquals("testingFromTemplate", t.getTableName());
- DomainKind kind = domain.getDomainKind();
+ DomainKind kind = domain.getDomainKind();
assertTrue(kind instanceof DataClassDomainKind);
Set mandatory = kind.getMandatoryPropertyNames(domain);
assertTrue("Expected template to set 'aa' as mandatory: " + mandatory, mandatory.contains("aa"));
+ helper.verifyReservedColumnNames(c, _user, domain);
+
ExpDataClassImpl dataClass = (ExpDataClassImpl)ExperimentService.get().getDataClass(c, domainName);
assertNotNull(dataClass);
// add ConceptURI mappings for this container
- String listName = createConceptLookupList(c, user);
+ String listName = createConceptLookupList(c, _user);
Lookup lookup = new Lookup(c, "lists", listName);
ConceptURIProperties.setLookup(c, "http://cpas.labkey.com/Experiment#Testing", lookup);
@@ -570,9 +515,9 @@ public void testDataClassFromTemplate() throws Exception
String expectedSubName = "TEST-3-30";
testInsertIntoSubfolder(dataClass, table, sub, expectedSubName);
testTruncateRows(dataClass, table, expectedName, expectedSubName);
- testBulkImport(dataClass, table, user);
- testDeleteExpData(dataClass, user, 2);
- testDeleteExpDataClass(dataClass, user, table, domain.getTypeURI());
+ testBulkImport(dataClass, table);
+ testDeleteExpData(dataClass, _user, 2);
+ testDeleteExpDataClass(dataClass, _user, table, domain.getTypeURI());
}
private String createConceptLookupList(Container c, User user) throws Exception
@@ -583,44 +528,26 @@ private String createConceptLookupList(Container c, User user) throws Exception
list.getDomain().addProperty(new PropertyStorageSpec("Key", JdbcType.INTEGER));
list.getDomain().addProperty(new PropertyStorageSpec("Value", JdbcType.VARCHAR));
list.save(user);
- List lis = new ArrayList<>();
ListItem li = list.createListItem();
li.setProperty(list.getDomain().getPropertyByName("Key"), 20);
li.setProperty(list.getDomain().getPropertyByName("Value"), "Value 20");
- lis.add(li);
- list.insertListItems(user, c, lis);
+ list.insertListItems(user, c, List.of(li));
return listName;
}
-
@Test
public void testDomainTemplate() throws Exception
{
- if (!AppProps.getInstance().isDevMode()) // Skip test in production mode if necessary modules are not available
- {
- Assume.assumeTrue("List module is required to test domain templates", ModuleLoader.getInstance().getModule("list") != null);
- Assume.assumeTrue("simpletest module is required to test domain templates", ModuleLoader.getInstance().getModule("simpletest") != null);
- }
-
- final User user = TestContext.get().getUser();
- final Container sub = ContainerManager.createContainer(c, "sub3", user);
-
- Set activeModules = new HashSet<>(c.getActiveModules());
- Module m = ModuleLoader.getInstance().getModule("simpletest");
- assertNotNull("This test requires 'simplemodule' to be deployed", m);
- activeModules.add(m);
- c.setActiveModules(activeModules);
-
+ ExpProvisionedTableTestHelper.requireSimpleTestModule(c);
+ final Container sub = ContainerManager.createContainer(c, "sub3", _user);
DomainTemplateGroup templateGroup = DomainTemplateGroup.get(c, "todolist");
assertNotNull(templateGroup);
- assertFalse(
- "Errors in template: " + StringUtils.join(templateGroup.getErrors(), ", "),
- templateGroup.hasErrors());
+ assertFalse("Errors in template: " + StringUtils.join(templateGroup.getErrors(), ", "), templateGroup.hasErrors());
- List created = templateGroup.createAndImport(sub, user, true, true);
+ templateGroup.createAndImport(sub, _user, true, true);
// verify the "Priority" list was created and data was imported
- UserSchema listSchema = QueryService.get().getUserSchema(user, sub, "lists");
+ UserSchema listSchema = QueryService.get().getUserSchema(_user, sub, "lists");
TableInfo priorityTable = listSchema.getTable("Priority");
Collection> priorities = new TableSelector(priorityTable).getMapCollection();
@@ -638,7 +565,7 @@ public void testDomainTemplate() throws Exception
try (DbScope.Transaction tx = priorityTable.getSchema().getScope().beginTransaction())
{
BatchValidationException errors = new BatchValidationException();
- ret = priorityTable.getUpdateService().insertRows(user, sub, rows, errors, null, null);
+ ret = priorityTable.getUpdateService().insertRows(_user, sub, rows, errors, null, null);
if (errors.hasErrors())
throw errors;
tx.commit();
@@ -666,7 +593,7 @@ public void testDomainTemplate() throws Exception
try (DbScope.Transaction tx = milestoneTable.getSchema().getScope().beginTransaction())
{
BatchValidationException errors = new BatchValidationException();
- ret = milestoneTable.getUpdateService().insertRows(user, sub, rows, errors, null, null);
+ ret = milestoneTable.getUpdateService().insertRows(_user, sub, rows, errors, null, null);
if (errors.hasErrors())
throw errors;
tx.commit();
@@ -678,7 +605,7 @@ public void testDomainTemplate() throws Exception
}
// verify the "TodoList" DataClass was created and data was imported
- UserSchema expSchema = QueryService.get().getUserSchema(user, sub, helper.expDataSchemaKey);
+ UserSchema expSchema = QueryService.get().getUserSchema(_user, sub, helper.expDataSchemaKey);
TableInfo table = expSchema.getTable("TodoList");
assertNotNull("data class not in query schema", table);
@@ -691,22 +618,27 @@ public void testDomainTemplate() throws Exception
ExpData data = ExperimentServiceImpl.get().getExpData(dataClass, "TODO-1");
Collection aliases = data.getAliases();
- assertTrue("Expected aliases to contain 'xsd' and 'domain templates', got: " + aliases, aliases.containsAll(Arrays.asList("xsd", "domain templates")));
-}
+ assertTrue("Expected aliases to contain 'xsd' and 'domain templates', got: " + aliases, aliases.containsAll(List.of("xsd", "domain templates")));
+ // Verify reserved column names on lists
+ TableInfo categoryTable = listSchema.getTable("Category");
+ Domain categoryDomain = categoryTable.getDomain();
+ assertNotNull(categoryDomain);
+
+ helper.verifyReservedColumnNames(c, _user, categoryTable.getDomain());
+}
// Issue 25224: NPE trying to delete a folder with a DataClass with at least one result row in it
@Test
public void testContainerDelete() throws Exception
{
- final User user = TestContext.get().getUser();
- final Container sub = ContainerManager.createContainer(c, "sub", user);
+ final Container sub = ContainerManager.createContainer(c, "subTestContainerDelete", _user);
final String dataClassName = "testing";
List props = new ArrayList<>();
props.add(new GWTPropertyDescriptor("aa", "int"));
- final ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, user, dataClassName, null, props, emptyList(), null, null);
+ final ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, dataClassName, null, props, emptyList(), null, null);
final long dataClassId = dataClass.getRowId();
TableInfo table = getDataClassTable(dataClassName);
@@ -764,7 +696,7 @@ public void testContainerDelete() throws Exception
assertNotNull(dbTable);
// delete
- ContainerManager.deleteAll(c, user);
+ ContainerManager.deleteAll(c, _user);
// verify deleted
assertNull(ExperimentServiceImpl.get().getDataClass(dataClassId));
@@ -780,19 +712,17 @@ public void testContainerDelete() throws Exception
@Test
public void testLargeUniqueOnSingleColumnOnly() throws ExperimentException
{
- final User user = TestContext.get().getUser();
-
List props = new ArrayList<>();
props.add(new GWTPropertyDescriptor("aa", "int"));
props.add(new GWTPropertyDescriptor("bb", "multiLine"));
List indices = new ArrayList<>();
- indices.add(new GWTIndex(Arrays.asList("aa", "bb"), true));
+ indices.add(new GWTIndex(List.of("aa", "bb"), true));
boolean sqlServer = ExperimentService.get().getSchema().getSqlDialect().isSqlServer();
try
{
- final ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, user, "largeUnique", null, props, indices, null, null);
+ final ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, "largeUnique", null, props, indices, null, null);
if (sqlServer)
fail("Expected exception creating large index over two columns");
}
@@ -808,8 +738,6 @@ public void testLargeUniqueOnSingleColumnOnly() throws ExperimentException
@Test
public void testLargeUnique() throws Exception
{
- final User user = TestContext.get().getUser();
-
boolean sqlServer = ExperimentService.get().getSchema().getSqlDialect().isSqlServer();
List props = new ArrayList<>();
props.add(new GWTPropertyDescriptor("aa", "int"));
@@ -817,23 +745,21 @@ public void testLargeUnique() throws Exception
prop.setScale(20000);
props.add(prop);
- List indices = new ArrayList<>();
- indices.add(new GWTIndex(Arrays.asList("bb"), true));
-
+ List indices = List.of(new GWTIndex(List.of("bb"), true));
DataClassDomainKindProperties options = new DataClassDomainKindProperties();
options.setNameExpression("JUNIT-${genId}-${aa}");
ExpDataClassImpl dataClass;
try
{
- dataClass = ExperimentServiceImpl.get().createDataClass(c, user, "largeUnique2", options, props, indices, null, null);
+ dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, "largeUnique2", options, props, indices, null, null);
}
catch (IllegalArgumentException e)
{
// Not supported on SQL Server, so create with no indices
assertTrue("Expected exception creating large index over two columns", e.getMessage().contains("Index over large columns is not supported"));
assertTrue(sqlServer);
- dataClass = ExperimentServiceImpl.get().createDataClass(c, user, "largeUnique2", options, props, List.of(), null, null);
+ dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, "largeUnique2", options, props, List.of(), null, null);
}
List> rows = new ArrayList<>();
@@ -879,22 +805,20 @@ private ArrayListMap newArrayListMap()
@Test
public void testDataClassWithVocabularyProperties() throws Exception
{
- User user = TestContext.get().getUser();
-
String dataClassName = "DataClassesWithVocabularyProperties";
int dataClassAge = 2;
int updatedDataClassAge = 4;
String dataClassType = "TypeB";
String dataClassColor = "Orange";
- Domain testDomain = helper.createVocabularyTestDomain(user, c);
+ Domain testDomain = helper.createVocabularyTestDomain(_user, c);
Map vocabularyPropertyURIs = helper.getVocabularyPropertyURIS(testDomain);
final String colorPropertyURI = vocabularyPropertyURIs.get(ExpProvisionedTableTestHelper.colorPropertyName);
final String agePropertyURI = vocabularyPropertyURIs.get(ExpProvisionedTableTestHelper.agePropertyName);
final String typePropertyURI = vocabularyPropertyURIs.get(ExpProvisionedTableTestHelper.typePropertyName);
- ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, user, dataClassName, null,
+ ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, dataClassName, null,
List.of(new GWTPropertyDescriptor("OtherProp", "string")), emptyList(), null, null);
assertNotNull(dataClass);
@@ -954,17 +878,15 @@ public void testDataClassWithVocabularyProperties() throws Exception
@Test
public void testViewSupportForVocabularyDomains() throws Exception
{
- User user = TestContext.get().getUser();
-
// Create a sample type with name
String sampleName = "CarLocations";
String sampleOneLocation = "California";
- ExpSampleTypeImpl st = SampleTypeServiceImpl.get().createSampleType(c, user,
+ ExpSampleTypeImpl st = SampleTypeServiceImpl.get().createSampleType(c, _user,
sampleName, null, List.of(new GWTPropertyDescriptor("name", "string")), emptyList(),
-1, -1, -1, -1, null, null);
- UserSchema schema = QueryService.get().getUserSchema(user, c, SchemaKey.fromParts("Samples"));
+ UserSchema schema = QueryService.get().getUserSchema(_user, c, SchemaKey.fromParts("Samples"));
// Insert a sample into sample type
ArrayListMap row = newArrayListMap();
@@ -989,12 +911,12 @@ public void testViewSupportForVocabularyDomains() throws Exception
prop1.setLookupSchema(lookUpSchema);
prop1.setLookupQuery(sampleName);
- GWTDomain domain = new GWTDomain();
+ GWTDomain domain = new GWTDomain<>();
domain.setName(domainName);
domain.setDescription(domainDescription);
domain.setFields(List.of(prop1));
- Domain lookUpDomain = DomainUtil.createDomain("Vocabulary", domain, null, c, user, domainName, null, false);
+ Domain lookUpDomain = DomainUtil.createDomain("Vocabulary", domain, null, c, _user, domainName, null, false);
Map vocabularyPropertyURIs = helper.getVocabularyPropertyURIS(lookUpDomain);
final String locationPropertyURI = vocabularyPropertyURIs.get(locationPropertyName);
@@ -1003,10 +925,10 @@ public void testViewSupportForVocabularyDomains() throws Exception
String dataClassName = "CarsDataClasses";
String carName1 = "Tesla";
- ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, user, dataClassName, null,
+ ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, dataClassName, null,
List.of(new GWTPropertyDescriptor("OtherProp", "string")), emptyList(), null, null);
- UserSchema userSchema = QueryService.get().getUserSchema(user, c, helper.expDataSchemaKey);
+ UserSchema userSchema = QueryService.get().getUserSchema(_user, c, helper.expDataSchemaKey);
// insert a data class with vocab look up prop using row id of inserted sample
ArrayListMap rowToInsert = newArrayListMap();
@@ -1036,7 +958,6 @@ public void testViewSupportForVocabularyDomains() throws Exception
@Test
public void testInsertOptionUpdate() throws Exception
{
- final User user = TestContext.get().getUser();
final String dataClassName = "DataClassWithImportOption";
List props = new ArrayList<>();
@@ -1045,7 +966,7 @@ public void testInsertOptionUpdate() throws Exception
String longFieldName = "Field100 ABCDEFGHIJKLMNOPQRSTUVWXYZ%()=+-[]_|*`'\":;<>?!@#^AABBCCDDEEFFGGHHIIJJKKLLMMNNOOPPQQRRSSTTU)";
props.add(new GWTPropertyDescriptor(longFieldName, "string"));
- ExpDataClass dataClass = ExperimentServiceImpl.get().createDataClass(c, user, dataClassName, null, props, emptyList(), null, null);
+ ExpDataClass dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, dataClassName, null, props, emptyList(), null, null);
List> rowsToAdd = new ArrayList<>();
rowsToAdd.add(CaseInsensitiveHashMap.of("name", "D-1", "prop", "a", longFieldName, "Very", "alias", "Much", "flag", "c100"));
rowsToAdd.add(CaseInsensitiveHashMap.of("name", "D-1-d", "prop", "c", longFieldName, "Long", "alias", "Extended", "flag", "c200"));
@@ -1061,7 +982,7 @@ public void testInsertOptionUpdate() throws Exception
DataIteratorContext context = new DataIteratorContext();
context.setInsertOption(QueryUpdateService.InsertOption.IMPORT);
- var count = qus.loadRows(user, c, MapDataIterator.of(rowsToAdd), context, null);
+ var count = qus.loadRows(_user, c, MapDataIterator.of(rowsToAdd), context, null);
assertFalse(context.getErrors().hasErrors());
assertEquals(3, count);
@@ -1078,7 +999,7 @@ public void testInsertOptionUpdate() throws Exception
context = new DataIteratorContext();
context.setInsertOption(QueryUpdateService.InsertOption.UPDATE);
- count = qus.loadRows(user, c, MapDataIterator.of(rowsToUpdate), context, null);
+ count = qus.loadRows(_user, c, MapDataIterator.of(rowsToUpdate), context, null);
assertFalse(context.getErrors().hasErrors());
assertEquals(3, count);
@@ -1088,7 +1009,7 @@ public void testInsertOptionUpdate() throws Exception
rowsToUpdate.add(CaseInsensitiveHashMap.of("rowId", dataClass.getData(c, "D-1").getRowId(), "DataInputs/DataClassWithImportOption", "D-1-d"));
try
{
- qus.updateRows(user, c, rowsToUpdate, null, new BatchValidationException(), null, null);
+ qus.updateRows(_user, c, rowsToUpdate, null, new BatchValidationException(), null, null);
fail("Expected to throw exception");
}
catch (Exception e)
@@ -1110,7 +1031,7 @@ public void testInsertOptionUpdate() throws Exception
String aliasAlias = "alias";
String flagAlias = "flag$";
- List> rows = Arrays.asList(ts.getMapArray());
+ List> rows = List.of(ts.getMapArray());
assertEquals("D-1", rows.get(0).get("Name"));
assertEquals("D-1-d", rows.get(1).get("Name"));
@@ -1147,7 +1068,7 @@ public void testInsertOptionUpdate() throws Exception
context = new DataIteratorContext();
context.setInsertOption(QueryUpdateService.InsertOption.MERGE);
- count = qus.loadRows(user, c, MapDataIterator.of(rowsToMerge), context, null);
+ count = qus.loadRows(_user, c, MapDataIterator.of(rowsToMerge), context, null);
assertFalse(context.getErrors().hasErrors());
assertEquals(2, count);
@@ -1155,7 +1076,7 @@ public void testInsertOptionUpdate() throws Exception
ts = new TableSelector(table, columnNames, null, new Sort("Name"));
ts.setForDisplay(true);
- rows = Arrays.asList(ts.getMapArray());
+ rows = List.of(ts.getMapArray());
assertEquals(4, rows.size());
assertEquals("D-1", rows.get(0).get("Name"));
@@ -1191,33 +1112,26 @@ public void testInsertOptionUpdate() throws Exception
assertEquals("cEight", rows.get(3).get(flagAlias));
}
-private @NotNull TableInfo getDataClassTable(String dataClassName)
-{
- UserSchema schema = QueryService.get().getUserSchema(TestContext.get().getUser(), c, ExpSchema.SCHEMA_EXP_DATA);
- return schema.getTableOrThrow(dataClassName);
-}
-
@Test // Issue 52886
public void testUpdateAuditForLongField() throws Exception
{
- User user = TestContext.get().getUser();
-
String dataClassName = "DataClassesWithLongFields";
String fieldName = "longField " + StringUtils.repeat("AB CD", 20);
- ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, user, dataClassName, null,
+ ExpDataClassImpl dataClass = ExperimentServiceImpl.get().createDataClass(c, _user, dataClassName, null,
List.of(new GWTPropertyDescriptor(fieldName, "string")), emptyList(), null, null);
assertNotNull(dataClass);
- List> rowsToAdd = new ArrayList<>();
- rowsToAdd.add(CaseInsensitiveHashMap.of("name", "A-1", "prop", "a", fieldName, "Initial"));
+ List> rowsToAdd = List.of(
+ CaseInsensitiveHashMap.of("name", "A-1", "prop", "a", fieldName, "Initial")
+ );
TableInfo table = getDataClassTable(dataClassName);
QueryUpdateService qus = table.getUpdateService();
assertNotNull(qus);
DataIteratorContext context = new DataIteratorContext();
context.setInsertOption(QueryUpdateService.InsertOption.IMPORT);
context.getConfigParameters().put(DetailedAuditLogDataIterator.AuditConfigs.AuditBehavior, AuditBehaviorType.DETAILED);
- var count = qus.loadRows(user, c, MapDataIterator.of(rowsToAdd), context, null);
+ var count = qus.loadRows(_user, c, MapDataIterator.of(rowsToAdd), context, null);
assertFalse("Unexpected errors from import", context.getErrors().hasErrors());
assertEquals("Number of rows inserted not as expected", 1, count);
for (Map row : rowsToAdd)
@@ -1229,12 +1143,12 @@ public void testUpdateAuditForLongField() throws Exception
if (results.next())
{
rowId = results.getInt(FieldKey.fromParts("RowId"));
- row.put("RowId", rowId); // intentional side-effect to help in retrieving update events as well
+ row.put("RowId", rowId); // intentional side effect to help in retrieving update events as well
SimpleFilter filter = SimpleFilter.createContainerFilter(c);
filter.addCondition(FieldKey.fromParts("rowPk"), String.valueOf(rowId));
filter.addCondition(FieldKey.fromParts("queryName"), dataClassName);
- List events = AuditLogService.get().getAuditEvents(c, user, "QueryUpdateAuditEvent", filter, null);
+ List events = AuditLogService.get().getAuditEvents(c, _user, "QueryUpdateAuditEvent", filter, null);
assertEquals("Number of audit events not as expected", 1, events.size());
}
}
@@ -1245,7 +1159,7 @@ public void testUpdateAuditForLongField() throws Exception
context = new DataIteratorContext();
context.setInsertOption(QueryUpdateService.InsertOption.UPDATE);
context.getConfigParameters().put(DetailedAuditLogDataIterator.AuditConfigs.AuditBehavior, AuditBehaviorType.DETAILED);
- count = qus.loadRows(user, c, MapDataIterator.of(rowsToUpdate), context, null);
+ count = qus.loadRows(_user, c, MapDataIterator.of(rowsToUpdate), context, null);
assertFalse("Unexpected errors from update", context.getErrors().hasErrors());
assertEquals("Number of rows updated not as expected", 1, count);
@@ -1254,10 +1168,17 @@ public void testUpdateAuditForLongField() throws Exception
SimpleFilter filter = SimpleFilter.createContainerFilter(c);
filter.addCondition(FieldKey.fromParts("rowPk"), String.valueOf(row.get("rowId")));
filter.addCondition(FieldKey.fromParts("queryName"), dataClassName);
- List events = AuditLogService.get().getAuditEvents(c, user, "QueryUpdateAuditEvent", filter, new Sort("-RowId"));
+ List events = AuditLogService.get().getAuditEvents(c, _user, "QueryUpdateAuditEvent", filter, new Sort("-RowId"));
assertEquals("Number of audit events not as expected", 2, events.size()); // should have one for insert and one for update
String oldRecordMap = ((DetailedAuditTypeEvent) events.getFirst()).getOldRecordMap();
assertTrue("Old record map (" + oldRecordMap + ") does not contain expected field", oldRecordMap.contains(encodeURIComponent(fieldName) + "=Initial"));
}
}
+
+private @NotNull TableInfo getDataClassTable(String dataClassName)
+{
+ UserSchema schema = QueryService.get().getUserSchema(_user, c, ExpSchema.SCHEMA_EXP_DATA);
+ return schema.getTableOrThrow(dataClassName);
+}
+
%>
diff --git a/experiment/src/org/labkey/experiment/api/ExpProvisionedTableTestHelper.java b/experiment/src/org/labkey/experiment/api/ExpProvisionedTableTestHelper.java
index f1a4fbc64d6..bd60d1c25e7 100644
--- a/experiment/src/org/labkey/experiment/api/ExpProvisionedTableTestHelper.java
+++ b/experiment/src/org/labkey/experiment/api/ExpProvisionedTableTestHelper.java
@@ -1,15 +1,20 @@
package org.labkey.experiment.api;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
+import org.junit.Assume;
import org.labkey.api.collections.ArrayListMap;
import org.labkey.api.data.Container;
import org.labkey.api.data.TableInfo;
import org.labkey.api.exp.property.Domain;
+import org.labkey.api.exp.property.DomainKind;
import org.labkey.api.exp.property.DomainUtil;
import org.labkey.api.exp.query.ExpSchema;
import org.labkey.api.gwt.client.model.GWTDomain;
import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
+import org.labkey.api.module.Module;
+import org.labkey.api.module.ModuleLoader;
import org.labkey.api.query.BatchValidationException;
import org.labkey.api.query.QueryService;
import org.labkey.api.query.QueryUpdateService;
@@ -17,6 +22,7 @@
import org.labkey.api.query.UserSchema;
import org.labkey.api.query.ValidationException;
import org.labkey.api.security.User;
+import org.labkey.api.settings.AppProps;
import org.labkey.api.util.TestContext;
import java.io.StringWriter;
@@ -24,8 +30,10 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static org.hamcrest.CoreMatchers.hasItem;
@@ -55,7 +63,7 @@ public Domain createVocabularyTestDomain(User user, Container c) throws Validati
prop3.setRangeURI("string");
prop3.setName(colorPropertyName);
- GWTDomain domain = new GWTDomain();
+ GWTDomain domain = new GWTDomain<>();
domain.setName(domainName);
domain.setDescription(domainDescription);
domain.setFields(List.of(prop1, prop2, prop3));
@@ -119,7 +127,22 @@ public List> updateRows(Container c, List values, Collection expected) throws Exception
+ public static void requireSimpleTestModule(Container c)
+ {
+ if (!AppProps.getInstance().isDevMode()) // Skip test in production mode if necessary modules are not available
+ {
+ Assume.assumeTrue("List module is required to test domain templates", ModuleLoader.getInstance().getModule("list") != null);
+ Assume.assumeTrue("simpletest module is required to test domain templates", ModuleLoader.getInstance().getModule("simpletest") != null);
+ }
+
+ Module m = ModuleLoader.getInstance().getModule("simpletest");
+ Assert.assertNotNull("This test requires 'simpletest' module to be deployed", m);
+ Set activeModules = new HashSet<>(c.getActiveModules());
+ activeModules.add(m);
+ c.setActiveModules(activeModules);
+ }
+
+ static void assertMultiValue(Collection