[JENKINS-32535] Improved test coverage 'add-job-to-view' and 'remove-…

…job-from-view'
jenkinsci · Apr 8, 2016 · c2f1ace · c2f1ace
1 parent 9cb52bf
commit c2f1ace
Show file tree

Hide file tree

Showing 5 changed files with 478 additions and 118 deletions.
diff --git a/test/pom.xml b/test/pom.xml
@@ -63,7 +63,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2.5</version>
+      <version>2.6</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/test/src/test/java/hudson/cli/AddJobToViewCommandTest.java b/test/src/test/java/hudson/cli/AddJobToViewCommandTest.java
@@ -0,0 +1,123 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 Red Hat, Inc.
+ *
+ * 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 hudson.model.DirectlyModifiableView;
+import hudson.model.FreeStyleProject;
+import hudson.model.Job;
+import hudson.model.ListView;
+import hudson.model.View;
+import jenkins.model.Jenkins;
+import org.junit.Before;
+import org.junit.Test;
+
+import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+/**
+ * @author pjanouse
+ */
+public class AddJobToViewCommandTest extends ViewManipulationTestBase {
+
+    @Override
+    public CLICommandInvoker getCommand() {
+        return new CLICommandInvoker(j, "add-job-to-view");
+    }
+
+    @Test public void addJobShouldSucceed() throws Exception {
+
+        j.jenkins.addView(new ListView("aView"));
+        FreeStyleProject project = j.createFreeStyleProject("aProject");
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(0));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(false));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(1));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(true));
+    }
+
+    @Test public void addJobShouldSucceedEvenAlreadyAdded () throws Exception {
+
+        FreeStyleProject project = j.createFreeStyleProject("aProject");
+
+        j.jenkins.addView(new ListView("aView"));
+        ((DirectlyModifiableView) j.jenkins.getView("aView")).add(project);
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(1));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(true));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(1));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(true));
+    }
+
+    @Test public void addJobManyShouldSucceed() throws Exception {
+
+        j.jenkins.addView(new ListView("aView"));
+        FreeStyleProject project1 = j.createFreeStyleProject("aProject1");
+        FreeStyleProject project2 = j.createFreeStyleProject("aProject2");
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(0));
+        assertThat(j.jenkins.getView("aView").contains(project1), equalTo(false));
+        assertThat(j.jenkins.getView("aView").contains(project2), equalTo(false));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject1", "aProject2");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(2));
+        assertThat(j.jenkins.getView("aView").contains(project1), equalTo(true));
+        assertThat(j.jenkins.getView("aView").contains(project2 ), equalTo(true));
+    }
+
+    @Test public void addJobManyShouldSucceedEvenAJobIsSpecifiedTwice() throws Exception {
+
+        j.jenkins.addView(new ListView("aView"));
+        FreeStyleProject project = j.createFreeStyleProject("aProject");
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(0));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(false));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject", "aProject");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(1));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(true));
+    }
+
+}
diff --git a/test/src/test/java/hudson/cli/RemoveJobFromViewCommandTest.java b/test/src/test/java/hudson/cli/RemoveJobFromViewCommandTest.java
@@ -0,0 +1,108 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 Red Hat, Inc.
+ *
+ * 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 hudson.model.DirectlyModifiableView;
+import hudson.model.FreeStyleProject;
+import hudson.model.Job;
+import hudson.model.ListView;
+import hudson.model.View;
+import jenkins.model.Jenkins;
+import org.junit.Before;
+import org.junit.Test;
+
+import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+/**
+ * @author pjanouse
+ */
+public class RemoveJobFromViewCommandTest extends ViewManipulationTestBase {
+
+    @Override
+    public CLICommandInvoker getCommand() {
+        return new CLICommandInvoker(j, "remove-job-from-view");
+    }
+
+    @Test public void removeJobShouldSucceed() throws Exception {
+
+        j.jenkins.addView(new ListView("aView"));
+        FreeStyleProject project = j.createFreeStyleProject("aProject");
+        ((DirectlyModifiableView) j.jenkins.getView("aView")).add(project);
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(1));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(true));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(0));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(false));
+    }
+
+    @Test public void removeJobManyShouldSucceed() throws Exception {
+
+        j.jenkins.addView(new ListView("aView"));
+        FreeStyleProject project1 = j.createFreeStyleProject("aProject1");
+        FreeStyleProject project2 = j.createFreeStyleProject("aProject2");
+        ((DirectlyModifiableView) j.jenkins.getView("aView")).add(project1);
+        ((DirectlyModifiableView) j.jenkins.getView("aView")).add(project2);
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(2));
+        assertThat(j.jenkins.getView("aView").contains(project1), equalTo(true));
+        assertThat(j.jenkins.getView("aView").contains(project2), equalTo(true));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject1", "aProject2");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(0));
+        assertThat(j.jenkins.getView("aView").contains(project1), equalTo(false));
+        assertThat(j.jenkins.getView("aView").contains(project2 ), equalTo(false));
+    }
+
+    @Test public void removeJobManyShouldSucceedEvenAJobIsSpecifiedTwice() throws Exception {
+
+        j.jenkins.addView(new ListView("aView"));
+        FreeStyleProject project = j.createFreeStyleProject("aProject");
+        ((DirectlyModifiableView) j.jenkins.getView("aView")).add(project);
+
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(1));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(true));
+
+        final CLICommandInvoker.Result result = command
+                .authorizedTo(Jenkins.READ, View.READ, Job.READ, View.CONFIGURE)
+                .invokeWithArgs("aView", "aProject", "aProject");
+
+        assertThat(result, succeededSilently());
+        assertThat(j.jenkins.getView("aView").getAllItems().size(), equalTo(0));
+        assertThat(j.jenkins.getView("aView").contains(project), equalTo(false));
+    }
+
+}
diff --git a/test/src/test/java/hudson/cli/ViewManipulationTest.java b/test/src/test/java/hudson/cli/ViewManipulationTest.java