Merge pull request #774 from dnadolny/master

[JENKINS-17478] Various improvements from code reviews
jenkinsci · May 21, 2013 · 6ea4532 · 6ea4532
2 parents b5d96e2 + b435682
commit 6ea4532
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/changelog.html b/changelog.html
@@ -107,6 +107,9 @@ <h3><a name=v1.515>What's new in 1.515</a> (2013/05/18)</h3>
   <li class=rfe>
     Allow the combination filter to accept parameter values.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7285">issue 7285</a>)
+  <li class=rfe>
+    Extension point to transform test names (for use with alternative JVM languages).
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17478">issue 17478</a>)
 </ul>
 <h3><a name=v1.514>What's new in 1.514</a> (2013/05/01)</h3>
 <ul class=image>

diff --git a/core/src/main/java/hudson/tasks/junit/CaseResult.java b/core/src/main/java/hudson/tasks/junit/CaseResult.java
@@ -290,6 +290,9 @@ public String getFullName() {
     	return className+'.'+getName();
     }
 
+    /**
+     * @since 1.515
+     */
     public String getFullDisplayName() {
     	return TestNameTransformer.getTransformedName(getFullName());
     }

diff --git a/core/src/main/java/hudson/tasks/junit/ClassResult.java b/core/src/main/java/hudson/tasks/junit/ClassResult.java
@@ -226,6 +226,9 @@ public String getDisplayName() {
         return TestNameTransformer.getTransformedName(getName());
     }
 
+    /**
+     * @since 1.515
+     */
     public String getFullName() {
     	return getParent().getName() + "." + className;
     }

diff --git a/test/src/test/java/hudson/tasks/junit/TestNameTransformerTest.java b/test/src/test/java/hudson/tasks/junit/TestNameTransformerTest.java
@@ -1,26 +1,33 @@
 package hudson.tasks.junit;
 
+import static org.junit.Assert.*;
+
 import hudson.Extension;
 
+import org.junit.Rule;
+import org.junit.Test;
 import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.JenkinsRule;
 
-public class TestNameTransformerTest extends HudsonTestCase {
+public class TestNameTransformerTest {
 
-    private static final String UniqueNameForTest = "unique-name-to-test-name-transformer";
+    private static final String UNIQUE_NAME_FOR_TEST = "unique-name-to-test-name-transformer";
+    @Rule public JenkinsRule j = new JenkinsRule();
 
     @Extension
     public static class TestTransformer extends TestNameTransformer {
         @Override
         public String transformName(String name) {
-            if (UniqueNameForTest.equals(name)) {
+            if (UNIQUE_NAME_FOR_TEST.equals(name)) {
                 return name + "-transformed";
             }
             return name;
         }
     }
 
+    @Test
     public void testNameIsTransformed() {
-        assertEquals(UniqueNameForTest + "-transformed", TestNameTransformer.getTransformedName(UniqueNameForTest));
+        assertEquals(UNIQUE_NAME_FOR_TEST + "-transformed", TestNameTransformer.getTransformedName(UNIQUE_NAME_FOR_TEST));
     }
 
 }