Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-11-08 02:59:08 +0000
committerRoberto E. Escobar2012-11-08 02:59:08 +0000
commit5b37e94d01622f3afbd339393aa78e0ae314ad6d (patch)
tree63a36824d6237a15c29c23b377b7efd5fc8e27a3 /plugins/org.eclipse.osee.framework.skynet.core.test
parentc04ce11db040bddd9eeda4790ba0065b26174c4e (diff)
downloadorg.eclipse.osee-5b37e94d01622f3afbd339393aa78e0ae314ad6d.tar.gz
org.eclipse.osee-5b37e94d01622f3afbd339393aa78e0ae314ad6d.tar.xz
org.eclipse.osee-5b37e94d01622f3afbd339393aa78e0ae314ad6d.zip
feature[ats_TL5SF]: Add skynet core junit tests to maven
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF23
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml30
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/AllSkynetCoreJunitTestSuite.java34
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java80
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java37
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventTestSuite.java26
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java92
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ExcelArtifactExtractorTest.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/support/ArtifactExtractorTests/ExcelArtifactExtractorTest.xml)0
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/NativeDocumentExtractorTest.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/support/ArtifactExtractorTests/NativeDocumentExtractorTest.xml)0
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java84
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/InternalEventTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventTestSuite.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/LinkingTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTestSuite.java)10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java72
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AbstractPurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AbstractPurgeTest.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AbstractTransactionEventTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java)11
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactCacheQueryTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQueryTest.java)7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventFiltersTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactEventFiltersTest.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventLoopbackTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventLoopbackTest.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java)10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactGetLastModifiedTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java)10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactLoaderTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactLoaderTest.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactPurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifactsTest.java)9
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactQueryTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestDemo.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactSetAttributeValuesTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java)9
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTest.java)54
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactTypeInheritanceTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeInheritanceTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AttributePurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AttributePurgeTest.java)8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventFiltersTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchEventFiltersTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventLoopbackTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventLoopbackTest.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventTest.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManagerTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchPurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchPurgeTest.java)6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchStateTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java)8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ChangeManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ConflictDeletionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java)14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ConflictTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CreateBranchOperationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/branch/CreateBranchOperationTest.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CrossBranchRelationLinkTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchRelationLinkTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CsvArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/DuplicateHridTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/FrameworkEventToRemoteEventListenerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/systems/FrameworkEventToRemoteEventListenerTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/LoadDeletedRelationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/LoadDeletedRelationTest.java)6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/NativeArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/OseeEnumerationValidationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/validation/OseeEnumerationValidationTest.java)14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/PurgeTransactionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java)7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationCacheTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationDeletionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationDeletionTest.java)6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationFilterUtilTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationOrderMergeUtilityTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtilityTest.java)6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationOrderingTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java)8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RoughArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/SkynetTransactionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionEventLocalTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventLocalTest.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionEventRemoteTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventRemoteTest.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManagerTest.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/UserManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/WordMlLinkHandlerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandlerTest.java)8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/WordOutlineTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineTest.java)9
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/XSkynetCoreIntegrationTestSuite.java82
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/Asserts.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/Asserts.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/ConflictTestManager.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java)67
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/FrameworkTestUtil.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/MockTransactionEventListener.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockTransactionEventListener.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNameNumberAndContent.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameNumberAndContent.xml)0
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNameWithNumber.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameWithNumber.xml)0
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNumberEmbeddedInTheContent.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/numberEmbeddedInTheContent.xml)0
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/production/ArtifactQueryPerformanceTests.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryPerformanceTests.java)14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/production/ArtifactQueryTestProduction.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestProduction.java)14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionTestSuite.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/WordTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/branch/BranchSuite.java)13
78 files changed, 569 insertions, 471 deletions
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 5af02d7a500..8b493589329 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
@@ -5,27 +5,12 @@ Bundle-SymbolicName: org.eclipse.osee.framework.skynet.core.test;singleton:=true
Bundle-Version: 0.11.0.qualifier
Fragment-Host: org.eclipse.osee.framework.skynet.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit
+Require-Bundle: org.junit,
+ org.mockito;bundle-version="1.9.0",
+ org.hamcrest.core
Export-Package: org.eclipse.osee.framework.skynet.core,
- org.eclipse.osee.framework.skynet.core.artifact,
- org.eclipse.osee.framework.skynet.core.artifact.search,
- org.eclipse.osee.framework.skynet.core.event,
- org.eclipse.osee.framework.skynet.core.event.filter,
- org.eclipse.osee.framework.skynet.core.event.model,
- org.eclipse.osee.framework.skynet.core.importing,
- org.eclipse.osee.framework.skynet.core.importing.parsers,
- org.eclipse.osee.framework.skynet.core.linking,
org.eclipse.osee.framework.skynet.core.mocks,
- org.eclipse.osee.framework.skynet.core.relation,
- org.eclipse.osee.framework.skynet.core.relation.order,
- org.eclipse.osee.framework.skynet.core.relation.sorters,
- org.eclipse.osee.framework.skynet.core.revision,
- org.eclipse.osee.framework.skynet.core.rule,
- org.eclipse.osee.framework.skynet.core.transaction,
- org.eclipse.osee.framework.skynet.core.util,
- org.eclipse.osee.framework.skynet.core.utility,
- org.eclipse.osee.framework.skynet.core.validation,
- org.eclipse.osee.framework.skynet.core.word
+ org.eclipse.osee.framework.skynet.core.rule
Import-Package: org.apache.commons.lang;version="2.4.0",
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.enums,
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml
new file mode 100644
index 00000000000..aa9bcdbf0b4
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.osee</groupId>
+ <artifactId>org.eclipse.osee.client.parent</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.osee.framework.skynet.core.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>OSEE Skynet Test (Incubation)</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testSuite>org.eclipse.osee.framework.skynet.core.test</testSuite>
+ <testClass>org.eclipse.osee.framework.skynet.core.AllSkynetCoreJunitTestSuite</testClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/AllSkynetCoreJunitTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/AllSkynetCoreJunitTestSuite.java
new file mode 100644
index 00000000000..d8f0e3f7ee1
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/AllSkynetCoreJunitTestSuite.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.skynet.core;
+
+import org.eclipse.osee.framework.skynet.core.event.EventTestSuite;
+import org.eclipse.osee.framework.skynet.core.importing.ImportingSuite;
+import org.eclipse.osee.framework.skynet.core.internal.event.InternalEventTestSuite;
+import org.eclipse.osee.framework.skynet.core.linking.LinkingTestSuite;
+import org.eclipse.osee.framework.skynet.core.relation.RelationTestSuite;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionTestSuite;
+import org.eclipse.osee.framework.skynet.core.word.WordTestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ EventTestSuite.class,
+ ImportingSuite.class,
+ InternalEventTestSuite.class,
+ LinkingTestSuite.class,
+ RelationTestSuite.class,
+ TransactionTestSuite.class,
+ WordTestSuite.class})
+public class AllSkynetCoreJunitTestSuite {
+ //
+}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java
index e08c4d879fb..165ecb74cf1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java
@@ -13,90 +13,14 @@ package org.eclipse.osee.framework.skynet.core;
import static org.junit.Assert.assertTrue;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQueryTest;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTestSuite;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeInheritanceTest;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact_getLastModified;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact_setAttributeValues;
-import org.eclipse.osee.framework.skynet.core.artifact.AttributePurgeTest;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchPurgeTest;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchStateTest;
-import org.eclipse.osee.framework.skynet.core.artifact.ChangeManagerTest;
-import org.eclipse.osee.framework.skynet.core.artifact.DuplicateHridTest;
-import org.eclipse.osee.framework.skynet.core.artifact.NativeArtifactTest;
-import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifactsTest;
-import org.eclipse.osee.framework.skynet.core.artifact.PurgeTransactionTest;
-import org.eclipse.osee.framework.skynet.core.artifact.RelationDeletionTest;
-import org.eclipse.osee.framework.skynet.core.artifact.RelationOrderingTest;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactLoaderTest;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryTestDemo;
-import org.eclipse.osee.framework.skynet.core.branch.BranchSuite;
-import org.eclipse.osee.framework.skynet.core.event.filter.ArtifactEventFiltersTest;
-import org.eclipse.osee.framework.skynet.core.event.filter.BranchEventFiltersTest;
-import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEventLoopbackTest;
-import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEventTest;
-import org.eclipse.osee.framework.skynet.core.event.model.BranchEventLoopbackTest;
-import org.eclipse.osee.framework.skynet.core.event.model.BranchEventTest;
-import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifactTest;
-import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidRelationTest;
-import org.eclipse.osee.framework.skynet.core.event.model.EventChangeTypeBasicGuidArtifactTest;
-import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventLocalTest;
-import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventRemoteTest;
-import org.eclipse.osee.framework.skynet.core.event.systems.FrameworkEventToRemoteEventListenerTest;
-import org.eclipse.osee.framework.skynet.core.importing.ImportingSuite;
-import org.eclipse.osee.framework.skynet.core.importing.parsers.ParsersSuite;
-import org.eclipse.osee.framework.skynet.core.internal.event.EventTestSuite;
-import org.eclipse.osee.framework.skynet.core.relation.RelationTestSuite;
-import org.eclipse.osee.framework.skynet.core.revision.ConflictTest;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionTestSuite;
-import org.eclipse.osee.framework.skynet.core.utility.CsvArtifactTest;
-import org.eclipse.osee.framework.skynet.core.word.UpdateBookmarkIdTest;
+import org.eclipse.osee.framework.skynet.core.test.integration.XSkynetCoreIntegrationTestSuite;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({
- EventTestSuite.class,
- FrameworkEventToRemoteEventListenerTest.class,
- BranchSuite.class,
- UserManagerTest.class,
- AttributePurgeTest.class,
- UpdateBookmarkIdTest.class,
- ArtifactEventFiltersTest.class,
- BranchEventFiltersTest.class,
- BranchEventTest.class,
- BranchEventLoopbackTest.class,
- ArtifactLoaderTest.class,
- ArtifactEventTest.class,
- ArtifactEventLoopbackTest.class,
- TransactionEventLocalTest.class,
- TransactionEventRemoteTest.class,
- EventBasicGuidArtifactTest.class,
- EventBasicGuidRelationTest.class,
- EventChangeTypeBasicGuidArtifactTest.class,
- ArtifactQueryTestDemo.class,
- TransactionTestSuite.class,
- ArtifactTestSuite.class,
- RelationTestSuite.class,
- ArtifactTypeInheritanceTest.class,
- PurgeArtifactsTest.class,
- BranchPurgeTest.class,
- PurgeTransactionTest.class,
- Artifact_setAttributeValues.class,
- Artifact_getLastModified.class,
- CsvArtifactTest.class,
- NativeArtifactTest.class,
- ConflictTest.class,
- ChangeManagerTest.class,
- RelationDeletionTest.class,
- ArtifactCacheQueryTest.class,
- BranchStateTest.class,
- DuplicateHridTest.class,
- RelationOrderingTest.class,
- ImportingSuite.class,
- ParsersSuite.class})
+@Suite.SuiteClasses({AllSkynetCoreJunitTestSuite.class, XSkynetCoreIntegrationTestSuite.class})
/**
* @author Donald G. Dunne
*/
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java
index aa306542a92..3f7472805c5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.framework.skynet.core;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryPerformanceTests;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryTestProduction;
+import org.eclipse.osee.framework.skynet.core.test.production.ArtifactQueryPerformanceTests;
+import org.eclipse.osee.framework.skynet.core.test.production.ArtifactQueryTestProduction;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java
deleted file mode 100644
index 2caee321136..00000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
-
-import java.util.Collection;
-import java.util.logging.Level;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
-
-/**
- * This test should be run as the last test of a suite to make sure that the ArtifactCache has no dirty artifacts.
- *
- * @author Donald G. Dunne
- */
-public class DirtyArtifactCacheTest {
-
- @org.junit.Test
- public void testArtifactCacheNotDirty() {
- final Collection<Artifact> dirtyArtifacts = ArtifactCache.getDirtyArtifacts();
- for (Artifact artifact : dirtyArtifacts) {
- OseeLog.logf(getClass(), Level.WARNING, "Name: %s Type: %s ", artifact.getName(),
- artifact.getArtifactTypeName());
- }
- Assert.assertTrue(String.format(
- "After all tests are run, there should be no dirty artifacts in Artifact Cache; \n Found [%s]",
- Artifacts.getNames(dirtyArtifacts)), dirtyArtifacts.isEmpty());
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java
index 33fb1fad1dd..29ec71e7d2d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java
@@ -8,13 +8,15 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.event;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.core.model.event.IBasicGuidArtifact;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.model.EventModType;
import org.junit.Assert;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java
index aa7ad04b0e2..016412ec56a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java
@@ -8,12 +8,13 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.event;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.junit.Assert;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java
index 7dfa70b1fae..3d5efd913c4 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java
@@ -8,11 +8,13 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.event;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.model.EventChangeTypeBasicGuidArtifact;
import org.junit.Assert;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventTestSuite.java
new file mode 100644
index 00000000000..1100c29c162
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventTestSuite.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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.skynet.core.event;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ EventBasicGuidArtifactTest.class,
+ EventBasicGuidArtifactTest.class,
+ EventChangeTypeBasicGuidArtifactTest.class})
+/**
+ * @author Roberto E. Escobar
+ */
+public class EventTestSuite {
+ // Test Suite
+}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java
index c53724f2e70..9f7b9733903 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java
@@ -18,8 +18,9 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector;
@@ -28,7 +29,7 @@ import org.eclipse.osee.framework.skynet.core.importing.parsers.IArtifactExtract
import org.eclipse.osee.framework.skynet.core.importing.parsers.NativeDocumentExtractor;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -36,25 +37,17 @@ import org.junit.runners.Parameterized.Parameters;
/**
* @author Roberto E. Escobar
*/
+@Ignore
@RunWith(Parameterized.class)
public class ArtifactExtractorTest {
- private static final String TEST_DATA_PATH = "support/ArtifactExtractorTests/";
private final IArtifactExtractor extractor;
private final String testDataFileName;
private final PropertyStore propertyStore;
- private static String BASE_DATA_PATH;
public ArtifactExtractorTest(IArtifactExtractor extractor, String testDataFileName) {
this.extractor = extractor;
this.testDataFileName = testDataFileName;
this.propertyStore = new PropertyStore();
-
- }
-
- @BeforeClass
- public static void testInitialize() throws Exception {
- BASE_DATA_PATH = Lib.getBasePath(ArtifactExtractorTest.class) + "../";
- BASE_DATA_PATH += TEST_DATA_PATH;
}
@Before
@@ -62,17 +55,10 @@ public class ArtifactExtractorTest {
Assert.assertTrue(Strings.isValid(testDataFileName));
InputStream inputStream = null;
try {
- URL url = Lib.getUrlFromString(BASE_DATA_PATH + testDataFileName);
- inputStream = url.openStream();
+ inputStream = getClass().getResourceAsStream(testDataFileName);
propertyStore.load(inputStream);
} finally {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException ex) {
- Assert.assertTrue("Error closing resource: " + testDataFileName, false);
- }
- }
+ Lib.close(inputStream);
}
}
@@ -174,15 +160,15 @@ public class ArtifactExtractorTest {
RoughArtifactCollector expectedCollector = new RoughArtifactCollector(parent);
for (ParseTestData testData : getParseTestData()) {
- RoughArtifactUtil.resetCollector(actualCollector);
- RoughArtifactUtil.resetCollector(expectedCollector);
+ resetCollector(actualCollector);
+ resetCollector(expectedCollector);
- URL url = Lib.getUrlFromString(BASE_DATA_PATH + testData.getSourceData());
+ URL url = getClass().getResource(testData.getSourceData());
extractor.process(null, url.toURI(), actualCollector);
- URL expectedData = Lib.getUrlFromString(BASE_DATA_PATH + testData.getExpectedData());
- RoughArtifactUtil.loadDataFrom(expectedData, expectedCollector);
- RoughArtifactUtil.checkCollectors(expectedCollector, actualCollector);
+ URL expectedData = getClass().getResource(testData.getExpectedData());
+ loadDataFrom(expectedData, expectedCollector);
+ checkCollectors(expectedCollector, actualCollector);
}
}
@@ -255,4 +241,58 @@ public class ArtifactExtractorTest {
return String.format("msg:[%s] file:[%s] isAccepted:[%s]", getMessage(), getFile(), getExpected());
}
}
+
+ public static void loadDataFrom(URL expecetedData, RoughArtifactCollector collector) {
+ // TODO: convert expected to actual Objects;
+ // collector.addRoughArtifact();
+ // collector.addRoughRelation();
+ }
+
+ public static void resetCollector(RoughArtifactCollector collector) {
+ collector.reset();
+ Assert.assertTrue(collector.getRoughArtifacts().isEmpty());
+ Assert.assertTrue(collector.getRoughRelations().isEmpty());
+ }
+
+ public static void checkCollectors(RoughArtifactCollector expected, RoughArtifactCollector actual) {
+ Assert.assertEquals(expected.getParentRoughArtifact(), actual.getParentRoughArtifact());
+
+ List<RoughArtifact> expectedItems = expected.getRoughArtifacts();
+ List<RoughArtifact> actualItems = actual.getRoughArtifacts();
+ Assert.assertEquals(expectedItems.size(), actualItems.size());
+ int size = expectedItems.size();
+ for (int index = 0; index < size; index++) {
+ checkRoughArtifact(expectedItems.get(index), actualItems.get(index));
+ }
+
+ List<RoughRelation> expectedRelItems = expected.getRoughRelations();
+ List<RoughRelation> actualRelItems = actual.getRoughRelations();
+ Assert.assertEquals(expectedRelItems.size(), actualRelItems.size());
+ size = expectedRelItems.size();
+ for (int index = 0; index < size; index++) {
+ checkRoughRelation(expectedRelItems.get(index), actualRelItems.get(index));
+ }
+ }
+
+ public static void checkRoughRelation(RoughRelation expected, RoughRelation actual) {
+ Assert.assertTrue(GUID.isValid(actual.getAartifactGuid()));
+ Assert.assertTrue(GUID.isValid(actual.getBartifactGuid()));
+ Assert.assertEquals(expected.getRelationTypeName(), actual.getRelationTypeName());
+ Assert.assertEquals(expected.getRationale(), actual.getRationale());
+ Assert.assertEquals(expected.getAartifactGuid(), actual.getAartifactGuid());
+ Assert.assertEquals(expected.getBartifactGuid(), actual.getBartifactGuid());
+ }
+
+ public static void checkRoughArtifact(RoughArtifact expected, RoughArtifact actual) {
+ // Randomly generated - just check the format
+ Assert.assertTrue(GUID.isValid(actual.getGuid()));
+ Assert.assertTrue(HumanReadableId.isValid(actual.getHumanReadableId()));
+ Assert.assertEquals(expected.getName(), actual.getName());
+ Assert.assertEquals(expected.getPrimaryArtifactType(), actual.getPrimaryArtifactType());
+ Assert.assertEquals(expected.getRoughArtifactKind(), actual.getRoughArtifactKind());
+ Assert.assertEquals(expected.getRoughParent(), actual.getRoughParent());
+
+ Assert.assertEquals(expected.getAttributes(), actual.getAttributes());
+ Assert.assertEquals(expected.getURIAttributes(), actual.getURIAttributes());
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/support/ArtifactExtractorTests/ExcelArtifactExtractorTest.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ExcelArtifactExtractorTest.xml
index 02ef253bb12..02ef253bb12 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/support/ArtifactExtractorTests/ExcelArtifactExtractorTest.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ExcelArtifactExtractorTest.xml
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java
index 98f1da45f2f..2582c4c1806 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java
@@ -10,11 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.importing;
+import org.eclipse.osee.framework.skynet.core.importing.parsers.ParsersSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({ReqNumberingTest.class, RoughArtifactTest.class})
+@Suite.SuiteClasses({ParsersSuite.class, ArtifactExtractorTest.class, ReqNumberingTest.class})
/**
* @author Karol M. Wilk
*/
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/support/ArtifactExtractorTests/NativeDocumentExtractorTest.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/NativeDocumentExtractorTest.xml
index 71d0c5263e9..71d0c5263e9 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/support/ArtifactExtractorTests/NativeDocumentExtractorTest.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/NativeDocumentExtractorTest.xml
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java
deleted file mode 100644
index 328c69cb4f6..00000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java
+++ /dev/null
@@ -1,84 +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.skynet.core.importing;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
-import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector;
-import org.junit.Assert;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class RoughArtifactUtil {
-
- private RoughArtifactUtil() {
- super();
- }
-
- public static void loadDataFrom(URL expecetedData, RoughArtifactCollector collector) {
- // TODO: convert expected to actual Objects;
- // collector.addRoughArtifact();
- // collector.addRoughRelation();
- }
-
- public static void resetCollector(RoughArtifactCollector collector) {
- collector.reset();
- Assert.assertTrue(collector.getRoughArtifacts().isEmpty());
- Assert.assertTrue(collector.getRoughRelations().isEmpty());
- }
-
- public static void checkCollectors(RoughArtifactCollector expected, RoughArtifactCollector actual) {
- Assert.assertEquals(expected.getParentRoughArtifact(), actual.getParentRoughArtifact());
-
- List<RoughArtifact> expectedItems = expected.getRoughArtifacts();
- List<RoughArtifact> actualItems = actual.getRoughArtifacts();
- Assert.assertEquals(expectedItems.size(), actualItems.size());
- int size = expectedItems.size();
- for (int index = 0; index < size; index++) {
- checkRoughArtifact(expectedItems.get(index), actualItems.get(index));
- }
-
- List<RoughRelation> expectedRelItems = expected.getRoughRelations();
- List<RoughRelation> actualRelItems = actual.getRoughRelations();
- Assert.assertEquals(expectedRelItems.size(), actualRelItems.size());
- size = expectedRelItems.size();
- for (int index = 0; index < size; index++) {
- checkRoughRelation(expectedRelItems.get(index), actualRelItems.get(index));
- }
- }
-
- public static void checkRoughRelation(RoughRelation expected, RoughRelation actual) {
- Assert.assertTrue(GUID.isValid(actual.getAartifactGuid()));
- Assert.assertTrue(GUID.isValid(actual.getBartifactGuid()));
- Assert.assertEquals(expected.getRelationTypeName(), actual.getRelationTypeName());
- Assert.assertEquals(expected.getRationale(), actual.getRationale());
- Assert.assertEquals(expected.getAartifactGuid(), actual.getAartifactGuid());
- Assert.assertEquals(expected.getBartifactGuid(), actual.getBartifactGuid());
- }
-
- public static void checkRoughArtifact(RoughArtifact expected, RoughArtifact actual) {
- // Randomly generated - just check the format
- Assert.assertTrue(GUID.isValid(actual.getGuid()));
- Assert.assertTrue(HumanReadableId.isValid(actual.getHumanReadableId()));
- Assert.assertEquals(expected.getName(), actual.getName());
- Assert.assertEquals(expected.getPrimaryArtifactType(), actual.getPrimaryArtifactType());
- Assert.assertEquals(expected.getRoughArtifactKind(), actual.getRoughArtifactKind());
- Assert.assertEquals(expected.getRoughParent(), actual.getRoughParent());
-
- Assert.assertEquals(expected.getAttributes(), actual.getAttributes());
- Assert.assertEquals(expected.getURIAttributes(), actual.getURIAttributes());
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java
index 83a0e6f2813..705ffd6f2ba 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java
@@ -15,10 +15,9 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
- WordMLExtractorDelegateTableOfContentsTest.class,
- WordOutlineTest.class,
OutlineResolutionAndNumberTest.class,
- RoughArtifactMetaDataTest.class})
+ RoughArtifactMetaDataTest.class,
+ WordMLExtractorDelegateTableOfContentsTest.class})
public class ParsersSuite {
// do nothing
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/InternalEventTestSuite.java
index 7f5856b3e5d..aa2f690573a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/InternalEventTestSuite.java
@@ -14,10 +14,10 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({EventHandlersTest.class, EventListenerRegistryTest.class,})
+@Suite.SuiteClasses({EventHandlersTest.class, EventListenerRegistryTest.class})
/**
* @author Roberto E. Escobar
*/
-public class EventTestSuite {
+public class InternalEventTestSuite {
// Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/LinkingTestSuite.java
index 983d25197fb..62e2c1d9002 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/LinkingTestSuite.java
@@ -8,18 +8,16 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.linking;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({BranchManagerTest.class})
+@Suite.SuiteClasses({OseeLinkParserTest.class})
/**
* @author Roberto E. Escobar
- *
*/
-public class ArtifactTestSuite {
- // do nothing
+public class LinkingTestSuite {
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java
index 7516c6b8813..55e6ef13f42 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java
@@ -16,17 +16,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({
- RelationOrderTestSuite.class,
- RelationSorterTestSuite.class,
-
- CrossBranchRelationLinkTest.class,
- LoadDeletedRelationTest.class,
- RelationCacheTest.class,
- RelationFilterUtilTest.class,
- RelationTypeSideSorterTest.class
-
-})
+@Suite.SuiteClasses({RelationOrderTestSuite.class, RelationSorterTestSuite.class, RelationTypeSideSorterTest.class})
/**
* @author Roberto E. Escobar
*/
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java
index a5725166de4..3282f507dc2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java
@@ -17,11 +17,8 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({
RelationOrderDataTest.class,
RelationOrderMergerTest.class,
- RelationOrderMergeUtilityTest.class,
RelationOrderParserTest.class,
- RelationSorterProviderTest.class
-
-})
+ RelationSorterProviderTest.class})
/**
* @author Roberto E. Escobar
*/
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java
deleted file mode 100644
index b93721477e1..00000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java
+++ /dev/null
@@ -1,72 +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.skynet.core.revision;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.skynet.core.revision.ConflictTestManager.AttributeValue;
-
-class ConflictDefinition {
- final Collection<AttributeValue> values = new HashSet<AttributeValue>();
- final Collection<AttributeValue> newAttributes = new HashSet<AttributeValue>();
- IArtifactType artifactType;
- boolean sourceDelete;
- boolean destDelete;
- int rootArtifact;
- int queryNumber;
- int numConflicts = 0;
- boolean sourceModified = false;
- boolean destModified = false;
-
- protected void setValues(IArtifactType artifactType, boolean sourceDelete, boolean destDelete, int rootArtifact, int queryNumber) {
- this.artifactType = artifactType;
- this.sourceDelete = sourceDelete;
- this.destDelete = destDelete;
- this.rootArtifact = rootArtifact;
- this.queryNumber = queryNumber;
- }
-
- protected boolean destinationDeleted(ConflictDefinition[] conflictDefs) {
- if (rootArtifact == 0) {
- return destDelete;
- }
- return destDelete || conflictDefs[rootArtifact].destinationDeleted(conflictDefs);
- }
-
- protected boolean sourceDeleted(ConflictDefinition[] conflictDefs) {
- if (rootArtifact == 0) {
- return sourceDelete;
- }
- return sourceDelete || conflictDefs[rootArtifact].sourceDeleted(conflictDefs);
- }
-
- protected int getNumberConflicts(ConflictDefinition[] conflictDefs) {
- if (!destinationDeleted(conflictDefs) && !sourceDeleted(conflictDefs)) {
- return numConflicts;
- } else if (destinationDeleted(conflictDefs) && sourceModified || sourceDeleted(conflictDefs) && destModified) {
- return 1;
- } else {
- return 0;
- }
- }
-
- protected boolean artifactAdded(ConflictDefinition[] conflictDefs) {
- if (!destinationDeleted(conflictDefs) && !sourceDeleted(conflictDefs)) {
- return numConflicts > 0;
- } else if (destinationDeleted(conflictDefs) && sourceModified || sourceDeleted(conflictDefs) && destModified) {
- return true;
- }
- return false;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AbstractPurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AbstractPurgeTest.java
index 04620590dbb..d8ce02a6d80 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AbstractPurgeTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AbstractPurgeTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AbstractTransactionEventTest.java
index 3e122b98e38..0b87b3e8267 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AbstractTransactionEventTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -20,12 +20,13 @@ import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionChange;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventType;
-import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
-import org.eclipse.osee.framework.skynet.core.mocks.MockTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.Asserts;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.MockTransactionEventListener;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.skynet.core.utility.PurgeTransactionOperationWithListener;
@@ -37,9 +38,9 @@ import org.junit.Before;
/**
* @author Donald G. Dunne
*/
-public abstract class TransactionEventTest {
+public abstract class AbstractTransactionEventTest {
- protected TransactionEventTest() {
+ protected AbstractTransactionEventTest() {
// Extra protection
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQueryTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactCacheQueryTest.java
index 1431042c34a..8cc338d7e55 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQueryTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactCacheQueryTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -24,6 +24,11 @@ import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQuery;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventFiltersTest.java
index 42758cfaf26..14b203e4245 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactEventFiltersTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventFiltersTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.filter;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -21,6 +21,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
+import org.eclipse.osee.framework.skynet.core.event.filter.ArtifactTypeEventFilter;
+import org.eclipse.osee.framework.skynet.core.event.filter.BranchGuidEventFilter;
+import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventLoopbackTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventLoopbackTest.java
index fecedc736e4..17dd8194f4b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventLoopbackTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventLoopbackTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventTest.java
index 442e71f502a..b81bf6caf2a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactEventTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -43,6 +43,14 @@ import org.eclipse.osee.framework.skynet.core.event.FrameworkEventUtil;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener;
+import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
+import org.eclipse.osee.framework.skynet.core.event.model.AttributeChange;
+import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidRelation;
+import org.eclipse.osee.framework.skynet.core.event.model.EventChangeTypeBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.model.EventModType;
+import org.eclipse.osee.framework.skynet.core.event.model.EventModifiedBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactGetLastModifiedTest.java
index bd9943e2dd0..aec0dbf0e46 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactGetLastModifiedTest.java
@@ -9,7 +9,7 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import java.util.Collection;
@@ -20,6 +20,10 @@ import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -28,7 +32,7 @@ import org.junit.BeforeClass;
/**
* @author Donald G. Dunne
*/
-public class Artifact_getLastModified {
+public class ArtifactGetLastModifiedTest {
@BeforeClass
public static void testCleanupPre() throws Exception {
@@ -81,7 +85,7 @@ public class Artifact_getLastModified {
private static void cleanup() throws Exception {
Collection<Artifact> arts =
- ArtifactQuery.getArtifactListFromName(Artifact_getLastModified.class.getSimpleName(),
+ ArtifactQuery.getArtifactListFromName(ArtifactGetLastModifiedTest.class.getSimpleName(),
BranchManager.getCommonBranch(), EXCLUDE_DELETED);
Operations.executeWorkAndCheckStatus(new PurgeArtifacts(arts));
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactLoaderTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactLoaderTest.java
index 9c77d987f84..a84073d7734 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactLoaderTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactLoaderTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact.search;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.junit.Assert.assertFalse;
@@ -43,9 +43,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.LoadType;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifactsTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactPurgeTest.java
index 8b4e472a123..98cd2d04d7e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifactsTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactPurgeTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Arrays;
import java.util.Collection;
@@ -18,8 +18,11 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.mocks.DbTestUtil;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
@@ -33,7 +36,7 @@ import org.eclipse.osee.support.test.util.TestUtil;
*
* @author Donald G. Dunne
*/
-public class PurgeArtifactsTest extends AbstractPurgeTest {
+public class ArtifactPurgeTest extends AbstractPurgeTest {
private static final List<String> tables = Arrays.asList("osee_attribute", "osee_artifact", "osee_relation_link",
"osee_tx_details", "osee_txs");
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestDemo.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactQueryTest.java
index 8118c2a4ae5..eb3ae5f7377 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestDemo.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactQueryTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact.search;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
import java.util.List;
@@ -22,13 +22,14 @@ import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.junit.Assert;
import org.junit.Test;
/**
* @author Donald G. Dunne
*/
-public class ArtifactQueryTestDemo {
+public class ArtifactQueryTest {
@Test
public void testGetArtifactFromGUIDDeleted() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactSetAttributeValuesTest.java
index 29392100466..ae2e95248be 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactSetAttributeValuesTest.java
@@ -9,7 +9,7 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.junit.Assert.assertTrue;
@@ -20,6 +20,9 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.Collections;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.AfterClass;
@@ -28,7 +31,7 @@ import org.junit.BeforeClass;
/**
* @author Donald G. Dunne
*/
-public class Artifact_setAttributeValues {
+public class ArtifactSetAttributeValuesTest {
private static List<String> firstSet = Arrays.asList("First", "Second", "Third");
private static List<String> addOneSet = Arrays.asList("First", "Second", "Third", "Fourth");
@@ -103,7 +106,7 @@ public class Artifact_setAttributeValues {
private static void cleanup() throws Exception {
Collection<Artifact> arts =
- ArtifactQuery.getArtifactListFromName(Artifact_setAttributeValues.class.getSimpleName(),
+ ArtifactQuery.getArtifactListFromName(ArtifactSetAttributeValuesTest.class.getSimpleName(),
DemoSawBuilds.SAW_Bld_1, EXCLUDE_DELETED);
Operations.executeWorkAndCheckStatus(new PurgeArtifacts(arts));
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactTest.java
index 1b9d519bd68..9166dee18a6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactTest.java
@@ -9,18 +9,19 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.support.test.util.DemoArtifactTypes;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
-import org.junit.AfterClass;
+import org.junit.After;
import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -28,46 +29,59 @@ import org.junit.Test;
*/
public final class ArtifactTest {
- private static SevereLoggingMonitor monitorLog;
+ private SevereLoggingMonitor monitorLog;
- @BeforeClass
- public static void setUp() throws Exception {
+ private Artifact artifactWithSpecialAttr;
+
+ @Before
+ public void setUp() throws Exception {
monitorLog = TestUtil.severeLoggingStart();
+
+ artifactWithSpecialAttr =
+ ArtifactTypeManager.addArtifact(DemoArtifactTypes.DemoCodeTeamWorkflow, DemoSawBuilds.SAW_Bld_1);
}
- @AfterClass
- public static void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
+ if (artifactWithSpecialAttr != null) {
+ artifactWithSpecialAttr.deleteAndPersist();
+ }
TestUtil.severeLoggingEnd(monitorLog);
}
@Test
public void attributeCopyAcrossRelatedBranches() throws Exception {
- Artifact artifactWithSpecialAttr =
- ArtifactTypeManager.addArtifact(DemoArtifactTypes.DemoCodeTeamWorkflow, DemoSawBuilds.SAW_Bld_1);
artifactWithSpecialAttr.setSoleAttributeValue(CoreAttributeTypes.Partition, "Navigation");
artifactWithSpecialAttr.setName("ArtifactTest-artifactWithSpecialAttr");
Artifact copiedArtifact = artifactWithSpecialAttr.duplicate(DemoSawBuilds.SAW_Bld_2);
-
- Assert.assertFalse(copiedArtifact.getAttributes(CoreAttributeTypes.Partition).isEmpty());
+ try {
+ Assert.assertFalse(copiedArtifact.getAttributes(CoreAttributeTypes.Partition).isEmpty());
+ } finally {
+ if (copiedArtifact != null) {
+ copiedArtifact.deleteAndPersist();
+ }
+ }
}
@Test
public void attributeCopyAcrossUnrelatedBranches() throws Exception {
- Artifact artifactWithSpecialAttr =
- ArtifactTypeManager.addArtifact(DemoArtifactTypes.DemoCodeTeamWorkflow, DemoSawBuilds.SAW_Bld_1);
artifactWithSpecialAttr.setSoleAttributeValue(CoreAttributeTypes.Partition, "Navigation");
artifactWithSpecialAttr.setName("ArtifactTest-artifactWithSpecialAttr");
Artifact copiedArtifact = artifactWithSpecialAttr.duplicate(CoreBranches.COMMON);
-
- Assert.assertTrue(copiedArtifact.getAttributes(CoreAttributeTypes.Partition).isEmpty());
+ try {
+ Assert.assertTrue(copiedArtifact.getAttributes(CoreAttributeTypes.Partition).isEmpty());
+ } finally {
+ if (copiedArtifact != null) {
+ copiedArtifact.deleteAndPersist();
+ }
+ }
}
- @Test(expected = OseeArgumentException.class)
+ @Test
public void setSoleAttributeValueTest() throws Exception {
- Artifact artifactWithSpecialAttr =
- ArtifactTypeManager.addArtifact(DemoArtifactTypes.DemoCodeTeamWorkflow, CoreBranches.COMMON);
+ artifactWithSpecialAttr.setName("ArtifactTest-artifactWithSpecialAttr");
artifactWithSpecialAttr.setSoleAttributeValue(CoreAttributeTypes.Partition, "Navigation");
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeInheritanceTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactTypeInheritanceTest.java
index 0c10a0b33e1..6f441dd41b5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeInheritanceTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ArtifactTypeInheritanceTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Collection;
import java.util.HashSet;
@@ -20,6 +20,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.junit.Assert;
/**
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AttributePurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AttributePurgeTest.java
index 31b8e4a7512..78501270df6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AttributePurgeTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/AttributePurgeTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Arrays;
import java.util.Collection;
@@ -20,10 +20,14 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeAttributes;
import org.eclipse.osee.framework.skynet.core.mocks.DbTestUtil;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventFiltersTest.java
index 28626a31ace..ce70841e951 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchEventFiltersTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventFiltersTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.filter;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Arrays;
import java.util.List;
@@ -18,6 +18,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
+import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.event.listener.IBranchEventListener;
import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventLoopbackTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventLoopbackTest.java
index 5a98e32534c..02db968eae3 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventLoopbackTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventLoopbackTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventTest.java
index aeb7e3f2315..0c6a1e983c8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchEventTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -36,6 +36,9 @@ import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.event.listener.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent;
+import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType;
+import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.httpRequests.PurgeBranchHttpRequestOperation;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.After;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchManagerTest.java
index ec2e9e3a53a..ec0ddd176e1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchManagerTest.java
@@ -8,12 +8,13 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchPurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchPurgeTest.java
index 3cbf5e90cd2..ae447a4c580 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchPurgeTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchPurgeTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import java.util.Arrays;
@@ -23,12 +23,14 @@ import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.NullOperationLogger;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.database.operation.PurgeUnusedBackingDataAndTransactions;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.httpRequests.PurgeBranchHttpRequestOperation;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.mocks.DbTestUtil;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchStateTest.java
index c91b6a001d2..938cf080c94 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/BranchStateTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -28,12 +28,16 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.operation.FinishUpdateBranchOperation;
import org.eclipse.osee.framework.skynet.core.artifact.operation.UpdateBranchOperation;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.artifact.update.ConflictResolverOperation;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
-import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.Asserts;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.Assert;
import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ChangeManagerTest.java
index 8d0f6c6105e..e20c015fe04 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ChangeManagerTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -26,6 +26,9 @@ import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.osee.framework.skynet.core.revision.ChangeManager;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ConflictDeletionTest.java
index 2fd1b73d669..f863ac4c0ed 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ConflictDeletionTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.revision;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -30,15 +30,20 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.Asserts;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.ConflictTestManager;
import org.eclipse.osee.framework.skynet.core.utility.PurgeTransactionOperationWithListener;
import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* @author Theron Virgin
*/
-public class DeletionTest {
+@Ignore
+// This test does not work
+public class ConflictDeletionTest {
private static final String CHECK_FOR_ZERO_TX_CURRENT =
"SELECT txs.tx_current, txs.transaction_id FROM osee_txs txs, osee_artifact art WHERE txs.branch_id = ? AND txs.transaction_id < ? AND txs.tx_current != 0 AND txs.gamma_id = art.gamma_id and art.art_id = ?";
@@ -71,7 +76,7 @@ public class DeletionTest {
private static final boolean INDIVIDUAL_DELETE_TEST = true;
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
assertFalse(ClientSessionManager.isProductionDataStore());
}
@@ -79,6 +84,7 @@ public class DeletionTest {
* Test method for
* {@link org.eclipse.osee.framework.skynet.core.artifact.BranchManager#getMergeBranch(Branch, Branch)} .
*/
+ @Test
public void deleteAndCheckTXCurrents() throws OseeCoreException {
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ConflictTest.java
index 31225a9ffb9..879d5072651 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/ConflictTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.revision;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
import static org.junit.Assert.assertEquals;
@@ -33,7 +33,9 @@ import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.conflict.RelationConflict;
+import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal;
import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.ConflictTestManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/branch/CreateBranchOperationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CreateBranchOperationTest.java
index ab331c8978e..d1cec377274 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/branch/CreateBranchOperationTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CreateBranchOperationTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.branch;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Arrays;
import java.util.Collection;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchRelationLinkTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CrossBranchRelationLinkTest.java
index 2329edf0e41..08a2f4c754f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchRelationLinkTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CrossBranchRelationLinkTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.relation;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CsvArtifactTest.java
index 343e604a08d..85fe020c7d5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/CsvArtifactTest.java
@@ -9,7 +9,7 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.utility;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.junit.Assert.assertEquals;
@@ -19,6 +19,7 @@ import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.skynet.core.utility.CsvArtifact;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/DuplicateHridTest.java
index 3c171df6d91..fdba3d91e7f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/DuplicateHridTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -16,6 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/systems/FrameworkEventToRemoteEventListenerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/FrameworkEventToRemoteEventListenerTest.java
index fa914e4073a..07d597d44a5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/systems/FrameworkEventToRemoteEventListenerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/FrameworkEventToRemoteEventListenerTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.systems;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Collections;
import java.util.List;
@@ -26,7 +26,6 @@ import org.eclipse.osee.framework.skynet.core.event.filter.ArtifactTypeEventFilt
import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
-import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEventTest;
import org.eclipse.osee.framework.skynet.core.event.model.EventModType;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/LoadDeletedRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/LoadDeletedRelationTest.java
index 0cee67a07f9..b674ed350db 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/LoadDeletedRelationTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/LoadDeletedRelationTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.relation;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -23,7 +23,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
+import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
+import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/NativeArtifactTest.java
index e450902c841..c749b566e79 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/NativeArtifactTest.java
@@ -9,7 +9,7 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -24,6 +24,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.utility.CsvArtifact;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/validation/OseeEnumerationValidationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/OseeEnumerationValidationTest.java
index 391644300e8..128d3ebd196 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/validation/OseeEnumerationValidationTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/OseeEnumerationValidationTest.java
@@ -9,13 +9,11 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.validation;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertEquals;
-
import java.util.ArrayList;
import java.util.List;
-
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -25,6 +23,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
+import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator;
+import org.eclipse.osee.framework.skynet.core.validation.OseeValidator;
import org.junit.After;
import org.junit.Before;
@@ -52,14 +52,14 @@ public class OseeEnumerationValidationTest {
public List<TestData> getEnumerationCases() {
List<TestData> data = new ArrayList<TestData>();
- data.add(new TestData("Test 1: Null", null, getErrorStatus("No enum const [GFE / CFE].[null]")));
- data.add(new TestData("Test 2: Empty String", "", getErrorStatus("No enum const [GFE / CFE].[]")));
+ data.add(new TestData("Test 1: Null", null, getErrorStatus("No enum const [enum.req.gfe.cfe].[null]")));
+ data.add(new TestData("Test 2: Empty String", "", getErrorStatus("No enum const [enum.req.gfe.cfe].[]")));
data.add(new TestData("Test 3: Invalid", "asbasdfasdfa",
- getErrorStatus("No enum const [GFE / CFE].[asbasdfasdfa]")));
+ getErrorStatus("No enum const [enum.req.gfe.cfe].[asbasdfasdfa]")));
data.add(new TestData("Test 4: Valid", "CFE", Status.OK_STATUS));
data.add(new TestData("Test 5: Valid", "GFE", Status.OK_STATUS));
data.add(new TestData("Test 5: Valid", "Unspecified", Status.OK_STATUS));
- data.add(new TestData("Test 6: Valid", "cfe", getErrorStatus("No enum const [GFE / CFE].[cfe]")));
+ data.add(new TestData("Test 6: Valid", "cfe", getErrorStatus("No enum const [enum.req.gfe.cfe].[cfe]")));
data.add(new TestData("Test 7: Invalid Class", 0,
getErrorStatus("java.lang.Integer cannot be cast to java.lang.String")));
return data;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/PurgeTransactionTest.java
index 9efb331b98a..a4807f1ccfd 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/PurgeTransactionTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
@@ -26,11 +26,12 @@ import org.eclipse.osee.framework.core.operation.NullOperationLogger;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.operation.PurgeUnusedBackingDataAndTransactions;
-import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.mocks.DbTestUtil;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.Asserts;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.utility.PurgeTransactionOperationWithListener;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
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/test/integration/RelationCacheTest.java
index 529a2495a41..45e54f17c50 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/test/integration/RelationCacheTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.relation;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.List;
@@ -25,6 +25,8 @@ import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.mocks.DataFactory;
import org.eclipse.osee.framework.skynet.core.mocks.MockDataFactory;
import org.eclipse.osee.framework.skynet.core.mocks.MockLinker;
+import org.eclipse.osee.framework.skynet.core.relation.RelationCache;
+import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationDeletionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationDeletionTest.java
index 134f0099ee0..697fab13fb7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationDeletionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationDeletionTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -23,6 +23,10 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
import org.junit.After;
import org.junit.Before;
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/test/integration/RelationFilterUtilTest.java
index fd1770e82ff..80ac9f9843d 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/test/integration/RelationFilterUtilTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.relation;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -19,6 +19,7 @@ import org.eclipse.osee.framework.core.model.Branch;
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.mocks.MockDataFactory;
+import org.eclipse.osee.framework.skynet.core.relation.RelationFilterUtil;
import org.eclipse.osee.framework.skynet.core.relation.RelationFilterUtil.RelationMatcher;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtilityTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationOrderMergeUtilityTest.java
index 5138bc99484..f27545a1ab8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtilityTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationOrderMergeUtilityTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.relation.order;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Artifact;
import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
@@ -26,10 +26,12 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
+import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
+import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderMergeUtility;
import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
+import org.eclipse.osee.framework.skynet.core.test.integration.utils.FrameworkTestUtil;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationOrderingTest.java
index 911064f57dd..d5455074677 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RelationOrderingTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -25,6 +25,12 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RoughArtifactTest.java
index bc05eb2b4ed..fcde92d82ea 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/RoughArtifactTest.java
@@ -8,10 +8,12 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.importing;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
+import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind;
/**
* @author Ryan D. Brooks
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/SkynetTransactionTest.java
index 7ca71e052f7..7f13b5a083b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/SkynetTransactionTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.transaction;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.HashSet;
import java.util.Set;
@@ -20,6 +20,8 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
+import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.After;
import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventLocalTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionEventLocalTest.java
index 458f7ab5a82..c6a839cbf60 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventLocalTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionEventLocalTest.java
@@ -8,16 +8,15 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.TransactionEventTest;
import org.junit.BeforeClass;
/**
* @author Donald G. Dunne
*/
-public class TransactionEventLocalTest extends TransactionEventTest {
+public class TransactionEventLocalTest extends AbstractTransactionEventTest {
@BeforeClass
public static void setUp() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventRemoteTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionEventRemoteTest.java
index ed38a50316c..74b724cc11d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventRemoteTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionEventRemoteTest.java
@@ -8,10 +8,9 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event.model;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.TransactionEventTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -21,7 +20,7 @@ import org.junit.BeforeClass;
*
* @author Donald G. Dunne
*/
-public class TransactionEventRemoteTest extends TransactionEventTest {
+public class TransactionEventRemoteTest extends AbstractTransactionEventTest {
@BeforeClass
public static void setUp() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionManagerTest.java
index a809419e2dd..8912b0a0ce2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/TransactionManagerTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.transaction;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import static org.junit.Assert.assertFalse;
import java.util.List;
@@ -18,6 +18,7 @@ import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.Assert;
import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/UserManagerTest.java
index 9f27de1293f..e9c6ccda88f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/UserManagerTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.Collection;
import java.util.HashSet;
@@ -22,6 +22,8 @@ import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.skynet.core.User;
+import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandlerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/WordMlLinkHandlerTest.java
index 62bf35d7301..35054d4a752 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/WordMlLinkHandlerTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.linking;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -17,7 +17,6 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -25,7 +24,10 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.linking.LinkType;
+import org.eclipse.osee.framework.skynet.core.linking.WordMlLinkHandler;
import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
/**
* @author Roberto E. Escobar
@@ -122,7 +124,7 @@ public class WordMlLinkHandlerTest {
private Map<String, TestData> getTestData() {
Map<String, TestData> toReturn = new LinkedHashMap<String, TestData>();
- Bundle bundle = Platform.getBundle("org.eclipse.osee.framework.skynet.core.test").getBundleContext().getBundle();
+ Bundle bundle = FrameworkUtil.getBundle(WordMlLinkHandlerTest.class).getBundleContext().getBundle();
Enumeration<?> urls = bundle.findEntries("support/WordMlLinkData", "*.*", true);
while (urls.hasMoreElements()) {
URL url = (URL) urls.nextElement();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/WordOutlineTest.java
index 6545e22ef70..7b7581b58bf 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/WordOutlineTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.importing.parsers;
+package org.eclipse.osee.framework.skynet.core.test.integration;
import java.util.ArrayList;
import java.util.Collection;
@@ -18,6 +18,7 @@ import java.util.regex.Pattern;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.ReservedCharacters;
import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -37,9 +38,9 @@ public final class WordOutlineTest {
Pattern.DOTALL | Pattern.MULTILINE);
private static final Pattern OUTLINE_NUMBER_PATTERN = Pattern.compile("((?>\\d+\\.)+\\d*)\\s*");
- private static final String OUTLINE_WITH_NUMBER = "outlineNameWithNumber.xml";
- private static final String OUTLINE_WITH_NUMBER_AND_CONTENT = "outlineNameNumberAndContent.xml";
- private static final String NUMBER_EMBED_IN_CONTENT = "numberEmbeddedInTheContent.xml";
+ private static final String OUTLINE_WITH_NUMBER = "wordoutlineNameWithNumber.xml";
+ private static final String OUTLINE_WITH_NUMBER_AND_CONTENT = "wordoutlineNameNumberAndContent.xml";
+ private static final String NUMBER_EMBED_IN_CONTENT = "wordoutlineNumberEmbeddedInTheContent.xml";
private final WordOutlineExtractorDelegate delegate;
private final String dataFileName;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/XSkynetCoreIntegrationTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/XSkynetCoreIntegrationTestSuite.java
new file mode 100644
index 00000000000..201f6212206
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/XSkynetCoreIntegrationTestSuite.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * 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.skynet.core.test.integration;
+
+import static org.junit.Assert.assertTrue;
+import org.eclipse.osee.framework.core.client.ClientSessionManager;
+import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ ArtifactCacheQueryTest.class,
+ ArtifactEventFiltersTest.class,
+ ArtifactEventLoopbackTest.class,
+ ArtifactEventTest.class,
+ ArtifactGetLastModifiedTest.class,
+ ArtifactLoaderTest.class,
+ ArtifactPurgeTest.class,
+ ArtifactQueryTest.class,
+ ArtifactSetAttributeValuesTest.class,
+ ArtifactTest.class,
+ ArtifactTypeInheritanceTest.class,
+ AttributePurgeTest.class,
+ BranchEventFiltersTest.class,
+ BranchEventLoopbackTest.class,
+ BranchEventTest.class,
+ BranchManagerTest.class,
+ BranchPurgeTest.class,
+ BranchStateTest.class,
+ ChangeManagerTest.class,
+ ConflictDeletionTest.class,
+ ConflictTest.class,
+ CreateBranchOperationTest.class,
+ CrossBranchRelationLinkTest.class,
+ CsvArtifactTest.class,
+ DuplicateHridTest.class,
+ FrameworkEventToRemoteEventListenerTest.class,
+ LoadDeletedRelationTest.class,
+ NativeArtifactTest.class,
+ OseeEnumerationValidationTest.class,
+ PurgeTransactionTest.class,
+ RelationCacheTest.class,
+ RelationDeletionTest.class,
+ RelationFilterUtilTest.class,
+ RelationOrderingTest.class,
+ RelationOrderMergeUtilityTest.class,
+ RoughArtifactTest.class,
+ SkynetTransactionTest.class,
+ TransactionEventLocalTest.class,
+ TransactionEventRemoteTest.class,
+ TransactionManagerTest.class,
+ UserManagerTest.class,
+ WordMlLinkHandlerTest.class,
+ WordOutlineTest.class})
+public final class XSkynetCoreIntegrationTestSuite {
+ @BeforeClass
+ public static void setUp() throws Exception {
+ System.out.println("\n\nBegin " + XSkynetCoreIntegrationTestSuite.class.getSimpleName());
+ OseeProperties.setIsInTest(true);
+ assertTrue("Demo Application Server must be running.",
+ ClientSessionManager.getAuthenticationProtocols().contains("demo"));
+ assertTrue("Client must authenticate using demo protocol",
+ ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo"));
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ System.out.println("End " + XSkynetCoreIntegrationTestSuite.class.getSimpleName());
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/Asserts.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/Asserts.java
index a93a7e9d266..15e7c7b74d8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/Asserts.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/Asserts.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.mocks;
+package org.eclipse.osee.framework.skynet.core.test.integration.utils;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osee.framework.core.operation.IOperation;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/ConflictTestManager.java
index 9a088e44cd2..f71de9c0bbb 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/ConflictTestManager.java
@@ -9,10 +9,11 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.revision;
+package org.eclipse.osee.framework.skynet.core.test.integration.utils;
import java.util.Collection;
import java.util.Date;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import org.eclipse.osee.framework.core.data.IArtifactType;
@@ -40,6 +41,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.IntegerAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.StringAttribute;
import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
+import org.eclipse.osee.framework.skynet.core.test.integration.ConflictDeletionTest;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
/**
@@ -228,13 +230,13 @@ public class ConflictTestManager {
sourceArtifacts[i].deleteAndPersist();
}
if (DEBUG) {
- DeletionTest.dumpArtifact(sourceArtifacts[i]);
+ ConflictDeletionTest.dumpArtifact(sourceArtifacts[i]);
for (RelationLink link : sourceArtifacts[i].getRelationsAll(DeletionFlag.EXCLUDE_DELETED)) {
- DeletionTest.dumpRelation(link, sourceArtifacts[i]);
+ ConflictDeletionTest.dumpRelation(link, sourceArtifacts[i]);
}
- DeletionTest.dumpArtifact(destArtifacts[i]);
+ ConflictDeletionTest.dumpArtifact(destArtifacts[i]);
for (RelationLink link : destArtifacts[i].getRelationsAll(DeletionFlag.EXCLUDE_DELETED)) {
- DeletionTest.dumpRelation(link, destArtifacts[i]);
+ ConflictDeletionTest.dumpRelation(link, destArtifacts[i]);
}
System.out.println(" ");
}
@@ -681,4 +683,59 @@ public class ConflictTestManager {
}
return value;
}
+
+ static final class ConflictDefinition {
+ final Collection<AttributeValue> values = new HashSet<AttributeValue>();
+ final Collection<AttributeValue> newAttributes = new HashSet<AttributeValue>();
+ IArtifactType artifactType;
+ boolean sourceDelete;
+ boolean destDelete;
+ int rootArtifact;
+ int queryNumber;
+ int numConflicts = 0;
+ boolean sourceModified = false;
+ boolean destModified = false;
+
+ protected void setValues(IArtifactType artifactType, boolean sourceDelete, boolean destDelete, int rootArtifact, int queryNumber) {
+ this.artifactType = artifactType;
+ this.sourceDelete = sourceDelete;
+ this.destDelete = destDelete;
+ this.rootArtifact = rootArtifact;
+ this.queryNumber = queryNumber;
+ }
+
+ protected boolean destinationDeleted(ConflictDefinition[] conflictDefs) {
+ if (rootArtifact == 0) {
+ return destDelete;
+ }
+ return destDelete || conflictDefs[rootArtifact].destinationDeleted(conflictDefs);
+ }
+
+ protected boolean sourceDeleted(ConflictDefinition[] conflictDefs) {
+ if (rootArtifact == 0) {
+ return sourceDelete;
+ }
+ return sourceDelete || conflictDefs[rootArtifact].sourceDeleted(conflictDefs);
+ }
+
+ protected int getNumberConflicts(ConflictDefinition[] conflictDefs) {
+ if (!destinationDeleted(conflictDefs) && !sourceDeleted(conflictDefs)) {
+ return numConflicts;
+ } else if (destinationDeleted(conflictDefs) && sourceModified || sourceDeleted(conflictDefs) && destModified) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+
+ protected boolean artifactAdded(ConflictDefinition[] conflictDefs) {
+ if (!destinationDeleted(conflictDefs) && !sourceDeleted(conflictDefs)) {
+ return numConflicts > 0;
+ } else if (destinationDeleted(conflictDefs) && sourceModified || sourceDeleted(conflictDefs) && destModified) {
+ return true;
+ }
+ return false;
+ }
+
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/FrameworkTestUtil.java
index 7529f305805..d6afbd08a33 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/FrameworkTestUtil.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.util;
+package org.eclipse.osee.framework.skynet.core.test.integration.utils;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import java.io.BufferedReader;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockTransactionEventListener.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/MockTransactionEventListener.java
index 853064cbac4..53807866f74 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockTransactionEventListener.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/utils/MockTransactionEventListener.java
@@ -8,7 +8,7 @@
* Contributors:
*public static final CoreAttributeTypes Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.mocks;
+package org.eclipse.osee.framework.skynet.core.test.integration.utils;
import org.eclipse.osee.framework.skynet.core.event.listener.ITransactionEventListener;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameNumberAndContent.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNameNumberAndContent.xml
index cfa26a9a6f0..cfa26a9a6f0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameNumberAndContent.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNameNumberAndContent.xml
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameWithNumber.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNameWithNumber.xml
index 5c33ebad72a..5c33ebad72a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameWithNumber.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNameWithNumber.xml
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/numberEmbeddedInTheContent.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNumberEmbeddedInTheContent.xml
index acb720890dc..acb720890dc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/numberEmbeddedInTheContent.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/integration/wordoutlineNumberEmbeddedInTheContent.xml
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryPerformanceTests.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/production/ArtifactQueryPerformanceTests.java
index 7a725c9b475..cf239e33e2a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryPerformanceTests.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/production/ArtifactQueryPerformanceTests.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact.search;
+package org.eclipse.osee.framework.skynet.core.test.production;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
@@ -17,13 +17,18 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Ignore;
/**
@@ -31,6 +36,13 @@ import org.junit.Ignore;
*/
public class ArtifactQueryPerformanceTests {
+ @BeforeClass
+ public static void setUp() throws Exception {
+ OseeProperties.setIsInTest(true);
+ Assert.assertTrue("Application Server must be running.",
+ ClientSessionManager.getAuthenticationProtocols().contains("lba"));
+ }
+
/*
* constructors to test no good way to get id's for test so we son't test these two. public ArtifactQueryBuilder(int
* artId, Branch branch, boolean allowDeleted, ArtifactLoad loadLevel) { this(null, artId, null, null, null, branch,
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestProduction.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/production/ArtifactQueryTestProduction.java
index e8723a8836e..cc125e2b229 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestProduction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/production/ArtifactQueryTestProduction.java
@@ -8,19 +8,31 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact.search;
+package org.eclipse.osee.framework.skynet.core.test.production;
import static org.junit.Assert.assertEquals;
+import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.junit.Assert;
+import org.junit.BeforeClass;
/**
* @author Ryan D. Brooks
*/
public class ArtifactQueryTestProduction {
+ @BeforeClass
+ public static void setUp() throws Exception {
+ OseeProperties.setIsInTest(true);
+ Assert.assertTrue("Application Server must be running.",
+ ClientSessionManager.getAuthenticationProtocols().contains("lba"));
+ }
+
@org.junit.Test
public void testGetArtifactFromHRID() throws OseeCoreException {
Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(BranchManager.getCommonBranch());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionTestSuite.java
index b0da1b93b49..0353e5ec829 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionTestSuite.java
@@ -14,11 +14,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TxMonitorCacheTest.class,
- TxMonitorImplTest.class,
- TransactionManagerTest.class,
- SkynetTransactionTest.class})
+@Suite.SuiteClasses({TxMonitorCacheTest.class, TxMonitorImplTest.class})
/**
* @author Roberto E. Escobar
*/
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/branch/BranchSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/WordTestSuite.java
index f69e19aff8e..74b39699e2d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/branch/BranchSuite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/WordTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Boeing.
+ * 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
@@ -8,13 +8,16 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.branch;
+package org.eclipse.osee.framework.skynet.core.word;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({CreateBranchOperationTest.class})
-public class BranchSuite {
- // do nothing
+@Suite.SuiteClasses({UpdateBookmarkIdTest.class})
+/**
+ * @author Roberto E. Escobar
+ */
+public class WordTestSuite {
+ // Test Suite
}

Back to the top