Skip to content

Fix up domain create/delete for PropertyController TestCase #6957

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
cnathe merged 2 commits into from
Aug 24, 2025
Merged

Fix up domain create/delete for PropertyController TestCase #6957

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21abea9
Fix up domain create/delete for PropertyController TestCase
cnathe Aug 23, 2025
ed98b95
revert to changes before last PR
cnathe Aug 23, 2025
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
17 changes: 5 additions & 12 deletions experiment/src/org/labkey/experiment/controllers/property/PropertyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2200,10 +2200,7 @@ public void setPropertyURIs(List<String> propertyURIs)

public static class TestCase extends Assert
{
private static Domain domain;

@BeforeClass
public static void initialSetUp() throws ValidationException
Domain createVocabDomain() throws ValidationException
{
Container c = JunitUtil.getTestContainer();
User user = TestContext.get().getUser();
Expand All @@ -2229,21 +2226,15 @@ public static void initialSetUp() throws ValidationException

gwtDomain.setFields(gwtProps);

domain = DomainUtil.createDomain(VocabularyDomainKind.KIND_NAME, gwtDomain, null, c, user, domainName, null, false);
}

@AfterClass
public static void tearDown() throws DomainNotFoundException
{
User user = TestContext.get().getUser();
domain.delete(user);
return DomainUtil.createDomain(VocabularyDomainKind.KIND_NAME, gwtDomain, null, c, user, domainName, null, false);
}

@Test
public void testGetDomains() throws ValidationException
{
Container c = JunitUtil.getTestContainer();
User user = TestContext.get().getUser();
Domain domain = createVocabDomain();

Set<String> domainKinds = new HashSet<>();
domainKinds.add(VocabularyDomainKind.KIND_NAME);
Expand All @@ -2259,6 +2250,7 @@ public void testGetProperties() throws ValidationException
{
Container c = JunitUtil.getTestContainer();
User user = TestContext.get().getUser();
Domain domain = createVocabDomain();

var props = domain.getProperties().stream().map(DomainProperty::getPropertyDescriptor).collect(Collectors.toSet());

Expand Down Expand Up @@ -2307,6 +2299,7 @@ public void testPropertyUsages() throws Exception
{
Container c = JunitUtil.getTestContainer();
User user = TestContext.get().getUser();
Domain domain = createVocabDomain();

var intProp = domain.getPropertyByName("testIntField");
var stringProp = domain.getPropertyByName("testStringField");
Expand Down