Update Res Event Test Suite

3 files changed, 29 insertions, 28 deletions

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 511504a6c40..6f1d446d3e9 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 afe8848bae4..6f98f2163a6 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 586b3d58b0c..c1b5a930361 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