Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-08-23 17:19:06 -0400
committerrescobar2010-08-23 17:19:06 -0400
commitdb6d151d95cd9c95d9424d54907f2151a6b45287 (patch)
tree5cb54f09ac1b0aa6e7107d3d84a1ec8d3913da31 /plugins
parentd83bfc97bca0d7f40fbb3691aae26830f7495fb3 (diff)
downloadorg.eclipse.osee-db6d151d95cd9c95d9424d54907f2151a6b45287.tar.gz
org.eclipse.osee-db6d151d95cd9c95d9424d54907f2151a6b45287.tar.xz
org.eclipse.osee-db6d151d95cd9c95d9424d54907f2151a6b45287.zip
Update Res Event Test Suite
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java4
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java (renamed from plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/FrameworkRes_Demo_Suite.java)18
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/internal/InternalResTestSuite.java (renamed from plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/FrameworkRes_TestDb_Suite.java)5
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/internal/RemoteNetworkSenderTest.java (renamed from plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/cases/RemoteNetworkSenderTest.java)34
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java35
6 files changed, 32 insertions, 67 deletions
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 81bcab8179..14b1281872 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
@@ -14,7 +14,7 @@ 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.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.messaging.event.res.test.FrameworkRes_Demo_Suite;
+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.ui.skynet.artifact.ArtifactSaveNotificationHandler;
import org.eclipse.osee.framework.ui.skynet.test.FrameworkUi_Demo_Suite;
@@ -28,7 +28,7 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({//
CoreRuntimeFeatureTestsSuite.class, //
FrameworkCore_Demo_Suite.class, //
- FrameworkRes_Demo_Suite.class, //
+ AllEventResTestSuite.class, //
AtsTest_Config_Suite.class,//
AtsTest_Demo_Suite.class, //
FrameworkUi_Demo_Suite.class, //
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF
index 2d25841087..90404cf0e6 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Require-Bundle: org.junit4,
org.eclipse.osee.framework.core
Import-Package: org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.logging
-Export-Package: org.eclipse.osee.framework.messaging.event.res.test,
- org.eclipse.osee.framework.messaging.event.res.test.cases
+Export-Package: org.eclipse.osee.framework.messaging.event.res.test
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/FrameworkRes_Demo_Suite.java b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java
index 511504a6c4..6f1d446d3e 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/FrameworkRes_Demo_Suite.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java
@@ -10,25 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.framework.messaging.event.res.test;
-import static org.junit.Assert.assertTrue;
-import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.messaging.event.res.test.cases.RemoteNetworkSenderTest;
-import org.junit.BeforeClass;
+import org.eclipse.osee.framework.messaging.event.res.test.internal.InternalResTestSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({RemoteNetworkSenderTest.class,})
+@Suite.SuiteClasses({InternalResTestSuite.class,})
/**
* @author Donald G. Dunne
*/
-public class FrameworkRes_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"));
- }
-
+public class AllEventResTestSuite {
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/FrameworkRes_TestDb_Suite.java b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/internal/InternalResTestSuite.java
index afe8848bae..6f98f2163a 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/FrameworkRes_TestDb_Suite.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/internal/InternalResTestSuite.java
@@ -8,9 +8,8 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.messaging.event.res.test;
+package org.eclipse.osee.framework.messaging.event.res.test.internal;
-import org.eclipse.osee.framework.messaging.event.res.test.cases.RemoteNetworkSenderTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -19,6 +18,6 @@ import org.junit.runners.Suite;
/**
* @author Donald G. Dunne
*/
-public class FrameworkRes_TestDb_Suite {
+public class InternalResTestSuite {
// test provided above
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/cases/RemoteNetworkSenderTest.java b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/internal/RemoteNetworkSenderTest.java
index 586b3d58b0..c1b5a93036 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/cases/RemoteNetworkSenderTest.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/internal/RemoteNetworkSenderTest.java
@@ -8,27 +8,39 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.messaging.event.res.test.cases;
+package org.eclipse.osee.framework.messaging.event.res.test.internal;
-import org.eclipse.osee.framework.messaging.event.res.RemoteEventUtil;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteNetworkSender1;
import org.junit.Assert;
+import org.junit.BeforeClass;
/**
+ * Test Case for {@link RemoteNetworkSender1}
+ *
* @author Donald G. Dunne
*/
public class RemoteNetworkSenderTest {
- public static String Object = "NetworkSendTest.class";
- public static String MachineIp = "123.421.56.342";
- public static String MachineName = "A2340422";
- public static String SessionId = "N23422.32";
- public static String ClientVersion = "123.2";
- public static int Port = 485;
- public static String UserId = "b345344";
+ private static final String Object = "NetworkSendTest.class";
+ private static final String MachineIp = "123.421.56.342";
+ private static final String MachineName = "A2340422";
+ private static final String SessionId = "N23422.32";
+ private static final String ClientVersion = "123.2";
+ private static final int Port = 485;
+ private static final String UserId = "b345344";
+ private static RemoteNetworkSender1 networkSender;
- public static RemoteNetworkSender1 networkSender = RemoteEventUtil.getNetworkSender(Object, SessionId, MachineName,
- UserId, MachineIp, Port, ClientVersion);
+ @BeforeClass
+ public static void setup() {
+ networkSender = new RemoteNetworkSender1();
+ networkSender.setSourceObject(Object);
+ networkSender.setSessionId(SessionId);
+ networkSender.setMachineName(MachineName);
+ networkSender.setUserId(UserId);
+ networkSender.setMachineIp(MachineIp);
+ networkSender.setPort(Port);
+ networkSender.setClientVersion(ClientVersion);
+ }
/**
* Test method for
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java
deleted file mode 100644
index b7a14a53e4..0000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.messaging.event.res;
-
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteNetworkSender1;
-
-/**
- * @author Donald G. Dunne
- */
-public final class RemoteEventUtil {
-
- private RemoteEventUtil() {
- // Utility class
- }
-
- public static RemoteNetworkSender1 getNetworkSender(String sourceObject, String sessionId, String machineName, String userId, String machineIp, int port, String clientVersion) {
- RemoteNetworkSender1 networkSender = new RemoteNetworkSender1();
- networkSender.setSourceObject(sourceObject);
- networkSender.setSessionId(sessionId);
- networkSender.setMachineName(machineName);
- networkSender.setUserId(userId);
- networkSender.setMachineIp(machineIp);
- networkSender.setPort(port);
- networkSender.setClientVersion(clientVersion);
- return networkSender;
- }
-}

Back to the top