Skip to content

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

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

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 SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
}

@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
{
return new SkylineToolsStoreWebPart();
}
Expand Down
2 changes: 1 addition & 1 deletion lincs/src/org/labkey/lincs/LincsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
BaseWebPartFactory runsList = new BaseWebPartFactory(LincsDataView.WEB_PART_NAME)
{
@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
{
return new LincsDataView(portalCtx);
}
Expand Down
10 changes: 4 additions & 6 deletions panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,8 @@ public Set<String> getSchemaNames()
return Collections.singleton(PanoramaPublicSchema.SCHEMA_NAME);
}

@NotNull
@Override
public Set<Class> getIntegrationTests()
public @NotNull Set<Class<?>> getIntegrationTests()
{
return Set.of(
PanoramaPublicController.TestCase.class,
Expand All @@ -368,11 +367,10 @@ public Set<Class> getIntegrationTests()
);
}

@NotNull
@Override
public Set<Class> getUnitTests()
public @NotNull Set<Class<?>> getUnitTests()
{
Set<Class> set = new HashSet<>();
Set<Class<?>> set = new HashSet<>();
set.add(PanoramaPublicController.TestCase.class);
set.add(PanoramaPublicNotification.TestCase.class);
set.add(SkylineVersion.TestCase.class);
Expand All @@ -384,7 +382,7 @@ public Set<Class> getUnitTests()
set.add(CatalogEntryManager.TestCase.class);
set.add(BlueskyApiClient.TestCase.class);
set.add(PrivateDataReminderSettings.TestCase.class);
return set;

return set;
}
}
5 changes: 3 additions & 2 deletions signup/src/org/labkey/signup/SignUpModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.labkey.api.view.ViewContext;
import org.labkey.api.view.WebPartFactory;
import org.labkey.api.view.WebPartView;
import org.labkey.signup.SignUpController.SignupForm;

import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -69,9 +70,9 @@ protected Collection<WebPartFactory> createWebPartFactories()
BaseWebPartFactory signupWebpart = new BaseWebPartFactory("Sign Up")
{
@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart)
public JspView<SignupForm> getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart)
{
JspView<SignUpController.SignupForm> view = new JspView<>("/org/labkey/signup/signupPage.jsp", new SignUpController.SignupForm());
JspView<SignupForm> view = new JspView<>("/org/labkey/signup/signupPage.jsp", new SignupForm());
view.setTitle("Sign Up");

return view;
Expand Down
2 changes: 1 addition & 1 deletion testresults/src/org/labkey/testresults/TestResultsWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public TestResultsWebPart()
}

@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
{
Container c =portalCtx.getContainer();
TestsDataBean bean = null;
Expand Down