X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=50452023b55e49538a0df3f60cdae1198d48e3d8;hp=ed963aa5722400509f0852fcdb55a937f89cc6ac;hb=9b21e6d59ee650f44a0db24cf7f75e08fbd0fe9c;hpb=37175ce4620a721d90235d7c906e49ecc14f62e3

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index ed963aa57..50452023b 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -26,17 +26,21 @@ TESTAPP_BIN="$TESTAPP_NAME.java"
 TESTAPP_PATH="$CURDIR/$TESTAPP_NAME"
 SESSION_NAME="jul"
 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"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=16
+NUM_TESTS=66
 
 source $TESTDIR/utils/utils.sh
 
 function run_app
 {
-	java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT >/dev/null 2>&1 &
+	local finest_tp=$1
+	local fire_second_tp=$2
+
+	java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1 &
 }
 
 function wait_apps
@@ -64,6 +68,12 @@ function test_jul_before_start ()
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting all events.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
 }
 
 function test_jul_after_start ()
@@ -81,6 +91,148 @@ function test_jul_after_start ()
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting all events.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_loglevel ()
+{
+	diag "Test JUL application with loglevel"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH
+	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay
+	run_app
+
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting all events.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	diag "Test JUL applications with lower loglevel"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH
+	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_SEVERE"
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay
+	run_app
+
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting 0 events.
+	trace_matches $EVENT_NAME 0 $TRACE_PATH
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	diag "Test JUL applications with higher loglevel"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH
+	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINER"
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay
+	run_app
+
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting all events.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+	return $?
+}
+
+function test_jul_loglevel_multiple ()
+{
+	diag "Test JUL application with multiple loglevel"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH
+	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
+	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINEST"
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire two TP.
+	run_app 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting all events times two.
+	trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH
+	enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_INFO"
+	enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_FINEST"
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire two TP.
+	run_app 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting all events times two.
+	trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_multi_session()
+{
+	diag "Test JUL with multiple session"
+
+	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_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 all events of first TP
+	trace_matches $EVENT_NAME $NR_ITER $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
 }
 
 plan_tests $NUM_TESTS
@@ -98,22 +250,20 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_loglevel
+		test_jul_loglevel_multiple
 		test_jul_before_start
 		test_jul_after_start
+		test_jul_multi_session
 	)
 
 	for fct_test in ${tests[@]};
 	do
 		${fct_test}
-
-		# Validate test
-		validate_trace $EVENT_NAME $TRACE_PATH
-		if [ $? -eq 0 ]; then
-			# Only delete if successful
-			rm -rf $TRACE_PATH
-		else
-			break
+		if [ $? -ne 0 ]; then
+			break;
 		fi
+		rm -rf $TRACE_PATH
 	done
 
 	stop_lttng_sessiond