X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fjul%2FJulLegacyApiTest.java;h=d66479e7acc507eeb9ae74849af329dc7c5080f0;hb=8576633f94f26d8fb955d7c3a29a03cd09e99ed4;hp=808cf27068db1cdd7672fd3841414f6b9895f10f;hpb=c5524c71f2a2f7b553f5a6ce0cd7abb2cafeab7a;p=lttng-ust-java-tests.git

diff --git a/src/org/lttng/ust/agent/integration/jul/JulLegacyApiTest.java b/src/org/lttng/ust/agent/integration/jul/JulLegacyApiTest.java
index 808cf27..d66479e 100644
--- a/src/org/lttng/ust/agent/integration/jul/JulLegacyApiTest.java
+++ b/src/org/lttng/ust/agent/integration/jul/JulLegacyApiTest.java
@@ -6,7 +6,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.logging.Level;
@@ -19,9 +18,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.lttng.ust.agent.ILttngHandler;
 import org.lttng.ust.agent.LTTngAgent;
-import org.lttng.ust.agent.jul.LttngLogHandler;
-import org.lttng.ust.agent.utils.LttngSessionControl;
-import org.lttng.ust.agent.utils.LttngSessionControl.Domain;
+import org.lttng.ust.agent.utils.LttngSession;
+import org.lttng.ust.agent.utils.LttngSession.Domain;
+import org.lttng.ust.agent.utils.TestUtils;
 
 @SuppressWarnings("deprecation")
 public class JulLegacyApiTest {
@@ -31,31 +30,21 @@ public class JulLegacyApiTest {
     private static final String EVENT_NAME_A = "EventA";
     private static final String EVENT_NAME_B = "EventB";
 
+    private LttngSession session;
+
     private Logger loggerA;
     private Logger loggerB;
 
     @BeforeClass
     public static void julClassSetup() {
         /* Skip tests if we can't find the JNI library or lttng-tools */
-        try {
-            LttngLogHandler testHandler = new LttngLogHandler();
-            testHandler.close();
-        } catch (SecurityException | IOException e) {
-            assumeTrue(false);
-        }
-
-        boolean ret1 = LttngSessionControl.setupSession(null, DOMAIN);
-        boolean ret2 = LttngSessionControl.stopSession(null);
-        /* "lttng view" also tests that Babeltrace is installed and working */
-        List<String> contents = LttngSessionControl.viewSession(null);
-        boolean ret3 = LttngSessionControl.destroySession(null);
-        assumeTrue(ret1 && ret2 && ret3);
-        assumeTrue(contents.isEmpty());
+        assumeTrue(TestUtils.checkForJulLibrary());
+        assumeTrue(TestUtils.checkForLttngTools(Domain.JUL));
     }
 
     @AfterClass
     public static void julClassCleanup() {
-        LttngSessionControl.deleteAllTracee();
+        LttngSession.deleteAllTracee();
     }
 
     @Before
@@ -66,12 +55,13 @@ public class JulLegacyApiTest {
 
         loggerA.setLevel(Level.ALL);
         loggerB.setLevel(Level.ALL);
+
+        session = new LttngSession(null, DOMAIN);
     }
 
     @After
     public void tearDown() {
-        /* In case the test fails before destroying the session */
-        LttngSessionControl.tryDestroySession(null);
+        session.close();
 
         LTTngAgent.dispose();
 
@@ -81,58 +71,53 @@ public class JulLegacyApiTest {
 
     @Test
     public void testNoEvents() {
-        assertTrue(LttngSessionControl.setupSession(null, DOMAIN));
+        assertTrue(session.start());
 
-        JulEnabledEventsTest.send10Events(loggerA);
-        JulEnabledEventsTest.send10Events(loggerB);
+        JulTestUtils.send10EventsTo(loggerA);
+        JulTestUtils.send10EventsTo(loggerB);
 
-        assertTrue(LttngSessionControl.stopSession(null));
+        assertTrue(session.stop());
 
-        List<String> output = LttngSessionControl.viewSession(null);
+        List<String> output = session.view();
         assertNotNull(output);
         assertTrue(output.isEmpty());
 
-        assertTrue(LttngSessionControl.destroySession(null));
-
         ILttngHandler handler = getAgentHandler();
         assertEquals(0, handler.getEventCount());
     }
 
     @Test
     public void testAllEvents() {
-        assertTrue(LttngSessionControl.setupSessionAllEvents(null, DOMAIN));
+        assertTrue(session.enableAllEvents());
+        assertTrue(session.start());
 
-        JulEnabledEventsTest.send10Events(loggerA);
-        JulEnabledEventsTest.send10Events(loggerB);
+        JulTestUtils.send10EventsTo(loggerA);
+        JulTestUtils.send10EventsTo(loggerB);
 
-        assertTrue(LttngSessionControl.stopSession(null));
+        assertTrue(session.stop());
 
-        List<String> output = LttngSessionControl.viewSession(null);
+        List<String> output = session.view();
         assertNotNull(output);
         assertEquals(20, output.size());
 
-        assertTrue(LttngSessionControl.destroySession(null));
-
         ILttngHandler handler = getAgentHandler();
         assertEquals(20, handler.getEventCount());
     }
 
     @Test
     public void testSomeEvents() {
-        assertTrue(LttngSessionControl.setupSession(null, DOMAIN,
-                EVENT_NAME_A));
+        assertTrue(session.enableEvents(EVENT_NAME_A));
+        assertTrue(session.start());
 
-        JulEnabledEventsTest.send10Events(loggerA);
-        JulEnabledEventsTest.send10Events(loggerB);
+        JulTestUtils.send10EventsTo(loggerA);
+        JulTestUtils.send10EventsTo(loggerB);
 
-        assertTrue(LttngSessionControl.stopSession(null));
+        assertTrue(session.stop());
 
-        List<String> output = LttngSessionControl.viewSession(null);
+        List<String> output = session.view();
         assertNotNull(output);
         assertEquals(10, output.size());
 
-        assertTrue(LttngSessionControl.destroySession(null));
-
         ILttngHandler handler = getAgentHandler();
         assertEquals(10, handler.getEventCount());
     }
@@ -143,7 +128,7 @@ public class JulLegacyApiTest {
      *
      * @return The agent's JUL handler
      */
-    private ILttngHandler getAgentHandler() {
+    private static ILttngHandler getAgentHandler() {
         try {
             Field julHandlerField = LTTngAgent.class.getDeclaredField("julHandler");
             julHandlerField.setAccessible(true);