Skip to content

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

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

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
4 changes: 1 addition & 3 deletions OConnorExperiments/src/org/labkey/oconnorexperiments/view/history.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
<%@ page import="org.labkey.api.query.QueryView" %>
<%@ page import="org.labkey.api.query.UserSchema" %>
<%@ page import="org.labkey.api.security.User" %>
<%@ page import="org.labkey.api.services.ServiceRegistry" %>
<%@ page import="org.labkey.api.view.ViewContext" %>
<%@ page import="org.labkey.api.view.WebPartView" %>
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
<%@ page import="org.labkey.api.wiki.WikiService" %>
<%@ page import="org.labkey.oconnorexperiments.query.OConnorExperimentsUserSchema" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>
Expand Down Expand Up @@ -86,7 +84,7 @@
<h3>Notes History</h3>
<%
{
WebPartView view = WikiService.get().getHistoryView(c, "default");
WebPartView<?> view = WikiService.get().getHistoryView(c, "default");
if (view != null)
include(view, out);
}
Expand Down
4 changes: 2 additions & 2 deletions genotyping/src/org/labkey/genotyping/GenotypingAnalysesView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public class GenotypingAnalysesView extends QueryView
public static final WebPartFactory FACTORY = new BaseWebPartFactory("Genotyping Analyses")
{
@Override
public WebPartView getWebPartView(@NotNull ViewContext ctx, @NotNull Portal.WebPart webPart)
public WebPartView<?> getWebPartView(@NotNull ViewContext ctx, @NotNull Portal.WebPart webPart)
{
WebPartView view = new GenotypingAnalysesView(ctx, null, "GenotypingAnalyses");
WebPartView<?> view = new GenotypingAnalysesView(ctx, null, "GenotypingAnalyses");
view.setTitle("Genotyping Analyses");
view.setTitleHref(GenotypingController.getAnalysesURL(ctx.getContainer()));
return view;
Expand Down
6 changes: 2 additions & 4 deletions genotyping/src/org/labkey/genotyping/GenotypingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,14 @@ public Set<String> getSchemaNames()
return Collections.singleton(GenotypingSchema.get().getSchemaName());
}

@NotNull
@Override
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return PageFlowUtil.set(HaplotypeDataHandler.TestCase.class, IlluminaFastqParser.DupeTestCase.class);
}

@NotNull
@Override
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return PageFlowUtil.set(IlluminaFastqParser.HeaderTestCase.class, ImportAnalysisJob.TestCase.class);
}
Expand Down
4 changes: 2 additions & 2 deletions genotyping/src/org/labkey/genotyping/GenotypingRunsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public class GenotypingRunsView extends QueryView
public static final WebPartFactory FACTORY = new BaseWebPartFactory("Sequencing Runs")
{
@Override
public WebPartView getWebPartView(@NotNull ViewContext ctx, @NotNull Portal.WebPart webPart)
public WebPartView<?> getWebPartView(@NotNull ViewContext ctx, @NotNull Portal.WebPart webPart)
{
WebPartView view = new GenotypingRunsView(ctx, null, "SequencingRuns", false);
WebPartView<?> view = new GenotypingRunsView(ctx, null, "SequencingRuns", false);
view.setTitle("Sequencing Runs");
view.setTitleHref(GenotypingController.getRunsURL(ctx.getContainer()));
return view;
Expand Down
2 changes: 1 addition & 1 deletion genotyping/src/org/labkey/genotyping/GenotypingWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class GenotypingWebPart extends JspView
public static final WebPartFactory FACTORY = new BaseWebPartFactory("Genotyping Overview")
{
@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
{
return new GenotypingWebPart();
}
Expand Down