refinement[bgz_349970]: Replace RecursiveBranchProvider with MultiBranchProvider

4 files changed, 75 insertions, 48 deletions

diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/mocks/MockBranchProvider.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/mocks/MockBranchProvider.java
index bc45b31e5e0..b1820efc196 100644
--- a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/mocks/MockBranchProvider.java
+++ b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/mocks/MockBranchProvider.java
@@ -76,8 +76,8 @@ public final class MockBranchProvider implements IBranchesProvider {
       return branches;
    }
 
-   public static Branch getRootBranch() throws OseeCoreException {
-      for (Branch branch : MockBranchProvider.createTestBranches()) {
+   public static Branch getRootBranch(Collection<Branch> branches) throws OseeCoreException {
+      for (Branch branch : branches) {
          if (branch.getName().equals(ROOT_BRANCH_NAME)) {
             return branch;
          }
diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/MultiBranchProviderTest.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/MultiBranchProviderTest.java
new file mode 100644
index 00000000000..8ec7c2cb1aa
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/MultiBranchProviderTest.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.branch.management.test.purge;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import junit.framework.Assert;
+import org.eclipse.osee.framework.branch.management.purge.MultiBranchProvider;
+import org.eclipse.osee.framework.branch.management.test.mocks.MockBranchProvider;
+import org.eclipse.osee.framework.core.enums.BranchType;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.cache.BranchFilter;
+import org.junit.Test;
+
+/**
+ * @author John Misinco
+ */
+public class MultiBranchProviderTest {
+
+   @Test
+   public void testGetBranchesRecursive() throws OseeCoreException {
+      BranchFilter filter = new BranchFilter();
+      filter.setNegatedBranchTypes(BranchType.BASELINE);
+      Set<Branch> branchRoots = new HashSet<Branch>();
+
+      Collection<Branch> testBranchesA = MockBranchProvider.createTestBranches();
+      Collection<Branch> testBranchesB = MockBranchProvider.createTestBranches();
+
+      branchRoots.add(MockBranchProvider.getRootBranch(testBranchesA));
+      branchRoots.add(MockBranchProvider.getRootBranch(testBranchesB));
+
+      MultiBranchProvider provider = new MultiBranchProvider(true, branchRoots, filter);
+      int numBranches = provider.getBranches().size();
+      int expectedSize = testBranchesA.size() + testBranchesB.size();
+      Assert.assertEquals(expectedSize, numBranches);
+   }
+
+   @Test
+   public void testGetBranchesNonRecursive() throws OseeCoreException {
+      BranchFilter filter = new BranchFilter();
+      filter.setNegatedBranchTypes(BranchType.BASELINE);
+
+      Collection<Branch> testBranches = MockBranchProvider.createTestBranches();
+
+      MultiBranchProvider provider1 =
+         new MultiBranchProvider(false, Collections.singleton(MockBranchProvider.getRootBranch(testBranches)), filter);
+      int numBranches = provider1.getBranches().size();
+      Assert.assertEquals(1, numBranches);
+
+      Set<Branch> branches = new HashSet<Branch>(MockBranchProvider.createTestBranches());
+      MultiBranchProvider provider2 = new MultiBranchProvider(false, branches, filter);
+      numBranches = provider2.getBranches().size();
+      Assert.assertEquals(branches.size(), numBranches);
+   }
+
+   @Test(expected = OseeCoreException.class)
+   public void testGetBranchesException() throws OseeCoreException {
+      MultiBranchProvider provider = new MultiBranchProvider(true, null, null);
+      provider.getBranches().size();
+   }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/PurgeTestSuite.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/PurgeTestSuite.java
index 9834c7b05fd..1ac8f6bd60e 100644
--- a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/PurgeTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/PurgeTestSuite.java
@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({BranchOperationTest.class, DeletedBranchProviderTest.class, RecursiveBranchProviderTest.class})
+@Suite.SuiteClasses({BranchOperationTest.class, DeletedBranchProviderTest.class, MultiBranchProviderTest.class})
 /**
  * @author John Misinco
  */
diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/RecursiveBranchProviderTest.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/RecursiveBranchProviderTest.java
deleted file mode 100644
index d6eefe31f1e..00000000000
--- a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/RecursiveBranchProviderTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.branch.management.test.purge;
-
-import junit.framework.Assert;
-import org.eclipse.osee.framework.branch.management.purge.RecursiveBranchProvider;
-import org.eclipse.osee.framework.branch.management.test.mocks.MockBranchProvider;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.cache.BranchFilter;
-import org.junit.Test;
-
-/**
- * @author John Misinco
- */
-public class RecursiveBranchProviderTest {
-
-   private int getExpectedNumberOfBranches() throws OseeCoreException {
-      return MockBranchProvider.createTestBranches().size();
-   }
-
-   @Test
-   public void testGetBranches() throws OseeCoreException {
-      BranchFilter filter = new BranchFilter();
-      filter.setNegatedBranchTypes(BranchType.BASELINE);
-
-      RecursiveBranchProvider provider = new RecursiveBranchProvider(MockBranchProvider.getRootBranch(), filter);
-      int numBranches = provider.getBranches().size();
-      Assert.assertEquals(getExpectedNumberOfBranches(), numBranches);
-   }
-
-   @Test(expected = OseeCoreException.class)
-   public void testGetBranchesException() throws OseeCoreException {
-      RecursiveBranchProvider provider = new RecursiveBranchProvider(null, null);
-      provider.getBranches().size();
-   }
-}
\ No newline at end of file