From 62be8efab361ca23da28ce67829f3752c33a74af Mon Sep 17 00:00:00 2001
From: poorvasharma <poorva1209@gmail.com>
Date: Thu, 30 Nov 2017 11:56:51 -0800
Subject: [PATCH] Updated log manager test

---
 .../goss/gridappsd/test/LogManagerTest.java   | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/gov.pnnl.goss.gridappsd.test/src/gov/pnnl/goss/gridappsd/test/LogManagerTest.java b/gov.pnnl.goss.gridappsd.test/src/gov/pnnl/goss/gridappsd/test/LogManagerTest.java
index 19244345..fe098cd8 100644
--- a/gov.pnnl.goss.gridappsd.test/src/gov/pnnl/goss/gridappsd/test/LogManagerTest.java
+++ b/gov.pnnl.goss.gridappsd.test/src/gov/pnnl/goss/gridappsd/test/LogManagerTest.java
@@ -6,23 +6,37 @@
 
 import java.io.Serializable;
 
-import javax.jms.Connection;
 import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 
-import org.fusesource.stomp.jms.StompJmsConnectionFactory;
-import org.fusesource.stomp.jms.StompJmsDestination;
+import static org.junit.Assert.assertNotNull;
+
+import org.apache.http.auth.Credentials;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.gson.Gson;
+import pnnl.goss.core.Client;
+import pnnl.goss.core.Client.PROTOCOL;
+import pnnl.goss.core.ClientFactory;
+import pnnl.goss.core.DataResponse;
+import pnnl.goss.core.GossResponseEvent;
+import pnnl.goss.core.client.ClientServiceFactory;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LogManagerTest {
 	
+	Client client; 
+	
+	@Before
+	public void setup() throws Exception{
+		ClientFactory clientFactory = new ClientServiceFactory();
+		Credentials credentials = new UsernamePasswordCredentials(
+						"system", "manager");
+	 	client = clientFactory.create(PROTOCOL.STOMP, credentials);
+	}
+	
 	@Test
 	public void sendLogMessage() throws JMSException{
 		
@@ -36,29 +50,18 @@ public void sendLogMessage() throws JMSException{
 		Boolean storeToDB = true;
 		LogMessage logMessage = new LogMessage(process_id, timestamp, log_message, log_level, process_status, storeToDB);
 		
-		sendMessage(destination, logMessage);
+		String id = client.getResponse(logMessage, destination, null).toString();
 		
+		client.subscribe("goss.gridappsd.response.data."+id, new GossResponseEvent() {
+			
+			@Override
+			public void onMessage(Serializable message) {
+				DataResponse response = (DataResponse)message;
+				assertNotNull(response.getData());
+				
+			}
+		});
 		
 	}
 	
-	
-	private void sendMessage(String destination, Serializable message) throws JMSException{
-		Gson gson = new Gson();
-		StompJmsConnectionFactory connectionFactory = new StompJmsConnectionFactory();
-		connectionFactory.setBrokerURI("tcp://localhost:61613");
-		connectionFactory.setUsername("system");
-		connectionFactory.setPassword("manager");
-		Connection connection = connectionFactory.createConnection(); 
-		Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-		MessageProducer producer = session.createProducer(new StompJmsDestination(destination));
-		TextMessage textMessage = null;
-		if(message instanceof String){
-			textMessage = session.createTextMessage(message.toString());
-		} else {
-			textMessage = session.createTextMessage(gson.toJson(message));
-			
-		}
-		producer.send(textMessage);
-	}
-
 }