From 1d842d5af5b13a90c9e587a1bb7ec0c27ae6dae2 Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@efficios.com>
Date: Wed, 18 Jun 2014 09:11:19 -0400
Subject: [PATCH] Test: add JUL disable event tests

Signed-off-by: David Goulet <dgoulet@efficios.com>
---
 tests/regression/ust/java-jul/test_java_jul | 91 ++++++++++++++++++++-
 tests/utils/utils.sh                        |  9 ++
 2 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index 0baa28703..bf3bb0bc2 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -29,7 +29,7 @@ EVENT_NAME="JTestLTTng"
 EVENT_NAME2="JTestLTTng2"
 JAVA_CP="$CURDIR:/usr/local/lib/lttng/java/liblttng-ust-jul.jar:/usr/lib/lttng/java/liblttng-ust-jul.jar"
 
-NUM_TESTS=106
+NUM_TESTS=139
 
 source $TESTDIR/utils/utils.sh
 
@@ -261,6 +261,42 @@ function test_jul_multi_session_loglevel()
 	fi
 }
 
+function test_jul_multi_session_disable()
+{
+	diag "Test JUL with multiple session with disabled event"
+
+	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME2
+	disable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME-1
+
+	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
+	start_lttng_tracing $SESSION_NAME-2
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME-1
+	stop_lttng_tracing $SESSION_NAME-2
+	destroy_lttng_session $SESSION_NAME-1
+	destroy_lttng_session $SESSION_NAME-2
+
+	# Validate test. Expecting one event of the second TP.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	# Validate test. Expecting one event of the second TP.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
 function test_jul_multi_session()
 {
 	diag "Test JUL with multiple session"
@@ -375,6 +411,56 @@ function test_jul_filtering()
 	fi
 }
 
+function test_jul_disable()
+{
+	diag "Test JUL disable event"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
+	disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting one event of the second TP only.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_disable_enable()
+{
+	diag "Test JUL disable event followed by an enable"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting NR_ITER event of the main INFO tp.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -390,6 +476,9 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_multi_session_disable
+		test_jul_disable
+		test_jul_disable_enable
 		test_jul_filtering
 		test_jul_multi_session_loglevel
 		test_jul_destroy_session
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 280cc40e0..9df1c4fe2 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -350,6 +350,15 @@ function disable_ust_lttng_event ()
 	ok $? "Disable event $event_name for session $sess_name"
 }
 
+function disable_jul_lttng_event ()
+{
+	local sess_name="$1"
+	local event_name="$2"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -j >/dev/null 2>&1
+	ok $? "Disable JUL event $event_name for session $sess_name"
+}
+
 function start_lttng_tracing ()
 {
 	sess_name=$1
-- 
2.34.1