Merge pull request #292 from jglick/getItemName-JENKINS-72613

[JENKINS-72613] Demonstrating bug & fix in test

Author: jglick

pom.xml

@@ -63,19 +63,25 @@ THE SOFTWARE.
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.414.3</jenkins.version>
+        <jenkins.version>2.444</jenkins.version>
         <no-test-jar>false</no-test-jar>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.414.x</artifactId>
-                <version>2705.vf5c48c31285b_</version>
+                <artifactId>bom-2.440.x</artifactId>
+                <version>2746.vb_79a_1d3e7b_c8</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- TODO until in BOM -->
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>cloudbees-folder</artifactId>
+                <version>6.919.va_e17e72383f5</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

src/test/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectTest.java

@@ -26,6 +26,7 @@
 
 import com.cloudbees.hudson.plugins.folder.computed.FolderComputation;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.model.AbstractItem;
 import hudson.model.DescriptorVisibilityFilter;
 import hudson.model.Item;
 import hudson.model.Queue;
@@ -53,13 +54,19 @@
 import jenkins.plugins.git.GitSCMSource;
 import jenkins.plugins.git.GitBranchSCMHead;
 import jenkins.plugins.git.GitSampleRepoRule;
+import jenkins.plugins.git.traits.BranchDiscoveryTrait;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMSource;
 import jenkins.scm.impl.SingleSCMSource;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -267,4 +274,34 @@ public DescriptorImpl() {
         r.assertLogContains("branch=feature2", b2);
     }
 
+    @Issue("JENKINS-72613")
+    @Test public void reloadMangledName() throws Exception {
+        r.jenkins.setQuietPeriod(0);
+        sampleRepo.init();
+        sampleRepo.write("Jenkinsfile", "echo 'on master'");
+        sampleRepo.git("add", "Jenkinsfile");
+        sampleRepo.git("commit", "--all", "--message=init");
+        for (var branch : List.of("ok-1", "danger_1")) {
+            sampleRepo.git("checkout", "-b", branch, "master");
+            sampleRepo.write("Jenkinsfile", "echo 'on " + branch + "'");
+            sampleRepo.git("add", "Jenkinsfile");
+            sampleRepo.git("commit", "--all", "--message=" + branch);
+        }
+        var mp = r.jenkins.createProject(WorkflowMultiBranchProject.class, "p");
+        var source = new GitSCMSource(sampleRepo.toString());
+        source.setTraits(List.of(new BranchDiscoveryTrait()));
+        mp.getSourcesList().add(new BranchSource(source));
+        var ok = scheduleAndFindBranchProject(mp, "ok-1");
+        var danger = findBranchProject(mp, "danger_1");
+        r.waitUntilNoActivity();
+        assertThat(ok.getRootDir().getName(), is("ok-1"));
+        assertThat(danger.getRootDir().getName(), is("danger-1.i2g9ue"));
+        ok.doReload();
+        assertThat(mp.getItems().stream().map(AbstractItem::getName).toArray(String[]::new),
+            arrayContainingInAnyOrder("master", "ok-1", "danger_1"));
+        danger.doReload();
+        assertThat(mp.getItems().stream().map(AbstractItem::getName).toArray(String[]::new),
+            arrayContainingInAnyOrder("master", "ok-1", "danger_1"));
+    }
+
 }