[FIXED JENKINS-14141] Fix legacy mode disable and added unit test

jenkinsci · Sep 5, 2012 · d7a1ee2 · d7a1ee2
1 parent d06257a
commit d7a1ee2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/hudson/scm/CVSSCM.java b/src/main/java/hudson/scm/CVSSCM.java
@@ -125,7 +125,7 @@ public CVSSCM(final List<CvsRepository> repositories, final boolean canUseUpdate
         this.repositories = repositories.toArray(new CvsRepository[repositories.size()]);
         this.canUseUpdate = canUseUpdate;
         this.skipChangeLog = skipChangeLog;
-        flatten = !legacy && this.repositories.length == 1 && this.repositories[0].getRepositoryItems().length == 0 && this.repositories[0].getRepositoryItems()[0].getModules().length == 1 && "".equals(fixNull(this.repositories[0].getRepositoryItems()[0].getModules()[0].getLocalName()));
+        flatten = !legacy && this.repositories.length == 1 && this.repositories[0].getRepositoryItems().length == 1 && this.repositories[0].getRepositoryItems()[0].getModules().length == 1;
         repositoryBrowser = browser;
         this.pruneEmptyDirectories = pruneEmptyDirectories;
         this.disableCvsQuiet = disableCvsQuiet;

diff --git a/src/test/java/hudson/scm/CVSSCMTest.java b/src/test/java/hudson/scm/CVSSCMTest.java
@@ -8,7 +8,9 @@
 
 import java.lang.reflect.Field;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -107,4 +109,22 @@ public void testProjectExport() throws Exception {
         new WebClient().goTo(p.getUrl() + "api/xml?depth=999",
                         "application/xml");
     }
+
+    @Bug(14141)
+    public void testFlattenEnabled() {
+        List<CvsRepository> repositories = Arrays.asList(new CvsRepository("cvsroot", false, null,
+                Arrays.asList(new CvsRepositoryItem(new CvsRepositoryLocation.HeadRepositoryLocation(), new CvsModule[]{new CvsModule("remoteName", "localName")})), new ArrayList<ExcludedRegion>(), 3));
+        CVSSCM scm = new CVSSCM(repositories, false, false, null, false, false, false, false);
+        assertFalse(scm.isLegacy());
+
+        scm = new CVSSCM(repositories, false, true, null, false, false, false, false);
+        assertTrue(scm.isLegacy());
+
+        repositories = Arrays.asList(new CvsRepository("cvsroot", false, null,
+                Arrays.asList(new CvsRepositoryItem(new CvsRepositoryLocation.HeadRepositoryLocation(), new CvsModule[]{new CvsModule("remoteName", "localName"), new CvsModule("remoteName2", "localName2")})), new ArrayList<ExcludedRegion>(), 3));
+
+        scm = new CVSSCM(repositories, false, false, null, false, false, false, false);
+        assertTrue(scm.isLegacy());
+
+    }
 }