Skip to content

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

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

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 SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public Collection<String> getSummary(Container c)
}

@Override
public @NotNull Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return PageFlowUtil.set(SelfRegistrationController.TestCase.class);
}
Expand Down
7 changes: 3 additions & 4 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ protected void init() {
registerPermissions();
}

@Override
@NotNull
protected Collection<WebPartFactory> createWebPartFactories()
{
Expand Down Expand Up @@ -546,17 +547,15 @@ public void versionUpdate(ModuleContext moduleContext) throws Exception
}

@Override
@NotNull
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return new Reflections("org.labkey.wnprc_ehr").getSubTypesOf(Assert.class).stream()
.filter(c -> c.getSimpleName().endsWith("IntegrationTest"))
.collect(Collectors.toSet());
}

@Override
@NotNull
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
return new Reflections("org.labkey.wnprc_ehr").getSubTypesOf(Assert.class).stream()
.filter(c -> c.getSimpleName().endsWith("UnitTest"))
Expand Down
6 changes: 3 additions & 3 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendarWebPartFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public class WaterCalendarWebPartFactory extends BaseWebPartFactory
public WaterCalendarWebPartFactory(){super ("Water Calendar");}

@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webpart){

public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webpart)
{
Map<String, String> props = webpart.getPropertyMap();

String animalIds = webpart.getPropertyMap().get("animalIds");
Expand All @@ -32,7 +32,7 @@ public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Porta
unBindJSON.put(unBindComponent);
}

JspView view = new JspView("/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendar.jsp");
JspView<?> view = new JspView<>("/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendar.jsp");
view.setTitle("Water Calendar");
view.setFrame(WebPartView.FrameType.PORTAL);

Expand Down