Skip to content

[JENKINS-64708] Deprecate PageObject constructor receiving the Injector as parameter #2003

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

Open
akash-manna-sky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[JENKINS-64708] Deprecate PageObject constructor receiving the Injector as parameter #2003

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 src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class GerritTriggerJob extends PageObject {
"/com-sonyericsson-hudson-plugins-gerrit-trigger-hudsontrigger-GerritTrigger/triggerOnEvents/commentAddedTriggerApprovalValue");

public GerritTriggerJob(Jenkins jenkins, String jobName) {
super(jenkins.injector, jenkins.url("job/" + jobName + "/configure"));
super(jenkins, jenkins.url("job/" + jobName + "/configure"));
this.jenkins = jenkins;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerNewServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class GerritTriggerNewServer extends PageObject {
public final Control modeDefault = control("/mode[com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer]");

public GerritTriggerNewServer(Jenkins jenkins) {
super(jenkins.injector, jenkins.url("gerrit-trigger/newServer"));
super(jenkins, jenkins.url("gerrit-trigger/newServer"));
this.jenkins = jenkins;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class GerritTriggerServer extends PageObject {
private static final String serverUrl = "gerrit-trigger/server/";

public GerritTriggerServer(Jenkins jenkins, String serverName) {
super(jenkins.injector, jenkins.url(serverUrl + serverName));
super(jenkins, jenkins.url(serverUrl + serverName));
this.jenkins = jenkins;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/plugins/logparser/LogParserOutputPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public String getFrameName() {
* @param po The page of the logparser.
*/
public LogParserOutputPage(PageObject po) {
super(po.injector, po.url("parsed_console"));
super(po, po.url("parsed_console"));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/plugins/maven/MavenModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
public class MavenModule extends Job {

public MavenModule(MavenModuleSet job, String name) {
super(job.injector, job.url("./%s/", name), name);
super(job, job.url("./%s/", name), name);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public abstract class Action extends PageObject {
private final String linkText;

public Action(ContainerPageObject parent, String relative, String linkText) {
super(parent.injector, parent.url(relative + "/"));
super(parent, parent.url(relative + "/"));
this.parent = parent;
this.linkText = linkText;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/Artifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class Artifact extends PageObject {
private final @NonNull String path;

public Artifact(@NonNull Build build, @NonNull String path) {
super(build.injector, build.url("artifact/%s", path));
super(build, build.url("artifact/%s", path));
this.build = build;
this.path = path;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/test/acceptance/po/Build.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ public enum Result {
private boolean success;

public Build(Job job, int buildNumber) {
super(job.injector, job.url("%d/", buildNumber));
super(job, job.url("%d/", buildNumber));
this.job = job;
}

public Build(Job job, String permalink) {
super(job.injector, job.url(permalink + "/"));
super(job, job.url(permalink + "/"));
this.job = job;
}

public Build(Job job, URL url) {
super(job.injector, url);
super(job, url);
this.job = job;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/test/acceptance/po/BuildHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public class BuildHistory extends PageObject {
private static final Pattern CONSOLE_LINK_PATTERN = Pattern.compile("/job/(.+?)/(\\d+)/console");

public BuildHistory(Node parent) {
super(parent.injector, parent.url("builds"));
super(parent, parent.url("builds"));
}

public BuildHistory(View parent) {
super(parent.injector, parent.url("builds"));
super(parent, parent.url("builds"));
}

public Set<Build> getBuilds() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/JenkinsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class JenkinsConfig extends ConfigurablePageObject {
public final Control quietPeriod = control("/jenkins-model-GlobalQuietPeriodConfiguration/quietPeriod");

public JenkinsConfig(Jenkins jenkins) {
super(jenkins.injector, jenkins.url("configure"));
super(jenkins, jenkins.url("configure"));
this.jenkins = jenkins;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/Logout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
*/
public class Logout extends PageObject {
public Logout(Jenkins jenkins) {
super(jenkins.injector, jenkins.url("logout"));
super(jenkins, jenkins.url("logout"));
}
}
5 changes: 5 additions & 0 deletions src/main/java/org/jenkinsci/test/acceptance/po/PageObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public abstract class PageObject extends CapybaraPortingLayerImpl {

private static final RandomNameGenerator RND = new RandomNameGenerator();

/**
* @deprecated Use {@link #PageObject(PageObject, URL)} instead to preserve context.
* This constructor should only be used for top-level objects like {@link Jenkins}.
*/
@Deprecated
public PageObject(Injector injector, URL url) {
super(injector);
this.url = url;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class PluginManager extends ContainerPageObject {
public MockUpdateCenter mockUpdateCenter;

public PluginManager(Jenkins jenkins) {
super(jenkins.injector, jenkins.url("pluginManager/"));
super(jenkins, jenkins.url("pluginManager/"));
this.jenkins = jenkins;
mockUpdateCenter.ensureRunning(jenkins);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/WizardCreateAdminUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class WizardCreateAdminUser extends PageObject {
JenkinsController controller;

public WizardCreateAdminUser(Jenkins jenkins) {
super(jenkins.injector, jenkins.url(""));
super(jenkins, jenkins.url(""));
}

public WizardCreateAdminUser createAdminUser(String userName, String password, String fullName, String email) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/WizardCustomizeJenkins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
public class WizardCustomizeJenkins extends PageObject {

public WizardCustomizeJenkins(Jenkins jenkins) {
super(jenkins.injector, jenkins.url(""));
super(jenkins, jenkins.url(""));
}

public WizardCustomizeJenkins doInstallSuggested() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/po/WizardLogin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class WizardLogin extends PageObject {
private Control cLogin = control("/Continue");

public WizardLogin(Jenkins jenkins) {
super(jenkins.injector, jenkins.url(""));
super(jenkins, jenkins.url(""));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/test/acceptance/utils/pluginTests/SecurityDisabler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class SecurityDisabler extends PageObject {
public final Jenkins jenkins;

public SecurityDisabler(Jenkins jenkins) {
super(jenkins.injector, jenkins.url("configureSecurity"));
super(jenkins, jenkins.url("configureSecurity"));
this.jenkins = jenkins;
}

Expand Down