From: Christian Babeux <christian.babeux@efficios.com>
Date: Wed, 31 Oct 2012 13:00:45 +0000 (-0400)
Subject: Tests: Add filtering tests for uncovered cases
X-Git-Tag: v2.1.0-rc6~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ef049beed75d56a90fcc522288da44c7307f3080;p=lttng-tools.git

Tests: Add filtering tests for uncovered cases

While investigating the code coverage of the filtering feature, a couple
of possible tests cases were uncovered:

Error tests:
* Strings can't be IR root node
* Unary ! not allowed on string type
* Comparison with string type not allowed
* Logical operator not allowed with string types
* Nesting of binary operator not allowed

Valid tests:
* Cover all left/right operands permutations with
  fields ref. and numeric values.

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/tests/tools/filtering/invalid-filters b/tests/tools/filtering/invalid-filters
index d0777e583..b6537055c 100755
--- a/tests/tools/filtering/invalid-filters
+++ b/tests/tools/filtering/invalid-filters
@@ -118,6 +118,21 @@ INVALID_FILTERS=(
 		"!a.f.d"
 		"asdf.asdfsd.sadf < 4"
 		"asdfasdf->asdfasdf < 2"
+		# String can't be root node
+		"\"somestring\""
+		# Unary op on string not allowed
+		"!\"somestring\""
+		# Comparison with string type not allowed
+		"\"somestring\" > 42"
+		"\"somestring\" > 42.0"
+		"42 > \"somestring\""
+		"42.0 > \"somestring\""
+		# Logical operator with string type not allowed
+		"\"somestring\" || 1"
+		"1 || \"somestring\""
+		# Nesting of binary operator not allowed
+		"1 | (1 | (1 | 1))"
+		"1 > (1 > (1 > 1))"
 		)
 
 start_lttng_sessiond
diff --git a/tests/tools/filtering/valid-filters b/tests/tools/filtering/valid-filters
index b48b6ed85..d32a60d58 100755
--- a/tests/tools/filtering/valid-filters
+++ b/tests/tools/filtering/valid-filters
@@ -361,6 +361,8 @@ FILTERS=("intfield"                                                     #1
 	 "intfield < 0x2"                                               #24
 	 "intfield < 02"                                                #25
 	 "stringfield2 == \"\\\*\""                                     #26
+	 "1.0 || intfield || 1.0"                                       #27
+	 "1 < intfield"                                                 #28
 )
 
 VALIDATOR=("validator_intfield"                     #1
@@ -389,6 +391,8 @@ VALIDATOR=("validator_intfield"                     #1
 	   "validator_intfield_lt"                  #24
 	   "validator_intfield_lt"                  #25
 	   "validator_true_statement"               #26
+	   "validator_true_statement"               #27
+	   "validator_intfield_gt"                  #28
 )
 
 FILTER_COUNT=${#FILTERS[@]}