From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Sat, 18 Feb 2017 21:03:05 +0000 (-0500)
Subject: Tests: add globbing pattern tests to test_java_jul
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=62fc05222117c446e8f48e906cf83ffccf6f385e

Tests: add globbing pattern tests to test_java_jul

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index b3f9b519f..7adce28e7 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:$CLASSPATH"
 
-NUM_TESTS=155
+NUM_TESTS=195
 
 source $TESTDIR/utils/utils.sh
 
@@ -338,6 +338,119 @@ function test_jul_multi_session_disable_wildcard()
 	fi
 }
 
+function test_jul_multi_session_disable_wildcard_begin()
+{
+	ev_name='*LTTng'
+	diag "Test JUL with multiple session with disabled wildcard (at the beginning) event"
+
+	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 "$ev_name"
+
+	disable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+	start_lttng_tracing_ok $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-2
+
+	run_app 0 1
+
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
+	destroy_lttng_session_ok $SESSION_NAME-1
+	destroy_lttng_session_ok $SESSION_NAME-2
+
+	# Validate test. Expecting NO event of the first TP.
+	trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME-1
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	# Validate test. Expecting all events of the first TP.
+	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_multi_session_disable_wildcard_middle()
+{
+	ev_name='J*LTTng'
+	diag "Test JUL with multiple session with disabled wildcard (at the middle) event"
+
+	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 "$ev_name"
+
+	disable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+	start_lttng_tracing_ok $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-2
+
+	run_app 0 1
+
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
+	destroy_lttng_session_ok $SESSION_NAME-1
+	destroy_lttng_session_ok $SESSION_NAME-2
+
+	# Validate test. Expecting NO event of the first TP.
+	trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME-1
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	# Validate test. Expecting all events of the first TP.
+	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_multi_session_disable_wildcard_end()
+{
+	ev_name='JTestLTT*'
+	diag "Test JUL with multiple session with disabled wildcard (at the end) event"
+
+	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 "$ev_name"
+
+	disable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+	start_lttng_tracing_ok $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-2
+
+	run_app 0 1
+
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
+	destroy_lttng_session_ok $SESSION_NAME-1
+	destroy_lttng_session_ok $SESSION_NAME-2
+
+	# Validate test. Expecting NO event of the first TP.
+	trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME-1
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	# Validate test. Expecting all events of the first TP.
+	trace_matches $EVENT_NAME $(( $NR_ITER + 1 )) $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
 function test_jul_disable_all()
 {
 	diag "Test JUL with multiple session with disabled all event"
@@ -571,6 +684,9 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_multi_session_disable_wildcard_begin
+		test_jul_multi_session_disable_wildcard_middle
+		test_jul_multi_session_disable_wildcard_end
 		test_jul_multi_session_disable_wildcard
 		test_jul_multi_session_disable
 		test_jul_disable