Skip to content

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

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 #392

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
2 changes: 1 addition & 1 deletion OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public boolean isAvailable(DefaultSchema schema, Module module)
}

@Override
public @NotNull Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return PageFlowUtil.set(LdapSyncRunner.TestCase.class);
}
Expand Down
18 changes: 8 additions & 10 deletions OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements

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 @@ -47,6 +47,11 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_COMMENT));
}

public LdapSyncAuditProvider()
{
super(new LdapSyncAuditDomainKind());
}

@Override
public String getEventName()
{
Expand All @@ -68,7 +73,7 @@ public String getDescription()
@Override
public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)
{
DefaultAuditTypeTable table = new DefaultAuditTypeTable(this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)
return new DefaultAuditTypeTable(LdapSyncAuditProvider.this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)
{
@Override
protected void initColumn(MutableColumnInfo col)
Expand All @@ -87,7 +92,6 @@ else if (COLUMN_NAME_MEMBERSHIPS_CHANGED.equalsIgnoreCase(col.getName()))
}
}
};
return table;
}

@Override
Expand All @@ -96,12 +100,6 @@ public List<FieldKey> getDefaultVisibleColumns()
return defaultVisibleColumns;
}

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

@Override
public Map<FieldKey, String> legacyNameMap()
{
Expand Down
53 changes: 24 additions & 29 deletions SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,40 +505,35 @@ protected void registerContainerListeners()
}

@Override
@NotNull
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
@SuppressWarnings({"unchecked"})
Set<Class> testClasses = new HashSet<>(Arrays.asList(
Barcoder.TestCase.class,
BamIterator.TestCase.class,
SequenceIntegrationTests.SequenceImportPipelineTestCase.class,
//SequenceIntegrationTests.SequenceAnalysisPipelineTestCase3.class,
SequenceIntegrationTests.SequenceAnalysisPipelineTestCase1.class,
SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
OutputIntegrationTests.VariantProcessingTest.class,
SequenceRemoteIntegrationTests.class,
SequenceTriggerHelper.TestCase.class,
SequencePipelineServiceImpl.TestCase.class
));

return testClasses;
return Set.of(
Barcoder.TestCase.class,
BamIterator.TestCase.class,
SequenceIntegrationTests.SequenceImportPipelineTestCase.class,
//SequenceIntegrationTests.SequenceAnalysisPipelineTestCase3.class,
SequenceIntegrationTests.SequenceAnalysisPipelineTestCase1.class,
SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
OutputIntegrationTests.VariantProcessingTest.class,
SequenceRemoteIntegrationTests.class,
SequenceTriggerHelper.TestCase.class,
SequencePipelineServiceImpl.TestCase.class
);
}

@Override
@NotNull
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return PageFlowUtil.set(
SequenceAlignmentTask.TestCase.class,
SequenceAnalysisManager.TestCase.class,
SequenceJob.TestCase.class,
SequenceJobSupportImpl.TestCase.class,
ProcessVariantsHandler.TestCase.class,
VariantProcessingJob.TestCase.class,
ScatterGatherUtils.TestCase.class,
ChainFileValidator.TestCase.class,
FastqcRunner.TestCase.class
return Set.of(
SequenceAlignmentTask.TestCase.class,
SequenceAnalysisManager.TestCase.class,
SequenceJob.TestCase.class,
SequenceJobSupportImpl.TestCase.class,
ProcessVariantsHandler.TestCase.class,
VariantProcessingJob.TestCase.class,
ScatterGatherUtils.TestCase.class,
ChainFileValidator.TestCase.class,
FastqcRunner.TestCase.class
);
}

Expand Down
7 changes: 2 additions & 5 deletions Studies/src/org/labkey/studies/StudiesModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.labkey.api.util.PageFlowUtil;
import org.labkey.studies.query.StudiesUserSchema;
import org.labkey.api.studies.security.StudiesDataAdminRole;
import org.labkey.studies.query.StudiesUserSchema;
import org.labkey.studies.study.StudiesFilterProvider;
import org.labkey.studies.study.StudyEnrollmentEventProvider;

Expand Down Expand Up @@ -83,10 +82,8 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
}

@Override
public @NotNull Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return PageFlowUtil.set(
StudiesManager.TestCase.class
);
return Set.of(StudiesManager.TestCase.class);
}
}
16 changes: 4 additions & 12 deletions cluster/src/org/labkey/cluster/ClusterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,23 +122,15 @@ public Set<String> getSchemaNames()
}

@Override
@NotNull
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
@SuppressWarnings({"unchecked"})
Set<Class> testClasses = new HashSet<>(List.of(
TestCase.class
));

return testClasses;
return Set.of(TestCase.class);
}

@Override
public @NotNull Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return new HashSet<>(List.of(
SlurmExecutionEngine.TestCase.class
));
return Set.of(SlurmExecutionEngine.TestCase.class);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public Set<String> getSchemaNames()


@Override
public @NotNull Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return PageFlowUtil.set(AuditSummaryUserSchema.TestCase.class);
}
Expand Down
7 changes: 2 additions & 5 deletions jbrowse/src/org/labkey/jbrowse/JBrowseModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,8 @@ public Set<String> getSchemaNames()
}

@Override
@NotNull
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return PageFlowUtil.set(
JBrowseManager.TestCase.class
);
return Set.of(JBrowseManager.TestCase.class);
}
}
9 changes: 4 additions & 5 deletions singlecell/src/org/labkey/singlecell/SingleCellModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,11 @@ public static void registerPipelineSteps()
}

@Override
@NotNull
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return PageFlowUtil.set(
AbstractSingleCellHandler.TestCase.class,
PrepareRawCounts.TestCase.class
return Set.of(
AbstractSingleCellHandler.TestCase.class,
PrepareRawCounts.TestCase.class
);
}
}