From e7f56d3d3d2b485f1d082efa366ef05bbdd149a0 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 5 Dec 2012 15:39:58 -0500
Subject: [PATCH] Fixing and testing 7eeb79e (CopyJobCommand with folders).

---
 .../handlers/TopLevelItemOptionHandler.java   |  2 +-
 .../java/hudson/cli/CopyJobCommandTest.java   | 59 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 test/src/test/java/hudson/cli/CopyJobCommandTest.java

diff --git a/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java b/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java
index c1f89cf943..0c4a4ea978 100644
--- a/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java
+++ b/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java
@@ -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)
diff --git a/test/src/test/java/hudson/cli/CopyJobCommandTest.java b/test/src/test/java/hudson/cli/CopyJobCommandTest.java
new file mode 100644
index 0000000000..22efbce52d
--- /dev/null
+++ b/test/src/test/java/hudson/cli/CopyJobCommandTest.java
@@ -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
+    }
+
+}
-- 
GitLab