import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import java.util.ArrayList;
import java.util.Arrays;
clientThread = new Thread(client);
clientThread.start();
- assumeTrue("Timed out waiting for root sessiond", client.waitForConnection(5));
+ assertTrue("Timed out waiting for root sessiond", client.waitForConnection(5));
}
/**
List<String> expectedDisabledCommands = Arrays.asList(EVENT_NAME_A, EVENT_NAME_B);
assertEquals(expectedEnabledCommands, clientListener.getEnabledEventCommands());
- assertEquals(expectedDisabledCommands, clientListener.getDisabledEventCommands());
+ assertTrue(clientListener.getDisabledEventCommands().containsAll(expectedDisabledCommands));
}
/**
assertEquals(expectedDisabledCommands, actualDisabledCommands);
}
+
+ // ------------------------------------------------------------------------
+ // Application context filtering
+ // ------------------------------------------------------------------------
+
+ /**
+ * Test that enabling an event with a filter string referring to a context
+ * should send an agent message about this context now being "enabled".
+ *
+ * This is because we will pass the context information to UST for the
+ * filtering step, even if the actual context won't be present in the trace.
+ */
+ @SuppressWarnings("static-method")
+ @Test
+ public void testContextInFilterString() {
+ try (ILttngSession session2 = ILttngSession.createSession(null, SESSION_DOMAIN);) {
+ session2.enableEvent(EVENT_NAME_A, null, false, "$app." + CONTEXT_RETRIEVER_NAME_A + ':' + CONTEXT_NAME_A + "==\"bozo\"");
+
+ List<String> expectedEnabledCommands = Collections.singletonList(CONTEXT_RETRIEVER_NAME_A + ':' + CONTEXT_NAME_A);
+ assertEquals(expectedEnabledCommands, clientListener.getEnabledAppContextCommands());
+ } // close(), aka destroy the session, sending "disable context" messages
+
+ List<String> expectedDisabledCommands = Collections.singletonList(CONTEXT_RETRIEVER_NAME_A + ':' + CONTEXT_NAME_A);
+ assertEquals(expectedDisabledCommands, clientListener.getDisabledAppContextCommands());
+ }
+
+ /**
+ * Test that if we the context is both referred to by a filter string *and*
+ * enabled directly, we receive *2* messages about this context being
+ * enabled (and disabled on session teardown).
+ */
+ @SuppressWarnings("static-method")
+ @Test
+ public void testContextEnabledAndInFilterString() {
+ try (ILttngSession session2 = ILttngSession.createSession(null, SESSION_DOMAIN);) {
+ session2.enableEvent(EVENT_NAME_A, null, false, "$app." + CONTEXT_RETRIEVER_NAME_A + ':' + CONTEXT_NAME_A + "==\"bozo\"");
+ session2.enableAppContext(CONTEXT_RETRIEVER_NAME_A, CONTEXT_NAME_A);
+
+ List<String> expectedEnabledCommands = Collections.nCopies(2, CONTEXT_RETRIEVER_NAME_A + ':' + CONTEXT_NAME_A);
+ assertEquals(expectedEnabledCommands, clientListener.getEnabledAppContextCommands());
+ } // close(), aka destroy the session, sending "disable context" messages
+
+ List<String> expectedDisabledCommands = Collections.nCopies(2, CONTEXT_RETRIEVER_NAME_A + ':' + CONTEXT_NAME_A);
+ assertEquals(expectedDisabledCommands, clientListener.getDisabledAppContextCommands());
+ }
}