diff options
Diffstat (limited to 'plugins')
5 files changed, 15 insertions, 25 deletions
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 e04c200e204..9eff34637e2 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 44f0cef9fc7..7feb2b87f45 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 fc5c6f005d5..b4d38410d61 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 aa55d49ea7b..4644a04a96d 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 201db109902..dccbf50a651 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, |