Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-03-13 21:20:10 -0400
committerRyan D. Brooks2012-03-13 21:20:10 -0400
commit19e6edbe334305b3fd6c48a7b390cf6dde52f4fe (patch)
tree083b3f9d78380fee1dfacc7ffc9f4ddf39a1d51f
parent2a7d47cee158aee6375ac8d322421db1a12fbd22 (diff)
downloadorg.eclipse.osee-19e6edbe334305b3fd6c48a7b390cf6dde52f4fe.tar.gz
org.eclipse.osee-19e6edbe334305b3fd6c48a7b390cf6dde52f4fe.tar.xz
org.eclipse.osee-19e6edbe334305b3fd6c48a7b390cf6dde52f4fe.zip
feature[ats_VVMH0]: Remove use of Eclipse-ExtensibleAPI from server bundles
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java13
-rw-r--r--plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java14
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java14
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java9
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java16
-rw-r--r--plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.database.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/DatabaseCoreTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/DatabaseTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.database/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java5
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java6
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/LifecycleOperationTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/Asserts.java (renamed from plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/Asserts.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/DatabaseIntegrityTest.java13
41 files changed, 53 insertions, 154 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 15c0c94be3..fda50796c2 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
@@ -30,13 +30,9 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.core.message.test,
org.eclipse.osee.framework.core.model,
- org.eclipse.osee.framework.core.test,
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.database.init,
- org.eclipse.osee.framework.database.test,
- org.eclipse.osee.framework.jdk.core,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.jdk.core.util.io,
org.eclipse.osee.framework.lifecycle.test,
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java
index ca42aa0bd8..7ebd718a3e 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java
@@ -10,11 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.client.integration.tests.suite;
-import org.eclipse.osee.framework.core.message.test.AllCoreMessageTestSuite;
-import org.eclipse.osee.framework.core.model.AllCoreModelTestSuite;
-import org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite;
-import org.eclipse.osee.framework.database.test.DatabaseTestSuite;
-import org.eclipse.osee.framework.jdk.core.JdkCoreTestSuite;
import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.lifecycle.test.AllLifecycleTestSuite;
import org.junit.AfterClass;
@@ -23,13 +18,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({
- JdkCoreTestSuite.class,
- DatabaseTestSuite.class,
- FrameworkCoreTestSuite.class,
- AllCoreModelTestSuite.class,
- AllCoreMessageTestSuite.class,
- AllLifecycleTestSuite.class,})
+@Suite.SuiteClasses({AllLifecycleTestSuite.class,})
public class CoreRuntimeFeatureTestsSuite {
@BeforeClass
public static void setUp() throws Exception {
diff --git a/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF
index 6677842489..86ba585d01 100644
--- a/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.access.test/META-INF/MANIFEST.MF
@@ -8,5 +8,4 @@ Fragment-Host: org.eclipse.osee.framework.access
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
Export-Package: org.eclipse.osee.framework.access.test
-Import-Package: org.eclipse.osee.framework.core.model.access.exp,
- org.eclipse.osee.framework.core.test.mocks
+Import-Package: org.eclipse.osee.framework.core.model.access.exp
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF
index 6795e025c5..4d01967dab 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF
@@ -7,8 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.framework.core.message
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
-Export-Package: org.eclipse.osee.framework.core.message.test,
- org.eclipse.osee.framework.core.message.test.mocks
Import-Package: org.eclipse.osee.framework.core.model.change,
org.eclipse.osee.framework.core.model.mocks,
org.eclipse.osee.framework.jdk.core.util
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java
index d5d2e8245e..14cccaf0ac 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java
@@ -12,9 +12,6 @@ package org.eclipse.osee.framework.core.message.test;
import org.eclipse.osee.framework.core.message.test.data.DataTestSuite;
import org.eclipse.osee.framework.core.message.test.translation.TranslationTestSuite;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -24,14 +21,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class AllCoreMessageTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- System.out.println("\nBegin " + AllCoreMessageTestSuite.class.getSimpleName());
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- System.out.println("End " + AllCoreMessageTestSuite.class.getSimpleName() + "\n\n");
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.message/META-INF/MANIFEST.MF
index deba46cec0..bf4e6e68c6 100644
--- a/plugins/org.eclipse.osee.framework.core.message/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.message/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.osee.framework.core.message
Bundle-ActivationPolicy: lazy
-Eclipse-ExtensibleAPI: true
Service-Component: OSGI-INF/*.xml
Require-Bundle: org.eclipse.core.runtime
Import-Package: org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java
index 0e07d3802e..0c71ee52aa 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/AllCoreModelTestSuite.java
@@ -15,9 +15,6 @@ import org.eclipse.osee.framework.core.model.cache.CacheTestSuite;
import org.eclipse.osee.framework.core.model.change.ChangeTestSuite;
import org.eclipse.osee.framework.core.model.fields.FieldTestSuite;
import org.eclipse.osee.framework.core.model.type.TypeTestSuite;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -32,14 +29,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class AllCoreModelTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- System.out.println("\n\nBegin " + AllCoreModelTestSuite.class.getSimpleName());
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- System.out.println("End " + AllCoreModelTestSuite.class.getSimpleName());
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF
index 3db7c72fd3..ab0c2176e2 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF
@@ -7,8 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.framework.core.server
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
-Export-Package: org.eclipse.osee.framework.core.server.test,
- org.eclipse.osee.framework.core.server.test.mocks
Import-Package: org.eclipse.osee.framework.core.model.cache,
org.eclipse.osee.framework.core.model.mocks,
org.eclipse.osee.framework.core.model.type
diff --git a/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF
index 3eb2baabff..acb832714f 100644
--- a/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.test/META-INF/MANIFEST.MF
@@ -7,7 +7,5 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.framework.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
-Export-Package: org.eclipse.osee.framework.core.test,
- org.eclipse.osee.framework.core.test.mocks
Import-Package: org.eclipse.osee.framework.jdk.core.text,
org.eclipse.osee.framework.jdk.core.text.tool
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java
index 806bb3ee0a..6de5b86971 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java
@@ -16,8 +16,6 @@ import org.eclipse.osee.framework.core.test.exception.ExceptionTestSuite;
import org.eclipse.osee.framework.core.test.internal.InternalCoreTestSuite;
import org.eclipse.osee.framework.core.test.ops.OpsTestSuite;
import org.eclipse.osee.framework.core.test.util.UtilCoreTestSuite;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -33,8 +31,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class FrameworkCoreTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java
index 8ad09937f3..46102064b1 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.test.enums;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -26,8 +24,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class EnumsTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java
index ddc00a7afd..c7addf1d17 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.test.exception;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -21,8 +19,5 @@ import org.junit.runners.Suite;
* @author Ryan D. Brooks
*/
public class ExceptionTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java
index b7cd587055..5a17e8d5c9 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.test.internal;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -25,8 +23,5 @@ SingletonServiceBinderTest.class, //
* @author Roberto E. Escobar
*/
public class InternalCoreTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
-}
+ // Test Suite
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java
index de05a0d0bf..8539d2ebcb 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.test.ops;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -21,8 +19,5 @@ import org.junit.runners.Suite;
* @author Ryan D. Brooks
*/
public class OpsTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java
index f6dfc0b5cc..874943179c 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.enums.OperationBehavior;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.test.mocks.Asserts;
+import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.test.mocks.MockAbstractOperation;
import org.junit.Assert;
import org.junit.Test;
@@ -32,7 +32,7 @@ public class AbstractOperationTest {
@Test
public void testAbstractOperationOk() {
IOperation operation = new MockAbstractOperation();
- IStatus status = Asserts.testOperation(operation, IStatus.OK);
+ IStatus status = testOperation(operation, IStatus.OK);
Assert.assertEquals(Status.OK_STATUS, status);
}
@@ -40,7 +40,7 @@ public class AbstractOperationTest {
public void testAbstractOperationWithOneError() {
Exception expection = new Exception("What did you do?!");
IOperation operation = new MockAbstractOperation("Test Status", expection);
- IStatus status = Asserts.testOperation(operation, IStatus.ERROR);
+ IStatus status = testOperation(operation, IStatus.ERROR);
Assert.assertEquals(expection.toString(), status.getMessage());
}
@@ -48,7 +48,7 @@ public class AbstractOperationTest {
public void testCompositeOperationOk() {
CompositeOperation compositeOperation =
new CompositeOperation("two oks", "test", new MockAbstractOperation(), new MockAbstractOperation());
- IStatus status = Asserts.testOperation(compositeOperation, IStatus.OK);
+ IStatus status = testOperation(compositeOperation, IStatus.OK);
Assert.assertEquals(0, status.getChildren().length);
}
@@ -61,10 +61,16 @@ public class AbstractOperationTest {
CompositeOperation compositeOperation =
new CompositeOperation("two exceptions", "test", OperationBehavior.ContinueOnError, operation1, operation2);
- IStatus status = Asserts.testOperation(compositeOperation, IStatus.ERROR);
+ IStatus status = testOperation(compositeOperation, IStatus.ERROR);
Assert.assertEquals(MultiStatus.class, status.getClass());
Assert.assertEquals(exception1.toString(), status.getChildren()[0].getMessage());
Assert.assertEquals(exception2.toString(), status.getChildren()[1].getMessage());
}
+
+ private static IStatus testOperation(IOperation operation, int expectedSeverity) {
+ IStatus status = Operations.executeWork(operation);
+ Assert.assertEquals(status.toString(), expectedSeverity, status.getSeverity());
+ return status;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
index 110de6051a..c9d99244ca 100644
--- a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Import-Package: org.apache.commons.httpclient,
org.eclipse.osgi.framework.console,
org.osgi.framework,
org.osgi.util.tracker
-Eclipse-ExtensibleAPI: true
Export-Package: org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
diff --git a/plugins/org.eclipse.osee.framework.database.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.database.test/META-INF/MANIFEST.MF
index 7f96b32569..1eb8366040 100644
--- a/plugins/org.eclipse.osee.framework.database.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.database.test/META-INF/MANIFEST.MF
@@ -7,4 +7,3 @@ Bundle-Vendor: Eclipse.org
Fragment-Host: org.eclipse.osee.framework.database
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
-Export-Package: org.eclipse.osee.framework.database.test
diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/DatabaseCoreTestSuite.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/DatabaseCoreTestSuite.java
index 370ae07a7c..b8be011396 100644
--- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/DatabaseCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/DatabaseCoreTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.database.core;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -28,8 +26,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class DatabaseCoreTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/DatabaseTestSuite.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/DatabaseTestSuite.java
index cdc14ebaba..8cbda09e0c 100644
--- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/DatabaseTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/DatabaseTestSuite.java
@@ -11,8 +11,6 @@
package org.eclipse.osee.framework.database.test;
import org.eclipse.osee.framework.database.core.DatabaseCoreTestSuite;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -22,8 +20,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class DatabaseTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.database/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.database/META-INF/MANIFEST.MF
index b4a860f87d..b868bd69f4 100644
--- a/plugins/org.eclipse.osee.framework.database/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.database/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Export-Package: org.eclipse.osee.framework.database,
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.database.operation
Bundle-ActivationPolicy: lazy
-Eclipse-ExtensibleAPI: true
DynamicImport-Package: *
Bundle-Vendor: Eclipse Open System Engineering Environment
Import-Package: org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
index 6532aeefdc..86b9e4d99e 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
@@ -6,7 +6,4 @@ Bundle-Version: 0.9.9.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.framework.jdk.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.osee.framework.jdk.core,
- org.eclipse.osee.framework.jdk.core.mock,
- org.eclipse.osee.framework.jdk.core.type
Require-Bundle: org.junit
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java
index 063309f480..583a99a16c 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java
@@ -14,8 +14,6 @@ import org.eclipse.osee.framework.jdk.core.rules.JdkCoreRuleTestSuite;
import org.eclipse.osee.framework.jdk.core.text.JdkCoreTextTestSuite;
import org.eclipse.osee.framework.jdk.core.type.JdkCoreTypeTestSuite;
import org.eclipse.osee.framework.jdk.core.util.JdkCoreUtilTestSuite;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -30,8 +28,5 @@ import org.junit.runners.Suite;
JdkCoreTypeTestSuite.class,
JdkCoreUtilTestSuite.class,})
public class JdkCoreTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java
index 3753bdbfdb..7714c48a48 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java
@@ -21,8 +21,5 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({WordMLNewLineMakerRuleTest.class})
public class JdkCoreRuleTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java
index 70c65f6e9a..71376af17a 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.jdk.core.util;
import org.eclipse.osee.framework.jdk.core.util.io.IoTestSuite;
import org.eclipse.osee.framework.jdk.core.util.xml.XmlTestSuite;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -32,8 +31,5 @@ import org.junit.runners.Suite;
StringsTest.class,
UrlQueryTest.class})
public class JdkCoreUtilTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java
index 1d57c8e025..d973a0b55a 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.jdk.core.util.io;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.jdk.core.util.io.xml.IoXmlTestSuite;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -27,8 +25,5 @@ import org.junit.runners.Suite;
//@formatter:on
})
public class IoTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java
index 72125d0e74..9f5ac0242a 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.jdk.core.util.io.xml;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -22,8 +20,5 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({ //
ExcelXmlWriterTest.class})
public class IoXmlTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java
index 053431fcda..2621bfbda4 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.jdk.core.util.xml;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -25,8 +23,5 @@ import org.junit.runners.Suite;
//@formatter:on
})
public class XmlTestSuite {
- @BeforeClass
- public static void setUp() throws Exception {
- OseeProperties.setIsInTest(true);
- }
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF
index fd1a5e5d75..286114c831 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: OSEE JDK Core Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.osee.framework.jdk.core
Bundle-Version: 0.9.9.qualifier
-Eclipse-ExtensibleAPI: true
Bundle-Vendor: Eclipse Open System Engineering Environment
Export-Package: org.eclipse.osee.framework.jdk.core.collection.tree,
org.eclipse.osee.framework.jdk.core.directory,
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF
index ad0799f437..5a78596f9f 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/META-INF/MANIFEST.MF
@@ -8,4 +8,3 @@ Fragment-Host: org.eclipse.osee.framework.lifecycle
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
Export-Package: org.eclipse.osee.framework.lifecycle.test
-Import-Package: org.eclipse.osee.framework.core.test.mocks
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/LifecycleOperationTest.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/LifecycleOperationTest.java
index d8c795947a..bce97510cb 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/LifecycleOperationTest.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/LifecycleOperationTest.java
@@ -14,12 +14,13 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.test.mocks.Asserts;
+import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;
import org.eclipse.osee.framework.lifecycle.ILifecycleService;
import org.eclipse.osee.framework.lifecycle.LifecycleServiceImpl;
import org.eclipse.osee.framework.lifecycle.test.mock.MockHandler;
import org.eclipse.osee.framework.lifecycle.test.mock.StrictMockLifecycePoint;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -37,7 +38,7 @@ public class LifecycleOperationTest {
service.addHandler(StrictMockLifecycePoint.TYPE, new MockHandler());
IOperation operation = new MockLifecycleOperation(service, "a string", "b string");
- Asserts.testOperation(operation, IStatus.OK);
+ testOperation(operation, IStatus.OK);
}
private static class MockLifecycleOperation extends AbstractLifecycleOperation {
@@ -52,4 +53,9 @@ public class LifecycleOperationTest {
}
}
+ private static IStatus testOperation(IOperation operation, int expectedSeverity) {
+ IStatus status = Operations.executeWork(operation);
+ Assert.assertEquals(status.toString(), expectedSeverity, status.getSeverity());
+ return status;
+ }
}
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 dee6881a42..5278de5d23 100644
--- a/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.logging/META-INF/MANIFEST.MF
@@ -7,5 +7,4 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.osee.framework.jdk.core.util
Export-Package: org.eclipse.osee.framework.logging
-Eclipse-ExtensibleAPI: true
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF
index b3c56a8e0a..4763f71a72 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF
@@ -15,4 +15,3 @@ Import-Package: org.eclipse.osee.framework.core.exception,
org.osgi.framework,
org.osgi.util.tracker
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.osee.framework.resource.management.test
diff --git a/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF
index 047a639673..59ede195ea 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Management Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.osee.framework.resource.management
Bundle-Version: 0.9.9.qualifier
-Eclipse-ExtensibleAPI: true
Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.jdk.core.type,
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 c48a2f6ddb..2aa2e4c135 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
@@ -30,7 +30,6 @@ Import-Package: org.apache.commons.lang;version="2.4.0",
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.model.mocks,
- org.eclipse.osee.framework.core.test.mocks,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.skynet.core.event,
org.eclipse.osee.support.test.util
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
index fa31c1d993..c91b6a001d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
@@ -27,13 +27,13 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.core.test.mocks.Asserts;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.operation.FinishUpdateBranchOperation;
import org.eclipse.osee.framework.skynet.core.artifact.operation.UpdateBranchOperation;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.artifact.update.ConflictResolverOperation;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
+import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.Assert;
import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
index 6c00c0470e..9efb331b98 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
@@ -24,9 +24,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.NullOperationLogger;
import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.core.test.mocks.Asserts;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.operation.PurgeUnusedBackingDataAndTransactions;
+import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
import org.eclipse.osee.framework.skynet.core.mocks.DbTestUtil;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java
index b37e13872a..3e122b98e3 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/TransactionEventTest.java
@@ -16,7 +16,6 @@ import java.util.Collection;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.test.mocks.Asserts;
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;
@@ -25,6 +24,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionChange;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventType;
+import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
import org.eclipse.osee.framework.skynet.core.mocks.MockTransactionEventListener;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/Asserts.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/Asserts.java
index 961dacac30..a93a7e9d26 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/Asserts.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/Asserts.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.core.test.mocks;
+package org.eclipse.osee.framework.skynet.core.mocks;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osee.framework.core.operation.IOperation;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java
index 09966a8f92..2fd1b73d66 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/DeletionTest.java
@@ -24,13 +24,13 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
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.database.core.IOseeStatement;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
+import org.eclipse.osee.framework.skynet.core.mocks.Asserts;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.utility.PurgeTransactionOperationWithListener;
import org.junit.Before;
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 c46e2aba3f..46684e9793 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
@@ -12,7 +12,6 @@ Import-Package: com.lowagie.text.pdf;version="2.1.7",
org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.model.mocks,
- org.eclipse.osee.framework.core.test.mocks,
org.eclipse.osee.framework.jdk.core.util.windows,
org.eclipse.osee.framework.skynet.core.util,
org.eclipse.osee.support.test.util
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/DatabaseIntegrityTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/DatabaseIntegrityTest.java
index f89d786a8d..756420122f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/DatabaseIntegrityTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/DatabaseIntegrityTest.java
@@ -15,10 +15,12 @@ import static org.junit.Assert.assertNotNull;
import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.test.mocks.Asserts;
+import org.eclipse.osee.framework.core.operation.IOperation;
+import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOperation;
import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOpsExtensionManager;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,7 +47,7 @@ public class DatabaseIntegrityTest {
assertNotNull(operation);
operation.setFixOperationEnabled(false);
- Asserts.testOperation(operation, IStatus.OK);
+ testOperation(operation, IStatus.OK);
int totalItemsToFix = operation.getItemsToFixCount();
assertEquals(String.format("Error [%s]: found [%s] items", operation.getName(), totalItemsToFix), 0,
@@ -63,4 +65,11 @@ public class DatabaseIntegrityTest {
}
return data;
}
+
+ public static IStatus testOperation(IOperation operation, int expectedSeverity) {
+ IStatus status = Operations.executeWork(operation);
+ Assert.assertEquals(status.toString(), expectedSeverity, status.getSeverity());
+ return status;
+ }
+
}

Back to the top