Extend test for newer and older Jenkins versions

jenkinsci · Nov 3, 2024 · ac0d625 · ac0d625
1 parent c8695d9
commit ac0d625
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/test/src/test/java/hudson/jobs/CreateItemTest.java b/test/src/test/java/hudson/jobs/CreateItemTest.java
@@ -38,10 +38,12 @@
 import hudson.model.ItemGroup;
 import hudson.model.ListView;
 import hudson.model.listeners.ItemListener;
+import hudson.util.VersionNumber;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
 import java.text.MessageFormat;
+import jenkins.model.Jenkins;
 import org.htmlunit.HttpMethod;
 import org.htmlunit.Page;
 import org.htmlunit.WebRequest;
@@ -112,10 +114,14 @@ public void testCreateItemDoesNotPopulateDefaultView() throws Exception {
 
         // Confirm new job is not visible in default view
         assertTrue(aView.isDefault()); // a-view is still the default view
-        // TODO: When JENKINS-74795 is fixed, this assertion will pass
-        // assertThat(aView.getItems(), containsInAnyOrder(aJob));
-        // TODO: Until JENKINS-74795 is fixed, this assertion passes (a bug)
-        assertThat(aView.getItems(), containsInAnyOrder(aJob, b2Job));
+        VersionNumber jenkinsVersion = Jenkins.getVersion();
+        if (jenkinsVersion == null || jenkinsVersion.isOlderThan(new VersionNumber("2.475"))) {
+            // TODO: When JENKINS-74795 is fixed, this assertion will pass
+            assertThat(aView.getItems(), containsInAnyOrder(aJob));
+        } else {
+            // TODO: Until JENKINS-74795 is fixed, this assertion passes (a bug)
+            assertThat(aView.getItems(), containsInAnyOrder(aJob, b2Job));
+        }
     }
 
     @Issue("JENKINS-31235")