diff options
-rw-r--r-- | plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF | 1 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.logging.test/.classpath | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.logging.test/.project | 28 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.logging.test/build.properties | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/AccessTest.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF | 1 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF | 30 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java | 110 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_TestDb_Suite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java) | 24 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/user/UserManagerTest.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AbstractPurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/AbstractPurgeTest.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactPurgeTest.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/ArtifactTest.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchTestSuite.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeInheritanceTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java) | 11 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AttributePurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/AttributePurgeTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchManagerTest.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchPurgeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchPurgeTest.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ChangeManagerTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/NativeArtifactTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/PurgeTransactionTest.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationDeletionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationDeletionTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ReplaceWithAttributeTest.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/StaticIdManagerTest.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactLoaderTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactLoaderTest.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryPerformanceTests.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestDemo.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestProduction.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestProduction.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/dunno/SevereLogMonitorTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/SevereLogMonitorTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactEventFiltersTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchEventFiltersTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventFiltersTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventLoopbackTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventLoopbackTest.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventTest.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventLoopbackTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventLoopbackTest.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidRelationTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventChangeTypeBasicGuidArtifactTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventLocalTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventLocalTest.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventRemoteTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventRemoteTest.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ImportingSuite.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ReqNumberingTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/MockResolutionGui.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/MockResolutionGui.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/ParsersSuite.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMlResolutionGuiTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordOutlineTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/numberEmbeddedInTheContent.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/numberEmbeddedInTheContent.xml) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameNumberAndContent.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineNameNumberAndContent.xml) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameWithNumber.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineNameWithNumber.xml) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineResolutionCausingInput_no_toc_formatted.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineResolutionCausingInput_no_toc_formatted.xml) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/tableOfContentsHyperlinkTest.xml (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/tableOfContentsHyperlinkTest.xml) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandlerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/WordMlLinkHandlerTest.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/DataFactory.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockIArtifact.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockLinker.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockLinker.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockTransactionEventListener.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockTransactionEventListener.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchLinkTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchRelationLinkTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchRelationLinkTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/LoadDeletedRelationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/LoadDeletedRelationTest.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationFilterUtilTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTestSuite.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtilityTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java) | 24 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergerTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderTestSuite.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTestSuite.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTestSuite.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictDefinition.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java | 113 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManagerTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/util/FrameworkTestUtil.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/CsvArtifactTest.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/validation/OseeEnumerationValidationTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeEnumerationValidationTest.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java (renamed from plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/word/UpdateBookmarkIdTest.java) | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/blam/operation/EmailGroupsBlamTest.java | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java | 3 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java | 4 |
101 files changed, 424 insertions, 400 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF index 4bd9f7f00b0..006615e8dee 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF @@ -37,7 +37,6 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.messaging.event.res.test, org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.framework.skynet.core.test, org.eclipse.osee.framework.ui.plugin.xnavigate, org.eclipse.osee.framework.ui.skynet.render, org.eclipse.osee.framework.ui.skynet.test, diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java index af14c0fec04..7bf582c26a0 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java @@ -11,14 +11,15 @@ package org.eclipse.osee.client.integration.tests.suite; import static org.junit.Assert.assertTrue; + import org.eclipse.osee.ats.test.AtsTest_Config_Suite; -import org.eclipse.osee.ats.test.AtsTest_Demo_Suite; import org.eclipse.osee.ats.test.AtsTest_Demo_StateItem_Suite; +import org.eclipse.osee.ats.test.AtsTest_Demo_Suite; import org.eclipse.osee.coverage.test.Coverage_Db_Suite; import org.eclipse.osee.define.AllDefineTestSuite; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.messaging.event.res.test.AllEventResTestSuite; -import org.eclipse.osee.framework.skynet.core.test.FrameworkCore_Demo_Suite; +import org.eclipse.osee.framework.skynet.core.FrameworkCore_Demo_Suite; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.framework.ui.skynet.test.FrameworkUi_Demo_Suite; import org.eclipse.osee.support.test.util.TestUtil; diff --git a/plugins/org.eclipse.osee.framework.logging.test/.classpath b/plugins/org.eclipse.osee.framework.logging.test/.classpath new file mode 100644 index 00000000000..ad32c83a788 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.logging.test/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.osee.framework.logging.test/.project b/plugins/org.eclipse.osee.framework.logging.test/.project new file mode 100644 index 00000000000..51b9efc2db9 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.logging.test/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.osee.framework.logging.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..4752718050f --- /dev/null +++ b/plugins/org.eclipse.osee.framework.logging.test/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Logging Test +Bundle-SymbolicName: org.eclipse.osee.framework.logging.test +Bundle-Version: 0.9.9.qualifier +Bundle-Vendor: Eclipse Opne System Engineering Environment +Fragment-Host: org.eclipse.osee.framework.logging;bundle-version="0.9.9" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/org.eclipse.osee.framework.logging.test/build.properties b/plugins/org.eclipse.osee.framework.logging.test/build.properties new file mode 100644 index 00000000000..34d2e4d2dad --- /dev/null +++ b/plugins/org.eclipse.osee.framework.logging.test/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/AccessTest.java b/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java index d8b53c5972e..e04c200e204 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/AccessTest.java +++ b/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Boeing. + * 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 @@ -8,16 +8,8 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.logging; -import static org.junit.Assert.assertFalse; -import org.eclipse.osee.framework.core.client.ClientSessionManager; -import org.junit.Before; - -public class AccessTest { - - @Before - protected void setUp() throws Exception { - assertFalse(ClientSessionManager.isProductionDataStore()); - } -}
\ No newline at end of file +public class AllLoggingTestSuite { + // test suite +} diff --git a/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF index 8bdbbc73936..f8f4a12f56d 100644 --- a/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF @@ -9,4 +9,5 @@ Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.jdk.core.util, org.osgi.framework Export-Package: org.eclipse.osee.framework.logging +Eclipse-ExtensibleAPI: true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 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 be154a49bd3..0508c4bc944 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 @@ -6,16 +6,26 @@ Bundle-Version: 0.9.9.qualifier Fragment-Host: org.eclipse.osee.framework.skynet.core Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit -Export-Package: org.eclipse.osee.framework.skynet.core.test, - org.eclipse.osee.framework.skynet.core.test.branch, - org.eclipse.osee.framework.skynet.core.test.cases, - org.eclipse.osee.framework.skynet.core.test.event, - org.eclipse.osee.framework.skynet.core.test.importing, - org.eclipse.osee.framework.skynet.core.test.relation, - org.eclipse.osee.framework.skynet.core.test.relation.order, - org.eclipse.osee.framework.skynet.core.test.relation.sorters, - org.eclipse.osee.framework.skynet.core.test.mocks, - org.eclipse.osee.framework.skynet.core.test.util +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.dunno, + 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.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 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/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 new file mode 100644 index 00000000000..84935277822 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java @@ -0,0 +1,110 @@ +/******************************************************************************* + * 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; + +import static org.junit.Assert.assertTrue; +import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPurgeTest; +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.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.ReplaceWithAttributeTest; +import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManagerTest; +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.dunno.SevereLogMonitorTest; +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.importing.ImportingSuite; +import org.eclipse.osee.framework.skynet.core.importing.parsers.ParsersSuite; +import org.eclipse.osee.framework.skynet.core.relation.CrossBranchLinkTest; +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.TransactionManagerTest; +import org.eclipse.osee.framework.skynet.core.utility.CsvArtifactTest; +import org.eclipse.osee.framework.skynet.core.word.UpdateBookmarkIdTest; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ + UserManagerTest.class, + ReplaceWithAttributeTest.class, + AttributePurgeTest.class, + CrossBranchLinkTest.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, + TransactionManagerTest.class, + ArtifactTestSuite.class, + RelationTestSuite.class, + ArtifactTypeInheritanceTest.class, + ArtifactPurgeTest.class, + BranchPurgeTest.class, + PurgeTransactionTest.class, + Artifact_setAttributeValues.class, + Artifact_getLastModified.class, + CsvArtifactTest.class, + NativeArtifactTest.class, + ConflictTest.class, + ChangeManagerTest.class, + SevereLogMonitorTest.class, + RelationDeletionTest.class, + StaticIdManagerTest.class, + BranchStateTest.class, + DuplicateHridTest.class, + RelationOrderingTest.class, + ImportingSuite.class, + ParsersSuite.class}) +/** + * @author Donald G. Dunne + */ +public class FrameworkCore_Demo_Suite { + @BeforeClass + public static void setUp() throws Exception { + assertTrue("Demo Application Server must be running.", + ClientSessionManager.getAuthenticationProtocols().contains("demo")); + assertTrue("Client must authenticate using demo protocol", + ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); + } + +} diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/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 86f805bafb7..eb6771b7f61 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Production_Suite.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test; +package org.eclipse.osee.framework.skynet.core; -import org.junit.Assert; import org.eclipse.osee.framework.core.client.ClientSessionManager; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryPerformanceTests; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestProduction; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryPerformanceTests; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryTestProduction; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_TestDb_Suite.java index f4ddd341e52..d4eb2272c5a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_TestDb_Suite.java @@ -8,19 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test; +package org.eclipse.osee.framework.skynet.core; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactLoaderTest; -import org.eclipse.osee.framework.skynet.core.test.cases.Artifact_getLastModified; -import org.eclipse.osee.framework.skynet.core.test.event.ArtifactEventFiltersTest; -import org.eclipse.osee.framework.skynet.core.test.event.ArtifactEventLoopbackTest; -import org.eclipse.osee.framework.skynet.core.test.event.ArtifactEventTest; -import org.eclipse.osee.framework.skynet.core.test.event.BranchEventFiltersTest; -import org.eclipse.osee.framework.skynet.core.test.event.BranchEventLoopbackTest; -import org.eclipse.osee.framework.skynet.core.test.event.BranchEventTest; -import org.eclipse.osee.framework.skynet.core.test.event.TransactionEventLocalTest; -import org.eclipse.osee.framework.skynet.core.test.event.TransactionEventRemoteTest; -import org.eclipse.osee.framework.skynet.core.test.word.UpdateBookmarkIdTest; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact_getLastModified; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactLoaderTest; +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.TransactionEventLocalTest; +import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventRemoteTest; +import org.eclipse.osee.framework.skynet.core.word.UpdateBookmarkIdTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/user/UserManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java index bfeec2e3dc6..41be4429afe 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/user/UserManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.user; +package org.eclipse.osee.framework.skynet.core; import java.util.Collection; import java.util.HashSet; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/AbstractPurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AbstractPurgeTest.java index da5fadb3bc0..a5aa27bd8b2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/AbstractPurgeTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AbstractPurgeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.artifact; +package org.eclipse.osee.framework.skynet.core.artifact; 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/test/cases/ArtifactPurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPurgeTest.java index 751619e8085..2326f186e3e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactPurgeTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPurgeTest.java @@ -8,21 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; + import java.util.Arrays; import java.util.Collection; import java.util.List; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; 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.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.test.artifact.AbstractPurgeTest; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; 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/test/artifact/ArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTest.java index 5b2d63ac30c..97228feb9ea 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/ArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTest.java @@ -9,7 +9,7 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.artifact; +package org.eclipse.osee.framework.skynet.core.artifact; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTestSuite.java index b1248ff689b..983d25197fb 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchTestSuite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTestSuite.java @@ -9,7 +9,7 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.branch; +package org.eclipse.osee.framework.skynet.core.artifact; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -20,6 +20,6 @@ import org.junit.runners.Suite; * @author Roberto E. Escobar * */ -public class BranchTestSuite { +public class ArtifactTestSuite { // do nothing } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeInheritanceTest.java index 57c37a72000..0d3ca167d06 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeInheritanceTest.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.junit.Assert; + import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -21,8 +21,7 @@ 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; /** * High-level test to ensure demo artifact types correctly inherit from artifact diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java index bda59fd4bb3..e67d518b9e7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java @@ -9,23 +9,20 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; + import java.util.Collection; import java.util.Date; -import org.junit.Assert; + import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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.StaticIdManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java index 02d35ad1301..5f1f1558732 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java @@ -9,25 +9,23 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.junit.Assert; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.model.Branch; 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.BranchManager; -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; +import org.junit.Assert; import org.junit.BeforeClass; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/AttributePurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AttributePurgeTest.java index 74f7774a817..caa1f7278da 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/artifact/AttributePurgeTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/AttributePurgeTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.artifact; +package org.eclipse.osee.framework.skynet.core.artifact; import java.util.Arrays; import java.util.Collection; @@ -23,8 +23,8 @@ 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.PurgeAttribute; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; 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/test/branch/BranchManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManagerTest.java index d61a82bba3c..18824d3b884 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManagerTest.java @@ -8,18 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.branch; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; + import java.util.Arrays; -import org.junit.Assert; + import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.support.test.util.TestUtil; 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/test/cases/BranchPurgeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchPurgeTest.java index 6c521121017..24b9faee341 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchPurgeTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchPurgeTest.java @@ -8,23 +8,23 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.model.Branch; 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.BranchManager; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; 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/test/cases/BranchStateTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java index 742874a98de..f102ed0af5a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java @@ -8,14 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.Collection; -import org.junit.Assert; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; @@ -30,16 +31,13 @@ import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.test.mocks.Asserts; 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; -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.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/test/cases/ChangeManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java index 72698c64558..6f8e5f68e0a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ChangeManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java @@ -8,13 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.logging.Level; + import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -29,9 +31,6 @@ 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.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.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/test/cases/DuplicateHridTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java index 5758e9dd00f..1c63baca1dc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + 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/test/cases/NativeArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java index 9eea6b92dfb..507904beeb5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/NativeArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java @@ -9,24 +9,23 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.util.Collection; + import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.plugin.core.util.OseeData; -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.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.utility.CsvArtifact; 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/test/cases/PurgeTransactionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java index c18fd5e6bd7..1cc5b1aa358 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/PurgeTransactionTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java @@ -8,14 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertEquals; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.core.runtime.IStatus; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -24,12 +26,9 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.test.mocks.Asserts; import org.eclipse.osee.framework.database.core.ConnectionHandler; -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.PurgeTransactionOperation; import org.eclipse.osee.framework.skynet.core.internal.Activator; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; 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/test/cases/RelationDeletionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationDeletionTest.java index 12a9ee7e7f6..45422f9a666 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationDeletionTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationDeletionTest.java @@ -8,11 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + 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; @@ -21,9 +23,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; 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.junit.Before; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java index e26865e476c..c3a299b245e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java @@ -8,13 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.List; import java.util.Set; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -24,12 +26,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; 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.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.StaticIdManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.junit.After; import org.junit.AfterClass; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ReplaceWithAttributeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java index 26a3dfa735f..e2fd5b61b07 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ReplaceWithAttributeTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java @@ -9,7 +9,7 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertTrue; import java.util.Collections; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/StaticIdManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManagerTest.java index ec7d54fc392..0d97a28b9ac 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/StaticIdManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManagerTest.java @@ -8,27 +8,24 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; 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.ArtifactTypeManager; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; 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/test/cases/ArtifactLoaderTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactLoaderTest.java index 131b303f318..7f154a0512b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactLoaderTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactLoaderTest.java @@ -8,10 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.junit.Assert.assertFalse; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -21,7 +22,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.junit.Assert; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeStateException; @@ -30,11 +31,11 @@ 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.ArtifactPersistenceManager; 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.test.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +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; import org.junit.BeforeClass; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryPerformanceTests.java index 171229a88bf..99ce4d5f5d3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryPerformanceTests.java @@ -8,15 +8,17 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -24,7 +26,6 @@ import org.eclipse.osee.framework.core.model.Branch; 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.Ignore; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestDemo.java index b23da3ae492..0041354ca64 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestDemo.java @@ -8,11 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ - -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import java.util.List; + import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestProduction.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestProduction.java index 8e3aed1f0fb..b1cde0948b2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestProduction.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryTestProduction.java @@ -8,14 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.junit.Assert.assertEquals; + import org.eclipse.osee.framework.core.exception.OseeCoreException; 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; /** * @author Ryan D. Brooks diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/SevereLogMonitorTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/dunno/SevereLogMonitorTest.java index 5b191005347..a59b8a8f0f4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/SevereLogMonitorTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/dunno/SevereLogMonitorTest.java @@ -8,10 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.dunno; import static org.junit.Assert.assertTrue; + import java.util.logging.Level; + import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; 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/test/event/TransactionEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java index 21aa3b233e9..1dfe95157a2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java @@ -8,11 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; + import org.eclipse.core.runtime.IStatus; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -24,13 +25,12 @@ 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.PurgeTransactionOperation; -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.internal.Activator; -import org.eclipse.osee.framework.skynet.core.test.mocks.MockTransactionEventListener; +import org.eclipse.osee.framework.skynet.core.mocks.MockTransactionEventListener; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; 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/test/event/ArtifactEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactEventFiltersTest.java index cebd579adde..54b5985a580 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactEventFiltersTest.java @@ -8,21 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.filter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import junit.framework.Assert; + import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.messaging.event.skynet.event.NetworkSender; 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/test/event/BranchEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchEventFiltersTest.java index 4639a2468fc..53251e3d64e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventFiltersTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchEventFiltersTest.java @@ -8,22 +8,22 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.filter; import java.util.Arrays; import java.util.List; -import org.junit.Assert; + import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.messaging.event.skynet.event.NetworkSender; 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.support.test.util.TestUtil; 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/test/event/ArtifactEventLoopbackTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventLoopbackTest.java index 93aab09f888..fecedc736e4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventLoopbackTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventLoopbackTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; 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/test/event/ArtifactEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java index 408cc391df5..2f228c4c8b6 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java @@ -8,14 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.junit.Assert; + import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -43,20 +43,13 @@ 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.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.utility.IncrementingNum; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventLoopbackTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventLoopbackTest.java index 35d65700676..5a98e32534c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventLoopbackTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventLoopbackTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; 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/test/event/BranchEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventTest.java index ee68c7d791d..e5cead20edb 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEventTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; import java.util.ArrayList; import java.util.Arrays; @@ -40,9 +40,6 @@ 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.support.test.util.TestUtil; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java index 47294c816d1..0a3386c1181 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java @@ -8,16 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; import java.util.HashSet; import java.util.Set; -import org.junit.Assert; + 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/test/event/EventBasicGuidRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java index eebb7219f5b..a9ab550c88e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidRelationTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; import java.util.HashSet; import java.util.Set; -import org.junit.Assert; + 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/test/event/EventChangeTypeBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java index 899a169a06a..bb69f7e5af4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventChangeTypeBasicGuidArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java @@ -8,14 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; import java.util.HashSet; import java.util.Set; -import org.junit.Assert; + 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/test/event/TransactionEventLocalTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventLocalTest.java index 0228fb0db09..458f7ab5a82 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventLocalTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventLocalTest.java @@ -8,9 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; +import org.eclipse.osee.framework.skynet.core.event.TransactionEventTest; import org.junit.BeforeClass; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventRemoteTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventRemoteTest.java index bd4018d09ba..ed38a50316c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventRemoteTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/TransactionEventRemoteTest.java @@ -8,9 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.event; +package org.eclipse.osee.framework.skynet.core.event.model; 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; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java index 0c44ef88b92..c75f0d4a00a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing; +package org.eclipse.osee.framework.skynet.core.importing; import java.io.File; import java.io.FileFilter; @@ -18,16 +18,15 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.junit.Assert; + import org.eclipse.osee.framework.jdk.core.type.PropertyStore; 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.RoughArtifact; -import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; import org.eclipse.osee.framework.skynet.core.importing.parsers.ExcelArtifactExtractor; import org.eclipse.osee.framework.skynet.core.importing.parsers.IArtifactExtractor; 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.runner.RunWith; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ImportingSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java index 9172e628e96..98f1da45f2f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ImportingSuite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ImportingSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing; +package org.eclipse.osee.framework.skynet.core.importing; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ReqNumberingTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java index 7559a073f70..babf038c01a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ReqNumberingTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing; +package org.eclipse.osee.framework.skynet.core.importing; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import org.apache.commons.lang.StringUtils; -import org.eclipse.osee.framework.skynet.core.importing.ReqNumbering; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java index 6bcf2acc50b..c972cd2a4c2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java @@ -8,10 +8,8 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing; +package org.eclipse.osee.framework.skynet.core.importing; -import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; -import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java index 12b8bc3cfdd..328c69cb4f6 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactUtil.java @@ -8,16 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing; +package org.eclipse.osee.framework.skynet.core.importing; import java.net.URL; import java.util.List; -import org.junit.Assert; + 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.RoughArtifact; -import org.eclipse.osee.framework.skynet.core.importing.RoughRelation; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; +import org.junit.Assert; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/MockResolutionGui.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/MockResolutionGui.java index de9489f576e..6c5930428b3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/MockResolutionGui.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/MockResolutionGui.java @@ -8,9 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing.parsers; +package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.util.Collection; + import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate.ContentType; import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate.IConflictResolvingGui; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java index a9f8f9d6b22..69c199c399f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java @@ -8,9 +8,8 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing.parsers; +package org.eclipse.osee.framework.skynet.core.importing.parsers; -import org.eclipse.osee.framework.skynet.core.importing.parsers.OutlineResolution; 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/test/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 8495032f2a6..957d31a05ac 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/ParsersSuite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ParsersSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing.parsers; +package org.eclipse.osee.framework.skynet.core.importing.parsers; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java index 23bc4d030a9..edd94cba1ce 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing.parsers; +package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.io.IOException; import java.io.InputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.eclipse.osee.framework.core.operation.StringOperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate; 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/test/importing/parsers/WordMlResolutionGuiTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java index 994f2df2f11..b5d95fbbba7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMlResolutionGuiTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java @@ -8,21 +8,21 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing.parsers; +package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.io.IOException; import java.io.InputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Assert; + 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.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; -import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate; import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate.ContentType; import org.junit.After; +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/test/importing/parsers/WordOutlineTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineTest.java index cba63ce02b1..032b6329d7f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordOutlineTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.importing.parsers; +package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.io.IOException; import java.io.InputStream; @@ -17,12 +17,12 @@ import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Assert; + 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; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/numberEmbeddedInTheContent.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/numberEmbeddedInTheContent.xml index e8bdce1050d..e8bdce1050d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/numberEmbeddedInTheContent.xml +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/numberEmbeddedInTheContent.xml diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineNameNumberAndContent.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameNumberAndContent.xml index b6b22c2e785..b6b22c2e785 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineNameNumberAndContent.xml +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameNumberAndContent.xml diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineNameWithNumber.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameWithNumber.xml index d5a27b1bf6c..d5a27b1bf6c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineNameWithNumber.xml +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineNameWithNumber.xml diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineResolutionCausingInput_no_toc_formatted.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineResolutionCausingInput_no_toc_formatted.xml index 9881a69e4bf..9881a69e4bf 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/outlineResolutionCausingInput_no_toc_formatted.xml +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/outlineResolutionCausingInput_no_toc_formatted.xml diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/tableOfContentsHyperlinkTest.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/tableOfContentsHyperlinkTest.xml index 82959e0ff8a..82959e0ff8a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/tableOfContentsHyperlinkTest.xml +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/tableOfContentsHyperlinkTest.xml diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java index c73216b7ca3..fc4ca82a36f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java @@ -9,11 +9,10 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.linking; -import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.skynet.core.linking.OseeLinkParser; +import org.junit.Assert; /** * @author Jeff C. Phillips diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/WordMlLinkHandlerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandlerTest.java index 0e781c49e93..ba61d1c800c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/WordMlLinkHandlerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandlerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.linking; import java.io.BufferedInputStream; import java.io.IOException; @@ -17,6 +17,7 @@ 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.data.SystemUser; @@ -25,8 +26,6 @@ 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; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/DataFactory.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java index 4c5a03598c3..e2d66e89079 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/DataFactory.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java @@ -8,12 +8,13 @@ * Contributors: *public static final CoreAttributeTypes Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.mocks; +package org.eclipse.osee.framework.skynet.core.mocks; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Random; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.ModificationType; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockIArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java index f8d9d7d95ec..173f22492fd 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockIArtifact.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java @@ -8,10 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.mocks; +package org.eclipse.osee.framework.skynet.core.mocks; import java.util.Collections; import java.util.List; + import org.eclipse.osee.framework.core.data.NamedIdentity; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.RelationTypeSide; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockLinker.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockLinker.java index 433a133145c..801c7e90319 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockLinker.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockLinker.java @@ -8,7 +8,7 @@ * Contributors: *public static final CoreAttributeTypes Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.mocks; +package org.eclipse.osee.framework.skynet.core.mocks; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockTransactionEventListener.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockTransactionEventListener.java index a52ea9b2d81..853064cbac4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/mocks/MockTransactionEventListener.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockTransactionEventListener.java @@ -8,7 +8,7 @@ * Contributors: *public static final CoreAttributeTypes Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.mocks; +package org.eclipse.osee.framework.skynet.core.mocks; 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/test/relation/CrossBranchLinkTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java index 21923316030..5a981be75a4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchLinkTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.junit.Assert; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -30,6 +31,7 @@ import org.eclipse.osee.framework.skynet.core.relation.crossbranch.CrossBranchLi import org.eclipse.osee.support.test.util.DemoSawBuilds; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchRelationLinkTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchRelationLinkTest.java index c3429eb9c6a..d456e269dd7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchRelationLinkTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchRelationLinkTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; 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.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.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/test/relation/LoadDeletedRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/LoadDeletedRelationTest.java index 1a5baa0ac93..4e61b66870b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/LoadDeletedRelationTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/LoadDeletedRelationTest.java @@ -8,11 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; + import java.util.List; + import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -21,9 +23,7 @@ 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.relation.RelationLink; -import org.eclipse.osee.framework.skynet.core.relation.RelationManager; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.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/test/relation/RelationCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java index b5d1ee28870..11562bc1c87 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java @@ -8,11 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.ModificationType; @@ -23,12 +22,11 @@ import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.eclipse.osee.framework.jdk.core.util.GUID; -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.test.mocks.DataFactory; -import org.eclipse.osee.framework.skynet.core.test.mocks.MockLinker; +import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; +import org.eclipse.osee.framework.skynet.core.mocks.MockLinker; import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationFilterUtilTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java index 97a8714a804..54eda19cb65 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationFilterUtilTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationFilterUtilTest.java @@ -8,20 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.RelationType; -import org.eclipse.osee.framework.skynet.core.relation.RelationFilterUtil; +import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; import org.eclipse.osee.framework.skynet.core.relation.RelationFilterUtil.RelationMatcher; -import org.eclipse.osee.framework.skynet.core.relation.RelationLink; -import org.eclipse.osee.framework.skynet.core.test.mocks.DataFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java index ca0147b9824..7516c6b8813 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTestSuite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTestSuite.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; -import org.eclipse.osee.framework.skynet.core.test.relation.order.RelationOrderTestSuite; -import org.eclipse.osee.framework.skynet.core.test.relation.sorters.RelationSorterTestSuite; +import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderTestSuite; +import org.eclipse.osee.framework.skynet.core.relation.sorters.RelationSorterTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java index 353161eb464..b54df44355a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java @@ -9,7 +9,7 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation; +package org.eclipse.osee.framework.skynet.core.relation; import java.util.ArrayList; import java.util.Arrays; @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Random; -import org.junit.Assert; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationType; @@ -40,15 +40,15 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter; +import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; +import org.eclipse.osee.framework.skynet.core.mocks.MockIArtifact; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationOrderAccessor; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider; -import org.eclipse.osee.framework.skynet.core.test.mocks.DataFactory; -import org.eclipse.osee.framework.skynet.core.test.mocks.MockIArtifact; import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java index 917c21205a4..5dfb35bd39e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java @@ -8,13 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.order; +package org.eclipse.osee.framework.skynet.core.relation.order; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map.Entry; import java.util.Random; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; @@ -32,9 +33,7 @@ import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.skynet.core.relation.order.IRelationOrderAccessor; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; -import org.eclipse.osee.framework.skynet.core.test.mocks.DataFactory; +import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; import org.eclipse.osee.framework.skynet.core.types.IArtifact; 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/test/relation/order/RelationOrderMergeUtilityTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtilityTest.java index 9eba87df69b..cf6e9d9be30 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtilityTest.java @@ -8,12 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.order; +package org.eclipse.osee.framework.skynet.core.relation.order; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Artifact; import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED; -import static org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil.createSimpleArtifact; -import static org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil.createSimpleArtifacts; import java.util.List; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationTypeSide; @@ -29,9 +27,7 @@ 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.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -66,7 +62,8 @@ public class RelationOrderMergeUtilityTest { @Test public void testTrivialMerge() throws OseeCoreException { Artifact parent = FrameworkTestUtil.createSimpleArtifact(Artifact, "Parent", destBranch); - Artifact[] children = createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); + Artifact[] children = + FrameworkTestUtil.createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); for (int i = 0; i < 5; i++) { setAsChild(parent, children[i], ascOrder); @@ -82,7 +79,8 @@ public class RelationOrderMergeUtilityTest { @Test public void testOrderMerge() throws OseeCoreException { Artifact destParent = FrameworkTestUtil.createSimpleArtifact(Artifact, "Parent", destBranch); - Artifact[] destChildren = createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); + Artifact[] destChildren = + FrameworkTestUtil.createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); for (int i = 0; i <= 3; i++) { setAsChild(destParent, destChildren[i], USER_DEFINED); @@ -111,10 +109,12 @@ public class RelationOrderMergeUtilityTest { @Test public void testStrategyMerge() throws OseeCoreException { - Artifact ascParent = createSimpleArtifact(Artifact, "Parent", destBranch); - Artifact[] ascRelatives = createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); - Artifact descParent = createSimpleArtifact(Artifact, "Parent", destBranch); - Artifact[] descRelatives = createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); + Artifact ascParent = FrameworkTestUtil.createSimpleArtifact(Artifact, "Parent", destBranch); + Artifact[] ascRelatives = + FrameworkTestUtil.createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); + Artifact descParent = FrameworkTestUtil.createSimpleArtifact(Artifact, "Parent", destBranch); + Artifact[] descRelatives = + FrameworkTestUtil.createSimpleArtifacts(Artifact, 5, "Relative", destBranch).toArray(new Artifact[0]); for (int i = 0; i < 5; i++) { setAsChild(ascParent, ascRelatives[i], ascOrder); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java index 88ed9719f47..8bc87e57de9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java @@ -8,15 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.order; +package org.eclipse.osee.framework.skynet.core.relation.order; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; + import org.eclipse.core.runtime.Assert; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderMerger; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java index e1f60af75a7..4d080109b03 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java @@ -8,20 +8,19 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.order; +package org.eclipse.osee.framework.skynet.core.relation.order; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map.Entry; -import org.junit.Assert; + import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderParser; import org.eclipse.osee.framework.skynet.core.types.IArtifact; +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/test/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 20daefde5a8..a5725166de4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderTestSuite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderTestSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.order; +package org.eclipse.osee.framework.skynet.core.relation.order; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java index 90f42af5d22..536ae9e2798 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java @@ -8,22 +8,22 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.order; +package org.eclipse.osee.framework.skynet.core.relation.order; import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC; import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC; import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.UNORDERED; import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED; + import java.util.Arrays; import java.util.List; + import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider; import org.eclipse.osee.framework.skynet.core.relation.sorters.LexicographicalRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.sorters.UnorderedRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.sorters.UserDefinedRelationSorter; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java index eca54c709e8..b7297488cac 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java @@ -8,24 +8,22 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.sorters; +package org.eclipse.osee.framework.skynet.core.relation.sorters; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.junit.Assert; + import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; -import org.eclipse.osee.framework.skynet.core.relation.sorters.LexicographicalRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.sorters.LexicographicalRelationSorter.SortMode; -import org.eclipse.osee.framework.skynet.core.relation.sorters.UnorderedRelationSorter; -import org.eclipse.osee.framework.skynet.core.relation.sorters.UserDefinedRelationSorter; -import org.eclipse.osee.framework.skynet.core.test.mocks.DataFactory; import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTestSuite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTestSuite.java index e7b0ccfe34e..d73401cd35f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTestSuite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTestSuite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.relation.sorters; +package org.eclipse.osee.framework.skynet.core.relation.sorters; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictDefinition.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java index bdab263b32f..b93721477e1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictDefinition.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictDefinition.java @@ -8,12 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +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.test.cases.ConflictTestManager.AttributeValue; +import org.eclipse.osee.framework.skynet.core.revision.ConflictTestManager.AttributeValue; class ConflictDefinition { final Collection<AttributeValue> values = new HashSet<AttributeValue>(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTest.java index a0eeee50897..f5ede90e4f9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTest.java @@ -8,14 +8,16 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.revision; import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import java.util.Collection; + import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.core.enums.BranchState; @@ -34,7 +36,6 @@ 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.support.test.util.TestUtil; 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/test/cases/ConflictTestManager.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java index bc3cab82526..3a226c2bef1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java @@ -9,12 +9,13 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.revision; import java.util.Collection; import java.util.Date; import java.util.LinkedList; import java.util.List; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.BranchArchivedState; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java index bf013b72053..78112e690e1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java @@ -8,13 +8,15 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.revision; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import java.util.Collection; import java.util.LinkedList; + import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.core.client.ClientSessionManager; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java deleted file mode 100644 index 2d0c71e6f9e..00000000000 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java +++ /dev/null @@ -1,113 +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.test; - -import static org.junit.Assert.assertTrue; -import org.eclipse.osee.framework.core.client.ClientSessionManager; -import org.eclipse.osee.framework.skynet.core.test.artifact.ArtifactTest; -import org.eclipse.osee.framework.skynet.core.test.artifact.AttributePurgeTest; -import org.eclipse.osee.framework.skynet.core.test.branch.BranchTestSuite; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactLoaderTest; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactPurgeTest; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestDemo; -import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactTypeInheritanceTest; -import org.eclipse.osee.framework.skynet.core.test.cases.Artifact_getLastModified; -import org.eclipse.osee.framework.skynet.core.test.cases.Artifact_setAttributeValues; -import org.eclipse.osee.framework.skynet.core.test.cases.BranchPurgeTest; -import org.eclipse.osee.framework.skynet.core.test.cases.BranchStateTest; -import org.eclipse.osee.framework.skynet.core.test.cases.ChangeManagerTest; -import org.eclipse.osee.framework.skynet.core.test.cases.ConflictTest; -import org.eclipse.osee.framework.skynet.core.test.cases.CsvArtifactTest; -import org.eclipse.osee.framework.skynet.core.test.cases.DuplicateHridTest; -import org.eclipse.osee.framework.skynet.core.test.cases.NativeArtifactTest; -import org.eclipse.osee.framework.skynet.core.test.cases.PurgeTransactionTest; -import org.eclipse.osee.framework.skynet.core.test.cases.RelationDeletionTest; -import org.eclipse.osee.framework.skynet.core.test.cases.RelationOrderingTest; -import org.eclipse.osee.framework.skynet.core.test.cases.ReplaceWithAttributeTest; -import org.eclipse.osee.framework.skynet.core.test.cases.SevereLogMonitorTest; -import org.eclipse.osee.framework.skynet.core.test.cases.StaticIdManagerTest; -import org.eclipse.osee.framework.skynet.core.test.cases.TransactionManagerTest; -import org.eclipse.osee.framework.skynet.core.test.event.ArtifactEventFiltersTest; -import org.eclipse.osee.framework.skynet.core.test.event.ArtifactEventLoopbackTest; -import org.eclipse.osee.framework.skynet.core.test.event.ArtifactEventTest; -import org.eclipse.osee.framework.skynet.core.test.event.BranchEventFiltersTest; -import org.eclipse.osee.framework.skynet.core.test.event.BranchEventLoopbackTest; -import org.eclipse.osee.framework.skynet.core.test.event.BranchEventTest; -import org.eclipse.osee.framework.skynet.core.test.event.EventBasicGuidArtifactTest; -import org.eclipse.osee.framework.skynet.core.test.event.EventBasicGuidRelationTest; -import org.eclipse.osee.framework.skynet.core.test.event.EventChangeTypeBasicGuidArtifactTest; -import org.eclipse.osee.framework.skynet.core.test.event.TransactionEventLocalTest; -import org.eclipse.osee.framework.skynet.core.test.event.TransactionEventRemoteTest; -import org.eclipse.osee.framework.skynet.core.test.importing.ImportingSuite; -import org.eclipse.osee.framework.skynet.core.test.importing.parsers.ParsersSuite; -import org.eclipse.osee.framework.skynet.core.test.relation.CrossBranchLinkTest; -import org.eclipse.osee.framework.skynet.core.test.relation.RelationTestSuite; -import org.eclipse.osee.framework.skynet.core.test.user.UserManagerTest; -import org.eclipse.osee.framework.skynet.core.test.word.UpdateBookmarkIdTest; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - UserManagerTest.class, - ArtifactTest.class, - ReplaceWithAttributeTest.class, - AttributePurgeTest.class, - CrossBranchLinkTest.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, - TransactionManagerTest.class, - BranchTestSuite.class, - RelationTestSuite.class, - ArtifactTypeInheritanceTest.class, - ArtifactPurgeTest.class, - BranchPurgeTest.class, - PurgeTransactionTest.class, - Artifact_setAttributeValues.class, - Artifact_getLastModified.class, - CsvArtifactTest.class, - NativeArtifactTest.class, - ConflictTest.class, - ChangeManagerTest.class, - SevereLogMonitorTest.class, - RelationDeletionTest.class, - StaticIdManagerTest.class, - BranchStateTest.class, - DuplicateHridTest.class, - RelationOrderingTest.class, - ImportingSuite.class, - ParsersSuite.class}) -/** - * @author Donald G. Dunne - */ -public class FrameworkCore_Demo_Suite { - @BeforeClass - public static void setUp() throws Exception { - assertTrue("Demo Application Server must be running.", - ClientSessionManager.getAuthenticationProtocols().contains("demo")); - assertTrue("Client must authenticate using demo protocol", - ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); - } - -} diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManagerTest.java index 6db39f9f624..291a04b3b0c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManagerTest.java @@ -8,20 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.transaction; import static org.junit.Assert.assertFalse; + import java.util.List; -import org.junit.Assert; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.model.TransactionRecord; 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.SkynetTransaction; -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/test/util/FrameworkTestUtil.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java index e749893873f..76b73ec1356 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/util/FrameworkTestUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java @@ -8,9 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.util; +package org.eclipse.osee.framework.skynet.core.util; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; + import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -20,6 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.BranchArchivedState; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/CsvArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java index 98497515f1f..41834a23aa9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/CsvArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java @@ -9,17 +9,18 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.utility; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; + import java.util.Collection; + 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.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.skynet.core.utility.CsvArtifact; 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/test/cases/OseeEnumerationValidationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/validation/OseeEnumerationValidationTest.java index 5b9c1389970..391644300e8 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeEnumerationValidationTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/validation/OseeEnumerationValidationTest.java @@ -9,11 +9,13 @@ * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.cases; +package org.eclipse.osee.framework.skynet.core.validation; 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; @@ -23,8 +25,6 @@ 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; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/word/UpdateBookmarkIdTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java index c8990a232c5..e811e87f565 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/word/UpdateBookmarkIdTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java @@ -8,10 +8,9 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.test.word; +package org.eclipse.osee.framework.skynet.core.word; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.skynet.core.word.UpdateBookmarkIds; import org.junit.Assert; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF index 9fdee118f39..5d1d2b45203 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Import-Package: com.lowagie.text.pdf;version="2.1.7", org.eclipse.osee.framework.core.model.test.mocks, org.eclipse.osee.framework.core.test.mocks, org.eclipse.osee.framework.jdk.core.util.windows, - org.eclipse.osee.framework.skynet.core.test.util, + org.eclipse.osee.framework.skynet.core.util, org.eclipse.osee.support.test.util Require-Bundle: org.junit diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/blam/operation/EmailGroupsBlamTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/blam/operation/EmailGroupsBlamTest.java index fbae722a1fc..9583d13f6f8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/blam/operation/EmailGroupsBlamTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/blam/operation/EmailGroupsBlamTest.java @@ -15,6 +15,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; + import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient; import org.eclipse.osee.framework.core.data.OseeServerContext; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -26,7 +27,7 @@ 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.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.blam.operation.EmailGroupsBlam; import org.eclipse.osee.framework.ui.skynet.blam.operation.EmailGroupsData; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java index 07c424f5048..a20f967827e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.logging.Level; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -23,7 +24,7 @@ import org.eclipse.osee.framework.logging.IHealthStatus; 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.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.ui.skynet.render.ITemplateRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java index d68d2272828..ea0f94f2cf6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.test.cases; import static org.junit.Assert.assertFalse; + import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,6 +21,7 @@ import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.Collections; import java.util.List; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -39,7 +41,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact; import org.eclipse.osee.framework.skynet.core.event.model.EventModType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java index d59be49cb02..2c7bb540bb2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java @@ -12,8 +12,10 @@ package org.eclipse.osee.framework.ui.skynet.test.cases; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.io.InputStream; + import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -22,7 +24,7 @@ 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.linking.LinkType; import org.eclipse.osee.framework.skynet.core.linking.WordMlLinkHandler; -import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil; +import org.eclipse.osee.framework.skynet.core.util.FrameworkTestUtil; import org.eclipse.osee.framework.skynet.core.word.WordUtil; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.support.test.util.DemoSawBuilds; |