summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2011-04-06 18:52:01 (EDT)
committer Ryan D. Brooks2011-04-06 18:52:01 (EDT)
commit02aa6e385ce16ec862833f51c6450742eb5cd5d1 (patch)
tree0c3fa06a08e3aee1f58b75e3cf233b7ece20378b
parentbcfa3fc82450d4adebd20b64543e7876ec543974 (diff)
downloadorg.eclipse.osee-02aa6e385ce16ec862833f51c6450742eb5cd5d1.zip
org.eclipse.osee-02aa6e385ce16ec862833f51c6450742eb5cd5d1.tar.gz
org.eclipse.osee-02aa6e385ce16ec862833f51c6450742eb5cd5d1.tar.bz2
refactor[bgz_342089]: Create AllLoggingTestSuite
-rw-r--r--features/org.eclipse.osee.client.feature.test/feature.xml8
-rw-r--r--features/org.eclipse.osee.core.feature.test/feature.xml16
-rw-r--r--plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java18
-rw-r--r--plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/SevereLogMonitorTest.java17
-rw-r--r--plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java2
-rw-r--r--releng/org.eclipse.osee.client.releng/maps/osee_client_test.map1
-rw-r--r--releng/org.eclipse.osee.server.releng/maps/osee_app_server_test.map1
9 files changed, 37 insertions, 29 deletions
diff --git a/features/org.eclipse.osee.client.feature.test/feature.xml b/features/org.eclipse.osee.client.feature.test/feature.xml
index e225c91..2da223f 100644
--- a/features/org.eclipse.osee.client.feature.test/feature.xml
+++ b/features/org.eclipse.osee.client.feature.test/feature.xml
@@ -121,4 +121,12 @@
fragment="true"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osee.framework.logging.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.osee.core.feature.test/feature.xml b/features/org.eclipse.osee.core.feature.test/feature.xml
index 4b5029b..44cb820 100644
--- a/features/org.eclipse.osee.core.feature.test/feature.xml
+++ b/features/org.eclipse.osee.core.feature.test/feature.xml
@@ -50,7 +50,7 @@
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
+ fragment="true"
unpack="false"/>
<plugin
@@ -58,7 +58,7 @@
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
+ fragment="true"
unpack="false"/>
<plugin
@@ -66,7 +66,7 @@
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
+ fragment="true"
unpack="false"/>
<plugin
@@ -74,7 +74,15 @@
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.framework.logging.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
unpack="false"/>
</feature>
diff --git a/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java b/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java
index e04c200..9eff346 100644
--- a/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/AllLoggingTestSuite.java
@@ -1,15 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Created on Apr 6, 2011
*
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
package org.eclipse.osee.framework.logging;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({SevereLogMonitorTest.class})
public class AllLoggingTestSuite {
// test suite
}
diff --git a/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/SevereLogMonitorTest.java b/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/SevereLogMonitorTest.java
index 44f0cef..7feb2b8 100644
--- a/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/SevereLogMonitorTest.java
+++ b/plugins/org.eclipse.osee.framework.logging.test/src/org/eclipse/osee/framework/logging/SevereLogMonitorTest.java
@@ -18,24 +18,13 @@ import java.util.logging.Level;
*/
public class SevereLogMonitorTest {
- /*
- * @Before public void setup() throws Exception { assertTrue("Should be run on test or demo datbase.",
- * TestUtil.isDemoDb() || TestUtil.isTestDb()); }
- */
-
@org.junit.Test
public void testCatchingOfException() {
-
- boolean madeItInException = false;
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
- try {
- throw new Exception("this is my test exception");
- } catch (Exception ex) {
- madeItInException = true;
- OseeLog.log(SevereLogMonitorTest.class, Level.SEVERE, "caught our exception in a junit", ex);
- }
- assertTrue(madeItInException);
+ Exception ex = new Exception("this is my test exception");
+ OseeLog.log(SevereLogMonitorTest.class, Level.SEVERE, "caught our exception in a junit", ex);
+ OseeLog.unregisterLoggerListener(monitorLog);
assertTrue(String.format("%d SevereLogs during test.", monitorLog.getAllLogs().size()),
monitorLog.getAllLogs().size() == 1);
}
diff --git a/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF
index fc5c6f0..b4d3841 100644
--- a/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@ Import-Package: org.eclipse.osee.framework.branch.management.test,
org.eclipse.osee.framework.database.test,
org.eclipse.osee.framework.jdk.core.test,
org.eclipse.osee.framework.lifecycle.test,
+ org.eclipse.osee.framework.logging,
org.eclipse.osee.framework.resource.locator.attribute.test,
org.eclipse.osee.framework.resource.management.test,
org.eclipse.osee.framework.resource.provider.attribute.test,
diff --git a/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java b/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java
index aa55d49..4644a04 100644
--- a/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java
+++ b/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java
@@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite;
import org.eclipse.osee.framework.database.test.DatabaseTestSuite;
import org.eclipse.osee.framework.jdk.core.test.JdkCoreTestSuite;
import org.eclipse.osee.framework.lifecycle.test.AllLifecycleTestSuite;
+import org.eclipse.osee.framework.logging.AllLoggingTestSuite;
import org.eclipse.osee.framework.resource.locator.attribute.test.AttributeLocatorProviderTestSuite;
import org.eclipse.osee.framework.resource.management.test.ResourceManagementTestSuite;
import org.eclipse.osee.framework.resource.provider.attribute.test.AttributeProviderTestSuite;
@@ -41,6 +42,7 @@ import org.junit.runners.Suite;
CoreServerTestSuite.class,
BranchManagementTestSuite.class,
AllLifecycleTestSuite.class,
+ AllLoggingTestSuite.class,
ResourceManagementTestSuite.class,
AttributeLocatorProviderTestSuite.class,
AttributeProviderTestSuite.class,
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java
index 201db10..dccbf50 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java
@@ -12,7 +12,6 @@ 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.logging.SevereLogMonitorTest;
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;
@@ -87,7 +86,6 @@ import org.junit.runners.Suite;
NativeArtifactTest.class,
ConflictTest.class,
ChangeManagerTest.class,
- SevereLogMonitorTest.class,
RelationDeletionTest.class,
StaticIdManagerTest.class,
BranchStateTest.class,
diff --git a/releng/org.eclipse.osee.client.releng/maps/osee_client_test.map b/releng/org.eclipse.osee.client.releng/maps/osee_client_test.map
index 8e587d0..3693f73 100644
--- a/releng/org.eclipse.osee.client.releng/maps/osee_client_test.map
+++ b/releng/org.eclipse.osee.client.releng/maps/osee_client_test.map
@@ -7,6 +7,7 @@ fragment@org.eclipse.osee.framework.skynet.core.test=SVN,,http://dev.eclipse.org
fragment@org.eclipse.osee.framework.ui.skynet.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.ui.skynet.test
fragment@org.eclipse.osee.framework.core.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.core.test
fragment@org.eclipse.osee.framework.jdk.core.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.jdk.core.test
+fragment@org.eclipse.osee.framework.logging.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.logging.test
fragment@org.eclipse.osee.framework.database.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database.test
fragment@org.eclipse.osee.framework.messaging.event.res.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.messaging.event.res.test
plugin@org.eclipse.osee.support.test.util=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.support.test.util
diff --git a/releng/org.eclipse.osee.server.releng/maps/osee_app_server_test.map b/releng/org.eclipse.osee.server.releng/maps/osee_app_server_test.map
index f61efc6..3e40df2 100644
--- a/releng/org.eclipse.osee.server.releng/maps/osee_app_server_test.map
+++ b/releng/org.eclipse.osee.server.releng/maps/osee_app_server_test.map
@@ -4,6 +4,7 @@ fragment@org.eclipse.ant.optional.junit=v20070202,:pserver:anonymous@dev.eclipse
feature@org.eclipse.osee.core.feature.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,features/org.eclipse.osee.core.feature.test
fragment@org.eclipse.osee.framework.jdk.core.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.jdk.core.test
fragment@org.eclipse.osee.framework.lifecycle.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.lifecycle.test
+fragment@org.eclipse.osee.framework.logging.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.logging.test
feature@org.eclipse.osee.server.feature.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,features/org.eclipse.osee.server.feature.test
fragment@org.eclipse.osee.framework.branch.management.test=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.branch.management.test