mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Fixing and testing 7eeb79e (CopyJobCommand with folders).
This commit is contained in:
1 parent
a8ba1162a3
commit
e7f56d3d3d
2 files changed
+60
-1
No files matched your search
@@ -28,7 +28,7 @@ public class TopLevelItemOptionHandler extends OptionHandler<TopLevelItem> {
|
||||
Jenkins h = Jenkins.getInstance();
|
||||
String src = params.getParameter(0);
|
||||
|
||||
TopLevelItem s = h.getItem(src);
|
||||
TopLevelItem s = h.getItemByFullName(src, TopLevelItem.class);
|
||||
if (s==null) {
|
||||
AbstractProject nearest = AbstractProject.findNearest(src);
|
||||
if (nearest!=null)
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright 2012 Jesse Glick.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package hudson.cli;
|
||||
|
||||
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
|
||||
import hudson.model.FreeStyleProject;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.PrintStream;
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
import org.apache.commons.io.input.NullInputStream;
|
||||
import static org.junit.Assert.*;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.jvnet.hudson.test.JenkinsRule;
|
||||
import org.jvnet.hudson.test.MockFolder;
|
||||
|
||||
@SuppressWarnings("DM_DEFAULT_ENCODING")
|
||||
public class CopyJobCommandTest {
|
||||
|
||||
@Rule public JenkinsRule j = new JenkinsRule();
|
||||
|
||||
@Test public void copyBetweenFolders() throws Exception {
|
||||
MockFolder dir1 = j.createFolder("dir1");
|
||||
MockFolder dir2 = j.createFolder("dir2");
|
||||
FreeStyleProject p = dir1.createProject(FreeStyleProject.class, "p1");
|
||||
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||
PrintStream outS = new PrintStream(out);
|
||||
int result = new CopyJobCommand().main(Arrays.asList("dir1/p1", "dir2/p2"), Locale.ENGLISH, new NullInputStream(0), outS, outS);
|
||||
outS.flush();
|
||||
assertEquals(out.toString(), 0, result);
|
||||
assertEquals("", out.toString());
|
||||
assertNotNull(j.jenkins.getItemByFullName("dir2/p2"));
|
||||
// XXX test copying from/to root, or into nonexistent folder
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user