Merge pull request #9 from amuniz/trend-config-JENKINS-29088

[JENKINS-29088] Fix 404 on trends configuration link
jenkinsci · Jul 24, 2015 · 65d6348 · 65d6348
2 parents bca40df + e1fe0fb
commit 65d6348
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.410</version>
+        <version>1.480</version>
     </parent>
 
     <groupId>com.thalesgroup.jenkins-ci.plugins</groupId>

diff --git a/src/main/resources/hudson/plugins/cpptest/CpptestPublisher/config.jelly b/src/main/resources/hudson/plugins/cpptest/CpptestPublisher/config.jelly
@@ -6,6 +6,6 @@
 		checkUrl="'descriptorByName/CpptestPublisher/checkPattern?value='+escape(this.value)" />
   </f:entry>
   <f:advanced>
-    <u:advanced id="cpptest"/>
+    <u:advanced id="Cpptest"/>
   </f:advanced>
 </j:jelly>
diff --git a/src/test/java/hudson/plugins/cpptest/functional/CpptestPublisherTest.java b/src/test/java/hudson/plugins/cpptest/functional/CpptestPublisherTest.java
@@ -0,0 +1,76 @@
+package hudson.plugins.cpptest.functional;
+
+import java.io.IOException;
+
+import hudson.FilePath;
+import hudson.Launcher;
+import hudson.model.BuildListener;
+import hudson.model.AbstractBuild;
+import hudson.model.FreeStyleProject;
+import hudson.plugins.cpptest.CpptestPublisher;
+import hudson.plugins.cpptest.CpptestResultAction;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestBuilder;
+
+import static org.junit.Assert.*;
+
+import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+
+public class CpptestPublisherTest {
+
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Test
+    public void testRunPublisher() throws Exception {
+        FreeStyleProject fs = j.createFreeStyleProject("fs");
+        fs.getBuildersList().add(new CpptestBuilder());
+        j.assertBuildStatusSuccess(fs.scheduleBuild2(0));
+        CpptestResultAction resultAction = fs.getLastBuild().getAction(CpptestResultAction.class);
+        assertTrue(resultAction != null);
+        // Original input file has exactly 6 annotations to be processed
+        assertTrue(resultAction.getResult().toString().equals("Cpptest Warnings: 6 annotations"));
+    }
+
+    @Test
+    public void testTrendsLink200() throws ElementNotFoundException, Exception {
+        FreeStyleProject fs = j.createFreeStyleProject("fs");
+        fs.getPublishersList().add(CpptestPublisherTest.createDefaultCpptestPublisher());
+        fs.save();
+        // Facing https://issues.jenkins-ci.org/browse/JENKINS-8854 in 1.410
+        // com.gargoylesoftware.htmlunit.ScriptException: TypeError: Cannot read property "nextSibling" from null (http://localhost:52114/static/c4a73f6e/scripts/hudson-behavior.js#863)
+        // This seems to be fixed in 1.480
+        j.submit(j.createWebClient().getPage(fs, "configure").getFormByName("config"));
+        j.createWebClient().goTo(fs.getUrl() + "Cpptest/configureDefaults");
+    }
+
+    private class CpptestBuilder extends TestBuilder {
+
+        private CpptestPublisher publisher;
+
+        public CpptestBuilder() {
+            publisher = CpptestPublisherTest.createDefaultCpptestPublisher();
+        }
+
+        @Override
+        public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener)
+                throws InterruptedException, IOException {
+            FilePath dir = build.getWorkspace().child("Cpptest-result.xml");
+            dir.copyFrom(CpptestPublisherTest.class.getResourceAsStream("/hudson/plugins/cpptest/parser/report-9.5.0.49-test.xml"));
+            return publisher.perform(build, launcher, listener);
+        }
+    }
+
+    public static CpptestPublisher createDefaultCpptestPublisher() {
+        return new CpptestPublisher("", "", "", 
+                "normal", "", false, "", 
+                "", "", "", "", 
+                "", "", "", "", "", 
+                "", "", "", "", "", 
+                "", false, false, "Cpptest");
+    }
+
+}