From 3cbe0f8f4c5894fbffa2a5432c2feccb0bd14f95 Mon Sep 17 00:00:00 2001 From: jphillips Date: Tue, 27 Jul 2010 19:52:18 +0000 Subject: Merge access control changes --- .gitignore | 128 +----------------- .../access/test/internal/AccessCollectorTest.java | 108 --------------- .../access/test/internal/AccessDataTest.java | 118 ----------------- .../test/internal/AccessFilterChainTest.java | 103 --------------- .../access/test/internal/PermissionTest.java | 33 ----- .../model/test/access/AccessDataQueryTest.java | 146 +++++++++++++++++++++ .../core/model/test/access/AccessDataTest.java | 52 ++++++++ .../model/test/access/AccessFilterChainTest.java | 103 +++++++++++++++ .../core/model/test/access/PermissionTest.java | 33 +++++ .../core/model/test/mocks/MockArtifact.java | 54 ++++++++ .../core/model/access/exp/AccessCollector.java | 38 ------ 11 files changed, 390 insertions(+), 526 deletions(-) delete mode 100644 plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessCollectorTest.java delete mode 100644 plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessDataTest.java delete mode 100644 plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessFilterChainTest.java delete mode 100644 plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java create mode 100644 plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java create mode 100644 plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java create mode 100644 plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessFilterChainTest.java create mode 100644 plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionTest.java create mode 100644 plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockArtifact.java delete mode 100644 plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/exp/AccessCollector.java diff --git a/.gitignore b/.gitignore index b9db5cce7d4..b2692da9ebc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,126 +1,2 @@ -plugins/jms.libraries/bin/ -plugins/org.eclipse.osee.ats.help.ui/bin/ -plugins/org.eclipse.osee.coverage.help.ui/bin/ -plugins/org.eclipse.osee.define.help.ui/bin/ -plugins/org.eclipse.osee.framework.dev.help.ui/bin/ -plugins/org.eclipse.osee.framework.templates/bin/ -plugins/org.eclipse.osee.framework.ui.product/bin/ -plugins/org.eclipse.osee.support.build/bin/ -plugins/org.eclipse.osee.client.integration.tests/bin/ -plugins/org.eclipse.osee.framework.core.datastore.test/bin/ -plugins/org.eclipse.osee.framework.core.datastore/bin/ -plugins/org.eclipse.osee.framework.core.message.test/bin/ -plugins/org.eclipse.osee.framework.core.message/bin/ -plugins/org.eclipse.osee.framework.core.model.test/bin/ -plugins/org.eclipse.osee.framework.core.model/bin/ -plugins/org.eclipse.osee.framework.lifecycle.test/bin/ -plugins/org.eclipse.osee.framework.lifecycle/bin/ -plugins/org.eclipse.osee.ote.ui.message.util/bin/ -plugins/org.eclipse.osee.ote.ui.message/bin/ -plugins/org.eclipse.osee.framework.access.test/bin/ -plugins/org.eclipse.osee.framework.access/bin/ -plugins/jms.activemq.launch/bin/ -plugins/org.eclipse.osee.framework.help.ui/bin/ -plugins/net.jini/bin/ -plugins/org.eclipse.osee.ats.config.demo/bin/ -plugins/org.eclipse.osee.ats.test/bin/ -plugins/org.eclipse.osee.ats/bin/ -plugins/org.eclipse.osee.coverage.test/bin/ -plugins/org.eclipse.osee.coverage/bin/ -plugins/org.eclipse.osee.define/bin/ -plugins/org.eclipse.osee.demo.db.connection/bin/ -plugins/org.eclipse.osee.framework.branch.management.test/bin/ -plugins/org.eclipse.osee.framework.branch.management/bin/ -plugins/org.eclipse.osee.framework.core.client/bin/ -plugins/org.eclipse.osee.framework.core.server.test/bin/ -plugins/org.eclipse.osee.framework.core.server/bin/ -plugins/org.eclipse.osee.framework.core.test/bin/ -plugins/org.eclipse.osee.framework.core/bin/ -plugins/org.eclipse.osee.framework.database.init/bin/ -plugins/org.eclipse.osee.framework.database/bin/ -plugins/org.eclipse.osee.framework.derby/bin/ -plugins/org.eclipse.osee.framework.jdbcodbc/bin/ -plugins/org.eclipse.osee.framework.jdk.core.test/bin/ -plugins/org.eclipse.osee.framework.jdk.core/bin/ -plugins/org.eclipse.osee.framework.jini/bin/ -plugins/org.eclipse.osee.framework.logging/bin/ -plugins/org.eclipse.osee.framework.manager.servlet.test/bin/ -plugins/org.eclipse.osee.framework.manager.servlet/bin/ -plugins/org.eclipse.osee.framework.messaging.event.res.test/bin/ -plugins/org.eclipse.osee.framework.messaging.event.res/bin/ -plugins/org.eclipse.osee.framework.messaging.event.skynet/bin/ -plugins/org.eclipse.osee.framework.messaging.test/bin/ -plugins/org.eclipse.osee.framework.messaging/bin/ -plugins/org.eclipse.osee.framework.oracle/bin/ -plugins/org.eclipse.osee.framework.plugin.core/bin/ -plugins/org.eclipse.osee.framework.postgresql/bin/ -plugins/org.eclipse.osee.framework.resource.locator.attribute.test/bin/ -plugins/org.eclipse.osee.framework.resource.locator.attribute/bin/ -plugins/org.eclipse.osee.framework.resource.management.servlet.test/bin/ -plugins/org.eclipse.osee.framework.resource.management.test/bin/ -plugins/org.eclipse.osee.framework.resource.management/bin/ -plugins/org.eclipse.osee.framework.resource.provider.attribute.test/bin/ -plugins/org.eclipse.osee.framework.resource.provider.attribute/bin/ -plugins/org.eclipse.osee.framework.search.engine.test/bin/ -plugins/org.eclipse.osee.framework.search.engine/bin/ -plugins/org.eclipse.osee.framework.server.admin/bin/ -plugins/org.eclipse.osee.framework.server.tests/bin/ -plugins/org.eclipse.osee.framework.skynet.core.test/bin/ -plugins/org.eclipse.osee.framework.skynet.core/bin/ -plugins/org.eclipse.osee.framework.svn/bin/ -plugins/org.eclipse.osee.framework.types.bridge/bin/ -plugins/org.eclipse.osee.framework.types.edit/bin/ -plugins/org.eclipse.osee.framework.types.generator/bin/ -plugins/org.eclipse.osee.framework.types.tests/bin/ -plugins/org.eclipse.osee.framework.types.ui/bin/ -plugins/org.eclipse.osee.framework.types/bin/ -plugins/org.eclipse.osee.framework.ui.admin/bin/ -plugins/org.eclipse.osee.framework.ui.branch.graph/bin/ -plugins/org.eclipse.osee.framework.ui.data.model.editor/bin/ -plugins/org.eclipse.osee.framework.ui.jdk/bin/ -plugins/org.eclipse.osee.framework.ui.plugin/bin/ -plugins/org.eclipse.osee.framework.ui.service.control/bin/ -plugins/org.eclipse.osee.framework.ui.skynet.test/bin/ -plugins/org.eclipse.osee.framework.ui.skynet/bin/ -plugins/org.eclipse.osee.framework.ui.swt/bin/ -plugins/org.eclipse.osee.framework.ui.workspacebundleloader/bin/ -plugins/org.eclipse.osee.framework.ui.ws/bin/ -plugins/org.eclipse.osee.ote.client.msg/bin/ -plugins/org.eclipse.osee.ote.client/bin/ -plugins/org.eclipse.osee.ote.connection.jini/bin/ -plugins/org.eclipse.osee.ote.connection.service.test/bin/ -plugins/org.eclipse.osee.ote.connection.service/bin/ -plugins/org.eclipse.osee.ote.container/bin/ -plugins/org.eclipse.osee.ote.core/bin/ -plugins/org.eclipse.osee.ote.define/bin/ -plugins/org.eclipse.osee.ote.message.test/bin/ -plugins/org.eclipse.osee.ote.message/bin/ -plugins/org.eclipse.osee.ote.messaging.dds/bin/ -plugins/org.eclipse.osee.ote.runtimeManager/bin/ -plugins/org.eclipse.osee.ote.server/bin/ -plugins/org.eclipse.osee.ote.ui.define/bin/ -plugins/org.eclipse.osee.ote.ui.host.cmd/bin/ -plugins/org.eclipse.osee.ote.ui.markers/bin/ -plugins/org.eclipse.osee.ote.ui.mux/bin/ -plugins/org.eclipse.osee.ote.ui.test.manager/bin/ -plugins/org.eclipse.osee.ote.ui/bin/ -plugins/org.eclipse.osee.sos/bin/ -plugins/org.eclipse.osee.support.test.util/bin/ -plugins/org.eclipse.osee.support.test/bin/ -_Retired/org.eclipse.nebula.widgets.xviewer/bin/ -_Retired/org.eclipse.osee.framework.antsupport/bin/ -_Retired/org.eclipse.osee.framework.application.server/bin/ -_Retired/org.eclipse.osee.framework.osgi/bin/ -_Retired/org.eclipse.osee.framework.osgitestrunner/bin/ -_Retired/org.eclipse.osee.framework.resource.locator.snapshot.test/bin/ -_Retired/org.eclipse.osee.framework.resource.locator.snapshot/bin/ -_Retired/org.eclipse.osee.framework.resource.provider.common/bin/ -_Retired/org.eclipse.osee.framework.resource.provider.snapshot/bin/ -_Retired/org.eclipse.osee.framework.session.management.servlet.test/bin/ -_Retired/org.eclipse.osee.framework.skynet.core.test/bin/ -plugins/org.eclipse.osee.framework.core.dsl.edit/bin/ -plugins/org.eclipse.osee.framework.core.dsl.integration/bin/ -plugins/org.eclipse.osee.framework.core.dsl.ui.integration/bin/ -plugins/org.eclipse.osee.framework.core.dsl.ui/bin/ -plugins/org.eclipse.osee.framework.core.dsl/bin/ -plugins/org.eclipse.osee.framework.core.dsl.integration.test/bin/ +#Ignore all bin folders +*/*/bin/ diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessCollectorTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessCollectorTest.java deleted file mode 100644 index ebbfcc45557..00000000000 --- a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessCollectorTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Created on Jul 20, 2010 - * - * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE - */ -package org.eclipse.osee.framework.access.test.internal; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import junit.framework.Assert; -import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; -import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.core.model.DefaultBasicArtifact; -import org.eclipse.osee.framework.core.model.IBasicArtifact; -import org.eclipse.osee.framework.core.model.access.exp.AccessCollector; -import org.eclipse.osee.framework.core.model.access.exp.ArtifactAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.AttributeTypeAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.BranchAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.IAccessFilter; -import org.junit.Test; - -/** - * @author Jeff C. Phillips - */ -public class AccessCollectorTest { - - @Test - public void testAttrUseCase() { - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - IAttributeType wordAttrType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; - IAttributeType phoneType = CoreAttributeTypes.PHONE; - List filters = new ArrayList(); - - BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); - ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); - AttributeTypeAccessFilter wordTypeFilter = - new AttributeTypeAccessFilter(PermissionEnum.WRITE, basicArtifact, wordAttrType); - AttributeTypeAccessFilter phoneTypeFilter = - new AttributeTypeAccessFilter(PermissionEnum.READ, basicArtifact, phoneType); - - filters.add(artifactAccessFilter); - filters.add(branchAccessFilter); - filters.add(phoneTypeFilter); - filters.add(wordTypeFilter); - - AccessCollector collector = new AccessCollector(filters); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.WRITE).size() == 1); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.READ).size() == 2); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.DENY).isEmpty()); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.FULLACCESS).isEmpty()); - } - - @Test - public void testAttrUseCaseMissingBranchFilters() { - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - IAttributeType wordAttrType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; - IAttributeType phoneType = CoreAttributeTypes.PHONE; - List filters = new ArrayList(); - - AttributeTypeAccessFilter wordTypeFilter = - new AttributeTypeAccessFilter(PermissionEnum.WRITE, basicArtifact, wordAttrType); - AttributeTypeAccessFilter phoneTypeFilter = - new AttributeTypeAccessFilter(PermissionEnum.READ, basicArtifact, phoneType); - - filters.add(phoneTypeFilter); - filters.add(wordTypeFilter); - - AccessCollector collector = new AccessCollector(filters); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.WRITE).size() == 1); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.READ).size() == 2); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.DENY).isEmpty()); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.FULLACCESS).isEmpty()); - } - - @Test - public void testAttrUseCaseMissingAttrFilters() { - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - IAttributeType wordAttrType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; - IAttributeType phoneType = CoreAttributeTypes.PHONE; - List filters = new ArrayList(); - - BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); - ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); - - filters.add(artifactAccessFilter); - filters.add(branchAccessFilter); - - AccessCollector collector = new AccessCollector(filters); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.WRITE).size() == 2); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.READ).size() == 2); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.DENY).isEmpty()); - Assert.assertTrue(collector.getAttributeTypesToMatch(basicArtifact, Arrays.asList(wordAttrType, phoneType), - PermissionEnum.FULLACCESS).isEmpty()); - } -} diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessDataTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessDataTest.java deleted file mode 100644 index 7039e649847..00000000000 --- a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessDataTest.java +++ /dev/null @@ -1,118 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.access.test.internal; - -import org.eclipse.osee.framework.core.model.access.AccessData; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Test Case for {@link AccessData} - * - * @author Jeff C. Phillips - */ -public class AccessDataTest { - - @Ignore - @Test - public void testObjectBase() { - } - - // @Test - // public void testObjectBase() { - // AccessData accessData = new AccessData(); - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.READ)); - // - // IBasicArtifact basicArtifact2 = new DefaultBasicArtifact(2, "2", "Name2"); - // accessData.add(basicArtifact2, PermissionEnum.WRITE); - // IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "Name"); - // accessData.add(basicArtifact, PermissionEnum.READ); - // - // Assert.assertTrue(accessData.matchesAll(PermissionEnum.READ)); - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.WRITE)); - // } - // - // @Test - // public void testObjectBaseDeny() { - // AccessData accessData = new AccessData(); - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.READ)); - // - // IBasicArtifact basicArtifact2 = new DefaultBasicArtifact(2, "2", "Name2"); - // accessData.add(basicArtifact2, PermissionEnum.DENY); - // IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "Name"); - // accessData.add(basicArtifact, PermissionEnum.READ); - // - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.READ)); - // } - // - // @Test - // public void testAttributeTypeFilter() { - // AccessData accessData = new AccessData(); - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.READ)); - // - // IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "Name"); - // IBasicArtifact basicArtifact2 = new DefaultBasicArtifact(2, "2", "Name Two"); - // accessData.add(basicArtifact, CoreAttributeTypes.WORD_TEMPLATE_CONTENT, PermissionEnum.READ); - // accessData.add(basicArtifact2, CoreAttributeTypes.WORD_TEMPLATE_CONTENT, PermissionEnum.WRITE); - // - // Assert.assertTrue(!accessData.getAttributeTypeMatches(basicArtifact, CoreAttributeTypes.WORD_TEMPLATE_CONTENT, - // PermissionEnum.READ).isEmpty()); - // Assert.assertTrue(accessData.getAttributeTypeMatches(basicArtifact, CoreAttributeTypes.WORD_TEMPLATE_CONTENT, - // PermissionEnum.WRITE).isEmpty()); - // Assert.assertTrue(accessData.matchesAll(PermissionEnum.READ)); - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.WRITE)); - // } - // - // @Test - // public void testArtifactTypeFilter() { - // AccessData accessData = new AccessData(); - // Assert.assertFalse(accessData.matchesAll(PermissionEnum.READ)); - // - // IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "Name"); - // accessData.add(basicArtifact, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ); - // Assert.assertTrue(!accessData.getArtifactTypeMatches(basicArtifact, - // CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ).isEmpty()); - // Assert.assertTrue(accessData.getArtifactTypeMatches(basicArtifact, CoreArtifactTypes.AbstractSoftwareRequirement, - // PermissionEnum.WRITE).isEmpty()); - // } - // - // @Test - // public void testMerge() { - // AccessData mainAccessData = new AccessData(); - // AccessData subAccessData = new AccessData(); - // - // IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "Name"); - // mainAccessData.add(basicArtifact, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ); - // subAccessData.add(basicArtifact, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.WRITE); - // mainAccessData.merge(subAccessData); - // - // Assert.assertTrue(!mainAccessData.getArtifactTypeMatches(basicArtifact, - // CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ).isEmpty()); - // - // IBasicArtifact basicArtifact2 = new DefaultBasicArtifact(2, "2", "NameTwo"); - // mainAccessData.add(basicArtifact2, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.WRITE); - // subAccessData.add(basicArtifact2, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ); - // - // mainAccessData.merge(subAccessData); - // - // Assert.assertTrue(!mainAccessData.getArtifactTypeMatches(basicArtifact2, - // CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ).isEmpty()); - // - // mainAccessData.add(basicArtifact2, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.WRITE); - // subAccessData.add(basicArtifact2, CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.DENY); - // - // mainAccessData.merge(subAccessData); - // - // Assert.assertFalse(!mainAccessData.getArtifactTypeMatches(basicArtifact2, - // CoreArtifactTypes.AbstractSoftwareRequirement, PermissionEnum.READ).isEmpty()); - // } - -} diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessFilterChainTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessFilterChainTest.java deleted file mode 100644 index a132582c1a8..00000000000 --- a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/AccessFilterChainTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.access.test.internal; - -import junit.framework.Assert; -import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; -import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.core.model.DefaultBasicArtifact; -import org.eclipse.osee.framework.core.model.IBasicArtifact; -import org.eclipse.osee.framework.core.model.access.exp.AccessFilterChain; -import org.eclipse.osee.framework.core.model.access.exp.ArtifactAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.AttributeTypeAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.BranchAccessFilter; -import org.junit.Test; - -/** - * Test Case for {@link AccessFilterChain} - * - * @author Jeff C. Phillips - */ -public class AccessFilterChainTest { - - @Test - public void testUseCase() { - //Can we edit this attribute on an artifact - AccessFilterChain chain = new AccessFilterChain(); - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - IAttributeType attributeType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; - - BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); - ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); - AttributeTypeAccessFilter attributeTypeAccessFilter = - new AttributeTypeAccessFilter(PermissionEnum.DENY, basicArtifact, attributeType); - - chain.add(artifactAccessFilter); - chain.add(branchAccessFilter); - chain.add(attributeTypeAccessFilter); - - PermissionEnum agrPermission = null; - Assert.assertFalse(chain.doFilter(basicArtifact, attributeTypeAccessFilter, PermissionEnum.WRITE, agrPermission)); - Assert.assertTrue(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.WRITE, agrPermission)); - } - - @Test - public void testWrongArtifactUseCase() { - AccessFilterChain chain = new AccessFilterChain(); - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - IBasicArtifact basicArtifact2 = new DefaultBasicArtifact(2, "2", "456"); - IAttributeType attributeType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; - - BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); - ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); - AttributeTypeAccessFilter attributeTypeAccessFilter = - new AttributeTypeAccessFilter(PermissionEnum.DENY, basicArtifact, attributeType); - - chain.add(artifactAccessFilter); - chain.add(branchAccessFilter); - chain.add(attributeTypeAccessFilter); - - PermissionEnum agrPermission = null; - Assert.assertFalse(chain.doFilter(basicArtifact2, attributeTypeAccessFilter, PermissionEnum.WRITE, agrPermission)); - } - - @Test - public void testChain() { - AccessFilterChain chain = new AccessFilterChain(); - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - - BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); - ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); - - chain.add(artifactAccessFilter); - chain.add(branchAccessFilter); - - PermissionEnum agrPermission = null; - Assert.assertTrue(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.READ, agrPermission)); - Assert.assertTrue(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.WRITE, agrPermission)); - } - - @Test - public void testChainDeny() { - AccessFilterChain chain = new AccessFilterChain(); - IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); - BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.DENY); - ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); - - chain.add(artifactAccessFilter); - chain.add(branchAccessFilter); - - PermissionEnum agrPermission = null; - Assert.assertFalse(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.READ, agrPermission)); - Assert.assertFalse(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.WRITE, agrPermission)); - } -} diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java deleted file mode 100644 index 71137a2414a..00000000000 --- a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.access.test.internal; - -import org.eclipse.osee.framework.core.enums.PermissionEnum; - -public class PermissionTest { - - public void main(String[] args) { - PermissionEnum[] a = {PermissionEnum.DENY, PermissionEnum.FULLACCESS, null}; - PermissionEnum[] b = {PermissionEnum.LOCK, PermissionEnum.FULLACCESS, null}; - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 3; j++) { - PermissionEnum branchPermission = a[i]; - PermissionEnum userPermission = b[j]; - if (branchPermission == PermissionEnum.DENY || userPermission == null) { - System.out.print("T"); - } else { - System.out.print("F"); - } - } - System.out.println(); - } - } -} diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java new file mode 100644 index 00000000000..08fe6c46fb0 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java @@ -0,0 +1,146 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.core.model.test.access; + +import junit.framework.Assert; +import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.enums.CoreBranches; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.IBasicArtifact; +import org.eclipse.osee.framework.core.model.access.AccessData; +import org.eclipse.osee.framework.core.model.access.AccessDataQuery; +import org.eclipse.osee.framework.core.model.access.AccessDetail; +import org.eclipse.osee.framework.core.model.access.PermissionStatus; +import org.eclipse.osee.framework.core.model.test.mocks.MockArtifact; +import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.junit.Test; + +/** + * Test Case for {@link AccessDataQuery} + * + * @author Jeff C. Phillips + */ +public class AccessDataQueryTest { + + @Test + public void testBranch() throws OseeCoreException { + IOseeBranch branchToCheck = CoreBranches.SYSTEM_ROOT; + + TestObject testObject = getTestData(); + AccessData data = testObject.getAccessData(); + + AccessDataQuery query = new AccessDataQuery(data); + PermissionStatus status = new PermissionStatus(); + + query.branchMatches(PermissionEnum.WRITE, branchToCheck, status); + Assert.assertTrue(status.matches()); + + query.branchMatches(PermissionEnum.FULLACCESS, branchToCheck, status); + Assert.assertFalse(status.matches()); + } + + @Test + public void testArtifactType() throws OseeCoreException { + TestObject testObject = getTestData(); + AccessData data = testObject.getAccessData(); + IBasicArtifact artifactToCheck = testObject.getArtifact(); + + AccessDataQuery query = new AccessDataQuery(data); + PermissionStatus status = new PermissionStatus(); + + query.artifactTypeMatches(PermissionEnum.WRITE, artifactToCheck, status); + Assert.assertTrue(status.matches()); + + query.artifactTypeMatches(PermissionEnum.FULLACCESS, artifactToCheck, status); + Assert.assertFalse(status.matches()); + } + + @Test + public void testArtifact() throws OseeCoreException { + TestObject testObject = getTestData(); + AccessData data = testObject.getAccessData(); + IBasicArtifact artifactToCheck = testObject.getArtifact(); + + AccessDataQuery query = new AccessDataQuery(data); + PermissionStatus status = new PermissionStatus(); + + query.artifactMatches(PermissionEnum.WRITE, artifactToCheck, status); + Assert.assertTrue(status.matches()); + } + + @Test + public void testAttributeType() throws OseeCoreException { + TestObject testObject = getTestData(); + AccessData data = testObject.getAccessData(); + IBasicArtifact artifactToCheck = testObject.getArtifact(); + + IAttributeType attributeType = CoreAttributeTypes.PARAGRAPH_NUMBER; + IAttributeType wordAttributeType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; + + data.add(artifactToCheck, new AccessDetail(attributeType, PermissionEnum.WRITE)); + data.add(artifactToCheck, new AccessDetail(wordAttributeType, PermissionEnum.READ)); + + AccessDataQuery query = new AccessDataQuery(data); + PermissionStatus status = new PermissionStatus(); + + query.artifactMatches(PermissionEnum.WRITE, artifactToCheck, status); + Assert.assertTrue(status.matches()); + + query.attributeTypeMatches(PermissionEnum.READ, artifactToCheck, wordAttributeType, status); + Assert.assertTrue(status.matches()); + + query.attributeTypeMatches(PermissionEnum.WRITE, artifactToCheck, wordAttributeType, status); + Assert.assertFalse(status.matches()); + + query.artifactTypeMatches(PermissionEnum.WRITE, artifactToCheck, status); + Assert.assertTrue(status.matches()); + + query.artifactTypeMatches(PermissionEnum.FULLACCESS, artifactToCheck, status); + Assert.assertFalse(status.matches()); + } + + private TestObject getTestData() throws OseeCoreException { + IOseeBranch branchToCheck = CoreBranches.SYSTEM_ROOT; + IArtifactType artifactType = CoreArtifactTypes.AbstractSoftwareRequirement; + IBasicArtifact artifactToCheck = new MockArtifact(GUID.create(), "Hello", branchToCheck, artifactType, 12); + AccessData data = new AccessData(); + + data.add(branchToCheck, new AccessDetail(branchToCheck, PermissionEnum.WRITE)); + data.add(artifactToCheck, new AccessDetail>(artifactToCheck, PermissionEnum.WRITE)); + data.add(artifactToCheck, new AccessDetail(artifactType, PermissionEnum.WRITE)); + + return new TestObject(artifactToCheck, data); + } + + private class TestObject { + final IBasicArtifact artifact; + final AccessData accessData; + + public TestObject(IBasicArtifact artifact, AccessData accessData) { + super(); + this.artifact = artifact; + this.accessData = accessData; + } + + public IBasicArtifact getArtifact() { + return artifact; + } + + public AccessData getAccessData() { + return accessData; + } + } +} diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java new file mode 100644 index 00000000000..c87291d954d --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.core.model.test.access; + +import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.enums.CoreBranches; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.DefaultBasicArtifact; +import org.eclipse.osee.framework.core.model.IBasicArtifact; +import org.eclipse.osee.framework.core.model.access.AccessData; +import org.eclipse.osee.framework.core.model.access.AccessDetail; +import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.junit.Test; + +/** + * Test Case for {@link AccessData} + * + * @author Jeff C. Phillips + */ +public class AccessDataTest { + + @Test + public void testAddingData() throws OseeCoreException { + IOseeBranch branchToCheck = CoreBranches.SYSTEM_ROOT; + IArtifactType artifactType = CoreArtifactTypes.AbstractSoftwareRequirement; + IAttributeType attributeType = CoreAttributeTypes.PARAGRAPH_NUMBER; + IAttributeType wordAttributeType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; + + IBasicArtifact artifactToCheck = new DefaultBasicArtifact(12, GUID.create(), "Hello"); + + AccessData data = new AccessData(); + data.add(branchToCheck, new AccessDetail(branchToCheck, PermissionEnum.WRITE)); + + data.add(artifactToCheck, new AccessDetail>(artifactToCheck, PermissionEnum.WRITE)); + data.add(artifactToCheck, new AccessDetail(artifactType, PermissionEnum.WRITE)); + data.add(artifactToCheck, new AccessDetail(attributeType, PermissionEnum.WRITE)); + data.add(artifactToCheck, new AccessDetail(wordAttributeType, PermissionEnum.READ)); + } +} diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessFilterChainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessFilterChainTest.java new file mode 100644 index 00000000000..7b0fb84b50c --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessFilterChainTest.java @@ -0,0 +1,103 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.core.model.test.access; + +import junit.framework.Assert; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.model.DefaultBasicArtifact; +import org.eclipse.osee.framework.core.model.IBasicArtifact; +import org.eclipse.osee.framework.core.model.access.exp.AccessFilterChain; +import org.eclipse.osee.framework.core.model.access.exp.ArtifactAccessFilter; +import org.eclipse.osee.framework.core.model.access.exp.AttributeTypeAccessFilter; +import org.eclipse.osee.framework.core.model.access.exp.BranchAccessFilter; +import org.junit.Test; + +/** + * Test Case for {@link AccessFilterChain} + * + * @author Jeff C. Phillips + */ +public class AccessFilterChainTest { + + @Test + public void testUseCase() { + //Can we edit this attribute on an artifact + AccessFilterChain chain = new AccessFilterChain(); + IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); + IAttributeType attributeType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; + + BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); + ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); + AttributeTypeAccessFilter attributeTypeAccessFilter = + new AttributeTypeAccessFilter(PermissionEnum.DENY, basicArtifact, attributeType); + + chain.add(artifactAccessFilter); + chain.add(branchAccessFilter); + chain.add(attributeTypeAccessFilter); + + PermissionEnum agrPermission = null; + Assert.assertFalse(chain.doFilter(basicArtifact, attributeTypeAccessFilter, PermissionEnum.WRITE, agrPermission)); + Assert.assertTrue(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.WRITE, agrPermission)); + } + + @Test + public void testWrongArtifactUseCase() { + AccessFilterChain chain = new AccessFilterChain(); + IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); + IBasicArtifact basicArtifact2 = new DefaultBasicArtifact(2, "2", "456"); + IAttributeType attributeType = CoreAttributeTypes.WORD_TEMPLATE_CONTENT; + + BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); + ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); + AttributeTypeAccessFilter attributeTypeAccessFilter = + new AttributeTypeAccessFilter(PermissionEnum.DENY, basicArtifact, attributeType); + + chain.add(artifactAccessFilter); + chain.add(branchAccessFilter); + chain.add(attributeTypeAccessFilter); + + PermissionEnum agrPermission = null; + Assert.assertFalse(chain.doFilter(basicArtifact2, attributeTypeAccessFilter, PermissionEnum.WRITE, agrPermission)); + } + + @Test + public void testChain() { + AccessFilterChain chain = new AccessFilterChain(); + IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); + + BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.READ); + ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); + + chain.add(artifactAccessFilter); + chain.add(branchAccessFilter); + + PermissionEnum agrPermission = null; + Assert.assertTrue(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.READ, agrPermission)); + Assert.assertTrue(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.WRITE, agrPermission)); + } + + @Test + public void testChainDeny() { + AccessFilterChain chain = new AccessFilterChain(); + IBasicArtifact basicArtifact = new DefaultBasicArtifact(1, "1", "123"); + BranchAccessFilter branchAccessFilter = new BranchAccessFilter(basicArtifact, PermissionEnum.DENY); + ArtifactAccessFilter artifactAccessFilter = new ArtifactAccessFilter(basicArtifact, PermissionEnum.WRITE); + + chain.add(artifactAccessFilter); + chain.add(branchAccessFilter); + + PermissionEnum agrPermission = null; + Assert.assertFalse(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.READ, agrPermission)); + Assert.assertFalse(chain.doFilter(basicArtifact, basicArtifact, PermissionEnum.WRITE, agrPermission)); + } +} diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionTest.java new file mode 100644 index 00000000000..243ab7fecef --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionTest.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2010 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.core.model.test.access; + +import org.eclipse.osee.framework.core.enums.PermissionEnum; + +public class PermissionTest { + + public void main(String[] args) { + PermissionEnum[] a = {PermissionEnum.DENY, PermissionEnum.FULLACCESS, null}; + PermissionEnum[] b = {PermissionEnum.LOCK, PermissionEnum.FULLACCESS, null}; + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + PermissionEnum branchPermission = a[i]; + PermissionEnum userPermission = b[j]; + if (branchPermission == PermissionEnum.DENY || userPermission == null) { + System.out.print("T"); + } else { + System.out.print("F"); + } + } + System.out.println(); + } + } +} diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockArtifact.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockArtifact.java new file mode 100644 index 00000000000..c8ae9cc83b8 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockArtifact.java @@ -0,0 +1,54 @@ +/* + * Created on Jul 26, 2010 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.core.model.test.mocks; + +import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.NamedIdentity; +import org.eclipse.osee.framework.core.enums.BranchState; +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.IBasicArtifact; +import org.eclipse.osee.framework.core.model.type.ArtifactType; + +/** + * @author Jeff C. Phillips + */ +public class MockArtifact extends NamedIdentity implements IBasicArtifact { + + private final Branch branch; + private final ArtifactType artifactType; + private final int artId; + + public MockArtifact(String guid, String name, IOseeBranch branch, IArtifactType artifactType, int artId) { + super(guid, name); + this.branch = new Branch(branch.getGuid(), branch.getName(), BranchType.WORKING, BranchState.MODIFIED, false); + this.artifactType = new ArtifactType(artifactType.getGuid(), artifactType.getName(), false); + this.artId = artId; + } + + @Override + public int getArtId() { + return artId; + } + + @Override + public Branch getBranch() { + return branch; + } + + @Override + public ArtifactType getArtifactType() { + return artifactType; + } + + @Override + public Object getFullArtifact() throws OseeCoreException { + return null; + } + +} diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/exp/AccessCollector.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/exp/AccessCollector.java deleted file mode 100644 index 21ecda833d0..00000000000 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/exp/AccessCollector.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Created on Jul 20, 2010 - * - * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE - */ -package org.eclipse.osee.framework.core.model.access.exp; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.core.model.IBasicArtifact; - -/** - * @author Jeff C. Phillips - * @param - */ -public class AccessCollector { - - private final Collection filters; - - public AccessCollector(Collection filters) { - this.filters = filters; - } - - public List getAttributeTypesToMatch(IBasicArtifact artifact, Collection toCheck, PermissionEnum permission) { - List validObjects = new ArrayList(); - AccessFilterChain chain = new AccessFilterChain(); - chain.addAll(filters); - - for (T object : toCheck) { - if (chain.doFilter(artifact, object, permission, null)) { - validObjects.add(object); - } - } - return validObjects; - } -} -- cgit v1.2.3