diff options
77 files changed, 111 insertions, 118 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF index 44112da5847..355d72c0c54 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.message.test, - org.eclipse.osee.framework.core.model.test, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.test, org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.database.init, diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java index 6f4f1b4102b..ca42aa0bd83 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java @@ -11,7 +11,7 @@ package org.eclipse.osee.client.integration.tests.suite; import org.eclipse.osee.framework.core.message.test.AllCoreMessageTestSuite; -import org.eclipse.osee.framework.core.model.test.AllCoreModelTestSuite; +import org.eclipse.osee.framework.core.model.AllCoreModelTestSuite; import org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite; import org.eclipse.osee.framework.database.test.DatabaseTestSuite; import org.eclipse.osee.framework.jdk.core.JdkCoreTestSuite; diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessControlProviderTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessControlProviderTest.java index 6e6ca09f750..61bf89c3e5f 100644 --- a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessControlProviderTest.java +++ b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessControlProviderTest.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.access.test.mocks.MockConfigurationManagement; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.IBasicArtifact; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.services.CmAccessControl; import org.eclipse.osee.framework.core.services.CmAccessControlProvider; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessProviderTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessProviderTest.java index 9ae342baf69..99dc25492de 100644 --- a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessProviderTest.java +++ b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/cm/CmAccessProviderTest.java @@ -22,7 +22,7 @@ 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.AccessModel; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF index fa271445e0f..0bb4af8b2a0 100644 --- a/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.branch.management.test Import-Package: org.eclipse.osee.framework.core.message.test.mocks, - org.eclipse.osee.framework.core.model.test.mocks, + org.eclipse.osee.framework.core.model.mocks, org.eclipse.osee.framework.core.test.mocks diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/DeletedBranchProviderTest.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/DeletedBranchProviderTest.java index be42878ea77..32fe604841f 100644 --- a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/DeletedBranchProviderTest.java +++ b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/purge/DeletedBranchProviderTest.java @@ -20,7 +20,7 @@ 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.BranchCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF index cbaa7bc0a45..7ec07581d75 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Fragment-Host: org.eclipse.osee.framework.core.dsl.integration;bundle-version="0 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit Import-Package: org.eclipse.osee.framework.core.dsl.integration, - org.eclipse.osee.framework.core.model.test.mocks, + org.eclipse.osee.framework.core.model.mocks, org.eclipse.osee.framework.jdk.core.type Export-Package: org.eclipse.osee.framework.core.dsl.integration 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 2d59a85f108..05034da9549 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 @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.ObjectRestriction; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.access.AccessDetailCollector; -import org.eclipse.osee.framework.core.model.test.mocks.MockAccessDetailCollector; +import org.eclipse.osee.framework.core.model.mocks.MockAccessDetailCollector; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Before; import org.junit.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 dccdd2541c3..394bee3b7a1 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 @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.access.AccessDetail; import org.eclipse.osee.framework.core.model.access.Scope; -import org.eclipse.osee.framework.core.model.test.mocks.MockAccessDetailCollector; +import org.eclipse.osee.framework.core.model.mocks.MockAccessDetailCollector; import org.junit.Assert; /** diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java index f2752b5afa3..4ad74310bbc 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.DefaultBasicArtifact; import org.eclipse.osee.framework.core.model.IBasicArtifact; -import org.eclipse.osee.framework.core.model.test.mocks.MockArtifact; +import org.eclipse.osee.framework.core.model.mocks.MockArtifact; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF index 0916ef65e9b..26ede330c51 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.core.message.test, org.eclipse.osee.framework.core.message.test.mocks -Import-Package: org.eclipse.osee.framework.core.model.test.mocks, +Import-Package: org.eclipse.osee.framework.core.model.mocks, org.eclipse.osee.framework.jdk.core.util diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java index d5daf0b60e5..4c2d131845e 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java @@ -12,10 +12,10 @@ package org.eclipse.osee.framework.core.message.test.data; import java.util.ArrayList; import java.util.Collection; -import org.junit.Assert; import org.eclipse.osee.framework.core.message.BranchCommitResponse; import org.eclipse.osee.framework.core.model.TransactionRecord; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java index 776f62b322a..998d5662b9a 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse; import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.TransactionRecordFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java index 46c5a62e0a9..48f511de920 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.message.internal.translation.TransactionR import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.TransactionRecordFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.translation.IDataTranslationService; import org.eclipse.osee.framework.core.translation.ITranslator; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java index ed6b3b5d54a..eef15854e39 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.message.internal.translation.TransactionC import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.TransactionRecordFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.translation.ITranslator; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java index c3762220f6f..770db72913e 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.message.internal.translation.TransactionR import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.TransactionRecordFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.translation.ITranslator; import org.junit.Assert; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF index 6df786c47a9..453a830b7ae 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.model;bundle-version="0.9.5" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit -Export-Package: org.eclipse.osee.framework.core.model.test, - org.eclipse.osee.framework.core.model.test.cache, - org.eclipse.osee.framework.core.model.test.mocks, - org.eclipse.osee.framework.core.model.test.type +Export-Package: org.eclipse.osee.framework.core.model, + org.eclipse.osee.framework.core.model.cache, + org.eclipse.osee.framework.core.model.mocks, + org.eclipse.osee.framework.core.model.type diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/AllCoreModelTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java index 56009112f98..324a50d67e1 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/AllCoreModelTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test; +package org.eclipse.osee.framework.core.model; -import org.eclipse.osee.framework.core.model.test.access.AccessTestSuite; -import org.eclipse.osee.framework.core.model.test.cache.CacheTestSuite; -import org.eclipse.osee.framework.core.model.test.fields.FieldTestSuite; -import org.eclipse.osee.framework.core.model.test.type.TypeTestSuite; +import org.eclipse.osee.framework.core.model.access.AccessTestSuite; +import org.eclipse.osee.framework.core.model.cache.CacheTestSuite; +import org.eclipse.osee.framework.core.model.fields.FieldTestSuite; +import org.eclipse.osee.framework.core.model.type.TypeTestSuite; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; import org.junit.BeforeClass; 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/access/AccessDataQueryTest.java index ea11a90e2a9..d8bc7847bab 100644 --- 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/access/AccessDataQueryTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access; +package org.eclipse.osee.framework.core.model.access; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; @@ -20,13 +20,8 @@ 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.access.Scope; -import org.eclipse.osee.framework.core.model.test.mocks.MockArtifact; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockArtifact; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Assert; import org.junit.Test; 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/access/AccessDataTest.java index 2df0d86f09c..1893de8dc87 100644 --- 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/access/AccessDataTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access; +package org.eclipse.osee.framework.core.model.access; import java.util.ArrayList; import java.util.Collection; @@ -29,9 +29,9 @@ import org.eclipse.osee.framework.core.model.IBasicArtifact; import org.eclipse.osee.framework.core.model.RelationTypeSide; import org.eclipse.osee.framework.core.model.access.AccessData; import org.eclipse.osee.framework.core.model.access.AccessDetail; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.ModelAsserts; import org.eclipse.osee.framework.core.model.access.Scope; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.test.mocks.ModelAsserts; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDetailTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDetailTest.java index a1ca22c739a..d518d4e6c6b 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDetailTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDetailTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access; +package org.eclipse.osee.framework.core.model.access; import java.util.ArrayList; import java.util.Collection; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.access.AccessDetail; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.access.Scope; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.junit.Assert; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessTestSuite.java index 2524f92c0f8..49071170c23 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessTestSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access; +package org.eclipse.osee.framework.core.model.access; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionStatusTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/PermissionStatusTest.java index f116137b992..717b749ebc1 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionStatusTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/PermissionStatusTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access; +package org.eclipse.osee.framework.core.model.access; import org.junit.Assert; import org.eclipse.osee.framework.core.model.access.PermissionStatus; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/ScopeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/ScopeTest.java index 8e492522318..83e36b01030 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/ScopeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/ScopeTest.java @@ -8,10 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access; +package org.eclipse.osee.framework.core.model.access; import junit.framework.Assert; -import org.eclipse.osee.framework.core.model.access.Scope; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/exp/AccessFilterChainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/exp/AccessFilterChainTest.java index b56509ae629..46f2cf4bbe3 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/exp/AccessFilterChainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/exp/AccessFilterChainTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.access.exp; +package org.eclipse.osee.framework.core.model.access.exp; import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AbstractOseeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java index 7850170d0e7..6bd14b3c2f8 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AbstractOseeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/ArtifactTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java index 598c053d57f..ca0e15a69b4 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/ArtifactTypeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache; import org.eclipse.osee.framework.core.model.cache.IOseeCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AttributeTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java index 2b7b2240192..140eac49551 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AttributeTypeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache; import org.eclipse.osee.framework.core.model.cache.IOseeCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/BranchCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java index 40203a90f8e..10269605a3c 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/BranchCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import java.util.ArrayList; import java.util.List; @@ -16,8 +16,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.cache.BranchCache; import org.eclipse.osee.framework.core.model.cache.IOseeCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/CacheTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/CacheTestSuite.java index d4398361dd8..d331390ec14 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/CacheTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/CacheTestSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/OseeEnumTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java index 3c65bd9796e..2bd90832d91 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/OseeEnumTypeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import java.util.ArrayList; import java.util.List; @@ -16,9 +16,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeEnumEntry; import org.eclipse.osee.framework.core.model.cache.IOseeCache; import org.eclipse.osee.framework.core.model.cache.OseeEnumTypeCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; -import org.eclipse.osee.framework.core.model.test.mocks.ModelAsserts; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.ModelAsserts; import org.eclipse.osee.framework.core.model.type.OseeEnumType; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/RelationTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java index 46ccb65db1a..bad113b91cf 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/RelationTypeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.cache; +package org.eclipse.osee.framework.core.model.cache; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.IOseeCache; import org.eclipse.osee.framework.core.model.cache.RelationTypeCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.RelationType; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactSuperTypeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactSuperTypeFieldTest.java index efd2f3906b3..c908db57923 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactSuperTypeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactSuperTypeFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Arrays; @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException; import org.eclipse.osee.framework.core.model.internal.fields.ArtifactSuperTypeField; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactTypeAttributesFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactTypeAttributesFieldTest.java index 66432874cba..d16e587ce4c 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactTypeAttributesFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactTypeAttributesFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.Arrays; import java.util.Collection; @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.internal.fields.ArtifactTypeAttributesField; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/AssociatedArtifactFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/AssociatedArtifactFieldTest.java index b0e36e8e014..4a955eb6ea4 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/AssociatedArtifactFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/AssociatedArtifactFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.internal.fields.AssociatedArtifactField; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BaseOseeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java index 5e860cda74e..2b54b168b0b 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BaseOseeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BranchAliasesFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BranchAliasesFieldTest.java index 31784c87773..6e4dd533f09 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BranchAliasesFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BranchAliasesFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/CollectionFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/CollectionFieldTest.java index fa5ccf30416..d7e938c030a 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/CollectionFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/CollectionFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/EnumEntryFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/EnumEntryFieldTest.java index ef79533628f..abadc072253 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/EnumEntryFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/EnumEntryFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Arrays; @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeEnumEntry; import org.eclipse.osee.framework.core.model.internal.fields.EnumEntryField; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldGetSetTestData.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldGetSetTestData.java index ab910074e30..f69f8dbb021 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldGetSetTestData.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldGetSetTestData.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestSuite.java index 15324fec4b6..e1aa1d6cf36 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestUtil.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestUtil.java index 13422fe3d52..8d33aed5f86 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestUtil.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestUtil.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldMainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java index ce2fd8c42f9..250d766cc54 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldMainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldTestData.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldTestData.java index fb759583363..24f38e1c323 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldTestData.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldTestData.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/UniqueIdFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java index 179f064fa2c..b3867476d20 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/UniqueIdFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.fields; +package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockAbstractOseeType.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java index 519ba532dad..0bb025c08c2 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockAbstractOseeType.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import org.eclipse.osee.framework.core.model.AbstractOseeType; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockAccessDetailCollector.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAccessDetailCollector.java index 15179f5ed04..e05e0bc73bc 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockAccessDetailCollector.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAccessDetailCollector.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import org.eclipse.osee.framework.core.model.access.AccessDetail; import org.eclipse.osee.framework.core.model.access.AccessDetailCollector; 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/mocks/MockArtifact.java index 916d30ecae3..5818d54fb5d 100644 --- 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/mocks/MockArtifact.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java index 2e9b2ab2772..19c2db46b65 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import java.util.Date; import org.eclipse.osee.framework.core.data.IAccessContextId; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeCachingServiceProvider.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeCachingServiceProvider.java index c19982ccbec..2e9d21843d3 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeCachingServiceProvider.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeCachingServiceProvider.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.core.services.IOseeCachingServiceProvider; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeDataAccessor.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeDataAccessor.java index ea49c07f43e..f85987cb525 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeDataAccessor.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeDataAccessor.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import java.util.Collection; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeTransactionDataAccessor.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java index 1ebba647548..55e0b8f26a0 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeTransactionDataAccessor.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import java.util.Collection; import org.eclipse.osee.framework.core.enums.TransactionVersion; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/ModelAsserts.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java index b40dba497ed..692c54d4780 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/ModelAsserts.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java @@ -9,7 +9,7 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.mocks; +package org.eclipse.osee.framework.core.model.mocks; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AbstractOseeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java index 0d3e1002ef8..45f908f78a3 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AbstractOseeTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import org.junit.Assert; import org.eclipse.osee.framework.core.enums.StorageState; @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.AbstractOseeType; import org.eclipse.osee.framework.core.model.IOseeStorable; -import org.eclipse.osee.framework.core.model.test.mocks.ModelAsserts; +import org.eclipse.osee.framework.core.model.mocks.ModelAsserts; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/ArtifactTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java index 70f1d9809c7..4bc641074ac 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/ArtifactTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AttributeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AttributeTypeTest.java index c2da0accfb1..9950a8b3e60 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AttributeTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AttributeTypeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import org.junit.Ignore; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/BaseOseeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java index d6ec4a9c19d..3e309214405 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/BaseOseeTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java @@ -8,11 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import java.util.ArrayList; import java.util.Collection; -import org.eclipse.osee.framework.core.model.test.mocks.MockAbstractOseeType; +import org.eclipse.osee.framework.core.model.mocks.MockAbstractOseeType; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/BranchTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BranchTest.java index f93e144da4c..b940623830f 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/BranchTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BranchTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import org.junit.Ignore; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/OseeEnumTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java index 4fd2d17eacd..b4c3a7a9603 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/OseeEnumTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/RelationTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/RelationTypeTest.java index 5d042bb8b28..91c5cb4057c 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/RelationTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/RelationTypeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import org.junit.Ignore; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/TransactionRecordTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java index 8e70db31eba..4982c216712 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/TransactionRecordTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java @@ -8,14 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.model.TransactionRecord; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Assert; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/TypeTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TypeTestSuite.java index 9f79fb69ab1..d98c9c9be72 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/TypeTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TypeTestSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.model.test.type; +package org.eclipse.osee.framework.core.model.type; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF index c5b469a451e..5a6418c7b8b 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.core.server.test, org.eclipse.osee.framework.core.server.test.mocks -Import-Package: org.eclipse.osee.framework.core.model.test.cache, - org.eclipse.osee.framework.core.model.test.mocks, - org.eclipse.osee.framework.core.model.test.type +Import-Package: org.eclipse.osee.framework.core.model.cache, + org.eclipse.osee.framework.core.model.mocks, + org.eclipse.osee.framework.core.model.type diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java index f9c749ca766..813bf144635 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java @@ -16,9 +16,9 @@ import java.util.List; import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache; +import org.eclipse.osee.framework.core.model.cache.AbstractOseeCacheTest; import org.eclipse.osee.framework.core.model.cache.IOseeCache; -import org.eclipse.osee.framework.core.model.test.cache.AbstractOseeCacheTest; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.server.internal.session.Session; import org.eclipse.osee.framework.core.server.internal.session.SessionCache; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java index c1b30ea1d7f..593820ee934 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.server.test.internal.session; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.server.IAuthenticationManager; import org.eclipse.osee.framework.core.server.internal.session.ISessionQuery; import org.eclipse.osee.framework.core.server.internal.session.Session; diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java index b726070f0ed..ca2b04762af 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import org.eclipse.osee.framework.core.enums.StorageState; -import org.eclipse.osee.framework.core.model.test.mocks.ModelAsserts; -import org.eclipse.osee.framework.core.model.test.type.AbstractOseeTypeTest; +import org.eclipse.osee.framework.core.model.mocks.ModelAsserts; +import org.eclipse.osee.framework.core.model.type.AbstractOseeTypeTest; import org.eclipse.osee.framework.core.server.internal.session.Session; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF index 93ef3ea7a47..9430e83f57a 100644 --- a/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Import-Package: org.eclipse.osee.framework.branch.management.test, org.eclipse.osee.framework.core.datastore.test, org.eclipse.osee.framework.core.dsl.integration, org.eclipse.osee.framework.core.message.test, - org.eclipse.osee.framework.core.model.test, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.server.test, org.eclipse.osee.framework.core.test, org.eclipse.osee.framework.database.test, diff --git a/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java b/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java index ee367ec0f94..08a2c198057 100644 --- a/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java +++ b/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java @@ -14,7 +14,7 @@ import org.eclipse.osee.framework.branch.management.test.BranchManagementTestSui import org.eclipse.osee.framework.core.datastore.test.AllCoreDatastoreTestSuite; import org.eclipse.osee.framework.core.dsl.integration.AllDslIntegrationTestSuite; import org.eclipse.osee.framework.core.message.test.AllCoreMessageTestSuite; -import org.eclipse.osee.framework.core.model.test.AllCoreModelTestSuite; +import org.eclipse.osee.framework.core.model.AllCoreModelTestSuite; import org.eclipse.osee.framework.core.server.test.CoreServerTestSuite; import org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite; import org.eclipse.osee.framework.database.test.DatabaseTestSuite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF index 8c2c6069026..ec64248373a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Export-Package: org.eclipse.osee.framework.skynet.core, Import-Package: org.apache.commons.lang;version="2.4.0", org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.enums, - org.eclipse.osee.framework.core.model.test.mocks, + org.eclipse.osee.framework.core.model.mocks, org.eclipse.osee.framework.core.test.mocks, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.skynet.core.event, diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java index e2d66e89079..b52087c4d47 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java @@ -14,12 +14,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Random; - import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java index 27d0cb6c5e5..6205cc0660f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java index 54eda19cb65..d80990951c0 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java @@ -17,7 +17,7 @@ import java.util.List; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; +import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; import org.eclipse.osee.framework.skynet.core.relation.RelationFilterUtil.RelationMatcher; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java index b54df44355a..9cc9cdfbfaf 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.RelationTypeSide; import org.eclipse.osee.framework.core.model.cache.RelationTypeCache; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidRelationReorder; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.type.Pair; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java index 5dfb35bd39e..5083de05a1b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.cache.RelationTypeCache; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidRelationReorder; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.type.Pair; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF index 5d1d2b45203..c46e2aba3f0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Import-Package: com.lowagie.text.pdf;version="2.1.7", com.lowagie.text.rtf;version="2.1.7", org.eclipse.osee.framework.access, org.eclipse.osee.framework.core.enums, - org.eclipse.osee.framework.core.model.test.mocks, + org.eclipse.osee.framework.core.model.mocks, org.eclipse.osee.framework.core.test.mocks, org.eclipse.osee.framework.jdk.core.util.windows, org.eclipse.osee.framework.skynet.core.util, diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java index 5e3444b6534..646f9fff9a4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache; import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache; import org.eclipse.osee.framework.core.model.cache.RelationTypeCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java index 6634ec67f2b..dc89865db67 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.BranchFactory; import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache; import org.eclipse.osee.framework.core.model.cache.BranchCache; -import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; +import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.junit.Test; |