Skip to content

Return Set<Class<?>> from Module "get test" methods #939

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
labkey-adam merged 1 commit into from
Oct 3, 2025
Merged

Return Set<Class<?>> from Module "get test" methods #939

Show file tree
Hide file tree
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
6 changes: 2 additions & 4 deletions flow/src/org/labkey/flow/FlowModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,7 @@ public Set<String> getSchemaNames()


@Override
@NotNull
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return Set.of(
AnalysisSerializer.TestCase.class,
Expand All @@ -329,9 +328,8 @@ public Set<Class> getUnitTests()
);
}

@NotNull
@Override
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return Set.of(
FlowController.TestCase.class,
Expand Down
14 changes: 7 additions & 7 deletions flow/src/org/labkey/flow/persist/FlowKeywordAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public class FlowKeywordAuditProvider extends AbstractAuditTypeProvider implemen

static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();

static {
static
{
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));
Expand All @@ -60,6 +61,11 @@ public class FlowKeywordAuditProvider extends AbstractAuditTypeProvider implemen
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_KEYWORD_NEW_VALUE));
}

public FlowKeywordAuditProvider()
{
super(new FlowKeywordAuditDomainKind());
}

@Override
public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)
{
Expand All @@ -75,12 +81,6 @@ public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)
return table;
}

@Override
protected AbstractAuditDomainKind getDomainKind()
{
return new FlowKeywordAuditDomainKind();
}

@Override
public String getEventName()
{
Expand Down
3 changes: 1 addition & 2 deletions luminex/src/org/labkey/luminex/LuminexModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@ public Set<String> getSchemaNames()
return Collections.singleton(LuminexProtocolSchema.DB_SCHEMA_NAME);
}

@NotNull
@Override
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return Set.of(
AssayQCFlagColumn.TestCase.class,
Expand Down
6 changes: 2 additions & 4 deletions ms2/src/org/labkey/ms2/MS2Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,7 @@ public List<String> getSchemaNames()
}

@Override
@NotNull
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return Set.of(
Comet2014ParamsBuilder.FullParseTestCase.class,
Expand All @@ -312,8 +311,7 @@ public Set<Class> getIntegrationTests()
}

@Override
@NotNull
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return Set.of(
BibliospecSpectrumRenderer.TestCase.class,
Expand Down
3 changes: 1 addition & 2 deletions nab/src/org/labkey/nab/NabModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ public void doStartup(ModuleContext moduleContext)
PropertyService.get().registerDomainKind(new NabVirusDomainKind());
}

@NotNull
@Override
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return Set.of(PlateParserTests.class);
}
Expand Down
4 changes: 2 additions & 2 deletions protein/src/org/labkey/protein/ProteinModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,15 @@ public Set<String> getSchemaNames()
}

@Override
public @NotNull Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return Set.of(
ProteinController.TestCase.class
);
}

@Override
public @NotNull Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return Set.of(
FastaDbLoader.TestCase.class
Expand Down
3 changes: 1 addition & 2 deletions viability/src/org/labkey/viability/ViabilityModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ public Set<String> getSchemaNames()
}

@Override
@NotNull
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return Set.of(
ViabilityAssayDataHandler.TestCase.class,
Expand Down