refactor[TW17325]: Remove MockAccessDetailCollector

Change-Id: Ifc3544c6c83d05a77be3fd0b63d444e491750a33

3 files changed, 10 insertions, 48 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java
index 015db9a70e3..28fda8ea464 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java
@@ -17,8 +17,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import org.eclipse.osee.framework.core.data.IAccessContextId;
+import org.eclipse.osee.framework.core.dsl.integration.AccessDataCollector;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.CheckAccessDetailCollectorNotCalled;
-import org.eclipse.osee.framework.core.dsl.integration.mocks.MockAccessDetailCollector;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.MockArtifactDataProvider;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.MockArtifactProxy;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.MockModel;
@@ -85,12 +85,12 @@ public class AccessModelInterpreterImplTest {
 
    @Test(expected = OseeArgumentException.class)
    public void testComputeAccessNullCheck2() {
-      interpreterNoArtData.computeAccessDetails(new MockAccessDetailCollector(), null, new Object());
+      interpreterNoArtData.computeAccessDetails(new AccessDataCollector(), null, new Object());
    }
 
    @Test(expected = OseeArgumentException.class)
    public void testComputeAccessNullCheck3() {
-      interpreterNoArtData.computeAccessDetails(new MockAccessDetailCollector(), expectedContext1, null);
+      interpreterNoArtData.computeAccessDetails(new AccessDataCollector(), expectedContext1, null);
    }
 
    @Test
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java
index ff4af17ff5d..6c0d6552e8b 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java
@@ -13,6 +13,8 @@
 
 package org.eclipse.osee.framework.core.dsl.integration.mocks;
 
+import java.util.List;
+import org.eclipse.osee.framework.core.dsl.integration.AccessDataCollector;
 import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy;
 import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessContext;
@@ -36,6 +38,7 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationSideEnum;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType;
 import org.eclipse.osee.framework.core.enums.PermissionEnum;
 import org.eclipse.osee.framework.core.model.access.AccessDetail;
+import org.eclipse.osee.framework.core.model.access.AccessDetailCollector;
 import org.eclipse.osee.framework.core.model.access.Scope;
 import org.junit.Assert;
 
@@ -53,16 +56,13 @@ public final class DslAsserts {
    }
 
    public static void assertAccessDetail(RestrictionHandler<?> handler, ObjectRestriction restriction, ArtifactProxy artifactProxy, Object expectedAccessObject, PermissionEnum expectedPermission, Scope expectedScopeLevel) {
-      MockAccessDetailCollector collector = new MockAccessDetailCollector();
+      AccessDetailCollector collector = new AccessDataCollector();
       handler.process(restriction, artifactProxy, collector, new Scope());
-      AccessDetail<?> actualDetail = collector.getAccessDetails();
+      List<AccessDetail<?>> actualDetails = collector.getAccessDetails();
       if (expectedAccessObject == null) {
-         Assert.assertNull(actualDetail);
+         Assert.assertTrue(actualDetails.isEmpty());
       } else {
-         Assert.assertNotNull(actualDetail);
-         Assert.assertEquals(expectedPermission, actualDetail.getPermission());
-         Assert.assertEquals(expectedAccessObject, actualDetail.getAccessObject());
-         Assert.assertEquals(expectedScopeLevel, actualDetail.getScope());
+         Assert.assertTrue(collector.contains(expectedAccessObject, expectedPermission, expectedScopeLevel));
       }
    }
 
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockAccessDetailCollector.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockAccessDetailCollector.java
deleted file mode 100644
index d79a78644d7..00000000000
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockAccessDetailCollector.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2004, 2007 Boeing
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Boeing - initial API and implementation
- **********************************************************************/
-
-package org.eclipse.osee.framework.core.dsl.integration.mocks;
-
-import org.eclipse.osee.framework.core.model.access.AccessDetail;
-import org.eclipse.osee.framework.core.model.access.AccessDetailCollector;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class MockAccessDetailCollector implements AccessDetailCollector {
-
-   private AccessDetail<?> actualAccessDetail;
-
-   public AccessDetail<?> getAccessDetails() {
-      return actualAccessDetail;
-   }
-
-   public void clear() {
-      collect(null);
-   }
-
-   @Override
-   public void collect(AccessDetail<?> accessDetail) {
-      this.actualAccessDetail = accessDetail;
-   }
-}
\ No newline at end of file