From 34c40351d4b1341e24944e4edf2174e58eefae1a Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@efficios.com>
Date: Mon, 26 May 2014 14:02:04 -0400
Subject: [PATCH] Test: add JUL filtering test

Signed-off-by: David Goulet <dgoulet@efficios.com>
---
 tests/regression/ust/java-jul/test_java_jul | 55 ++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index a91904af4..0baa28703 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=92
+NUM_TESTS=106
 
 source $TESTDIR/utils/utils.sh
 
@@ -67,6 +67,16 @@ function enable_jul_loglevel_only()
 	ok $? "Enable JUL event $event_name for session $sess_name with loglevel-only $loglevel"
 }
 
+function enable_jul_filter()
+{
+	local sess_name="$1"
+	local event_name="$2"
+	local filter="$3"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -j --filter "$filter" >/dev/null 2>&1
+	ok $? "Enable event $event_name with filter $filter for session $sess_name"
+}
+
 # MUST set TESTDIR before calling those functions
 
 function test_jul_before_start ()
@@ -323,6 +333,48 @@ function test_jul_destroy_session()
 	fi
 }
 
+function test_jul_filtering()
+{
+	diag "Test JUL filtering"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_filter $SESSION_NAME '*' 'msg == "JUL second logger fired"'
+	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
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable first Logger but filter msg payload for the INFO one while
+	# triggering the finest and second TP.
+	enable_jul_filter $SESSION_NAME $EVENT_NAME 'msg == "JUL tp fired!"'
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay, fire finest and second TP.
+	run_app 1 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"
@@ -338,6 +390,7 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_filtering
 		test_jul_multi_session_loglevel
 		test_jul_destroy_session
 		test_jul_loglevel
-- 
2.34.1