fix test:LogMediatorLevelTest
@@ -20,61 +20,42 @@ package org.wso2.carbon.esb.mediator.test.log;
import org.apache.axiom.om.OMElement;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import org.wso2.carbon.integration.common.admin.client.LogViewerClient;
-import org.wso2.carbon.logging.view.stub.types.carbon.LogEvent;
-import org.wso2.esb.integration.common.clients.logging.LoggingAdminClient;
+import org.wso2.esb.integration.common.utils.CarbonLogReader;
import org.wso2.esb.integration.common.utils.ESBIntegrationTest;
-import org.wso2.esb.integration.common.utils.Utils;
public class LogMediatorLevelTest extends ESBIntegrationTest {
- private LogViewerClient logViewer;
- private LoggingAdminClient logAdmin;
-
@BeforeClass(alwaysRun = true)
public void setEnvironment() throws Exception {
super.init();
- logAdmin = new LoggingAdminClient(contextUrls.getBackEndUrl(), getSessionCookie());
- logViewer = new LogViewerClient(contextUrls.getBackEndUrl(), getSessionCookie());
- verifyProxyServiceExistence("logMediatorLevelTestProxy");
- verifySequenceExistence("logCategoryTestSequence");
-
}
@Test(groups = "wso2.esb", description = "Tests level log")
public void testSendingToDefinedEndpoint() throws Exception {
-
- logAdmin.updateLoggerData("org.apache.synapse", LoggingAdminClient.LogLevel.DEBUG.name(), true, false);
- logViewer.clearLogs();
OMElement response = axis2Client
- .sendSimpleStockQuoteRequest(getProxyServiceURLHttp("logMediatorLevelTestProxy"), null, "WSO2");
+ .sendSimpleStockQuoteRequest(
+ getProxyServiceURLHttp("logMediatorLevelTestProxy"), null, "WSO2");
Assert.assertTrue(response.toString().contains("WSO2"));
log.info(response);
Thread.sleep(2000);
-
- LogEvent[] getLogsDebug = logViewer.getLogs("DEBUG", "LogMediator", "", "");
- LogEvent[] getLogsTrace = logViewer.getLogs("TRACE", "LogMediator", "", "");
- LogEvent[] getLogsInfo = logViewer.getLogs("INFO", "LogMediator", "", "");
-
- logAdmin.updateLoggerData("org.apache.synapse", LoggingAdminClient.LogLevel.INFO.name(), true, false);
}
@Test(groups = "wso2.esb", description = "Tests System Logs")
public void testSystemLogs() throws Exception {
- int beforeCount = logViewer.getAllSystemLogs().length;
+ CarbonLogReader carbonLogReader = new CarbonLogReader();
+ carbonLogReader.start();
+
OMElement response = axis2Client
- .sendSimpleStockQuoteRequest(getProxyServiceURLHttp("logMediatorLevelTestProxy"), null, "WSO2");
+ .sendSimpleStockQuoteRequest(
+ getProxyServiceURLHttp("logMediatorLevelTestProxy"), null, "WSO2");
Assert.assertTrue(response.toString().contains("WSO2"));
log.info(response);
- boolean logFound = Utils.checkForLog(logViewer, "*****TEST CUSTOM LOGGING MESSAGE TO SYSTEM LOGS TEST*****", 2);
+ boolean logFound = carbonLogReader
+ .checkForLog("*****TEST CUSTOM LOGGING MESSAGE TO SYSTEM LOGS TEST*****", 2);
Assert.assertTrue(logFound, "System Log not found. LogViewer Admin service not working properly");
- }
- @AfterClass(groups = "wso2.esb")
- public void close() throws Exception {
- super.cleanup();
+ carbonLogReader.stop();
}
}
\ No newline at end of file
