Skip to content

Resolved mismatch stubbings in SubversionSCMTest.java #351

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
ARMS2025 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolved mismatch stubbings in SubversionSCMTest.java #351

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
10 changes: 10 additions & 0 deletions src/test/java/hudson/scm/AbstractSubversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ protected void configureSvnWorkspaceFormat(int format) throws Exception {
r.jenkins.getDescriptorByType(SubversionSCM.DescriptorImpl.class).configure(req, formData);
}

protected void configureSvnWorkspaceFormat2(int format) throws Exception {
StaplerRequest2 req = mock(StaplerRequest2.class);
when(req.getParameter("svn.global_excluded_revprop")).thenReturn(null);
when(req.getParameter("svn.workspaceFormat")).thenReturn(""+format);

JSONObject formData = new JSONObject();

r.jenkins.getDescriptorByType(SubversionSCM.DescriptorImpl.class).configure(req, formData);
}

public static void checkForSvnServe() throws InterruptedException {
LocalLauncher launcher = new LocalLauncher(StreamTaskListener.fromStdout());
try {
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/hudson/scm/SubversionSCMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ public void multipleRepositories() throws Exception {

@Test
public void multipleRepositoriesSvn17() throws Exception {
configureSvnWorkspaceFormat(SubversionWorkspaceSelector.WC_FORMAT_17);
configureSvnWorkspaceFormat2(SubversionWorkspaceSelector.WC_FORMAT_17);
multipleRepositories();
}

Expand Down Expand Up @@ -1804,14 +1804,14 @@ public void pollingRespectExternalsWithRevision() throws Exception {
@Issue("JENKINS-20165")
@Test
public void pollingExternalsForFileSvn16() throws Exception {
configureSvnWorkspaceFormat(10 /* 1.6 (svn:externals to file) */);
configureSvnWorkspaceFormat2(10 /* 1.6 (svn:externals to file) */);
invokeTestPollingExternalsForFile();
}

@Issue("JENKINS-20165")
@Test
public void pollingExternalsForFileSvn17() throws Exception {
configureSvnWorkspaceFormat(SubversionWorkspaceSelector.WC_FORMAT_17);
configureSvnWorkspaceFormat2(SubversionWorkspaceSelector.WC_FORMAT_17);
invokeTestPollingExternalsForFile();
}

Expand Down