[JENKINS-23609] Re-enable Successful and Failed link tests

Also None link test was actually testing Successful link!
jenkinsci · Apr 22, 2015 · f5c1b0b · f5c1b0b
1 parent 9716d77
commit f5c1b0b
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/...son/plugins/matrix_configuration_parameter/MatrixCombinationsParameterDefinitionTest.java b/...son/plugins/matrix_configuration_parameter/MatrixCombinationsParameterDefinitionTest.java
@@ -208,7 +208,6 @@ public void testBuildPageJsWithSingleAxis() throws Exception {
         HtmlPage page = wc.getPage(p, "build");
         HtmlForm form = page.getFormByName("parameters");
 
-        /** This does not work now (JENKINS-23609).
         // Successful link
         {
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1")).setChecked(false);
@@ -222,9 +221,7 @@ public void testBuildPageJsWithSingleAxis() throws Exception {
             assertTrue(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value3")).isChecked());
 
         }
-        */
-
-        /** This does not work now (JENKINS-23609).
+
         // Failed link
         {
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1")).setChecked(true);
@@ -238,7 +235,6 @@ public void testBuildPageJsWithSingleAxis() throws Exception {
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value3")).isChecked());
 
         }
-        */
 
         // All link
         {
@@ -260,7 +256,7 @@ public void testBuildPageJsWithSingleAxis() throws Exception {
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value2")).setChecked(true);
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value3")).setChecked(false);
 
-            ((HtmlAnchor)page.getElementById("shortcut-combinations-successful")).click();
+            ((HtmlAnchor)page.getElementById("shortcut-combinations-none")).click();
 
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1")).isChecked());
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value2")).isChecked());
@@ -332,7 +328,6 @@ public void testBuildPageJsWithDoubleAxis() throws Exception {
         HtmlPage page = wc.getPage(p, "build");
         HtmlForm form = page.getFormByName("parameters");
 
-        /** This does not work now (JENKINS-23609).
         // Successful link
         {
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-1-axis2-value2-1")).setChecked(true);
@@ -347,9 +342,7 @@ public void testBuildPageJsWithDoubleAxis() throws Exception {
             assertTrue(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-2-axis2-value2-1")).isChecked());
             assertTrue(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-2-axis2-value2-2")).isChecked());
         }
-        */
 
-        /** This does not work now (JENKINS-23609).
         // Failed link
         {
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-1-axis2-value2-1")).setChecked(false);
@@ -364,7 +357,6 @@ public void testBuildPageJsWithDoubleAxis() throws Exception {
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-2-axis2-value2-1")).isChecked());
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-2-axis2-value2-2")).isChecked());
         }
-        */
 
         // All link
         {
@@ -388,7 +380,7 @@ public void testBuildPageJsWithDoubleAxis() throws Exception {
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-2-axis2-value2-1")).setChecked(false);
             ((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-2-axis2-value2-2")).setChecked(true);
 
-            ((HtmlAnchor)page.getElementById("shortcut-combinations-successful")).click();
+            ((HtmlAnchor)page.getElementById("shortcut-combinations-none")).click();
 
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-1-axis2-value2-1")).isChecked());
             assertFalse(((HtmlCheckBoxInput)form.getElementById("checkboxcombinations-axis1-value1-1-axis2-value2-2")).isChecked());