null+****@clear*****
null+****@clear*****
2012年 5月 25日 (金) 10:47:23 JST
Kouhei Sutou 2012-05-25 10:47:23 +0900 (Fri, 25 May 2012)
New Revision: 35b7696712aa4ac69477cf4260aa6f4f67c9320b
Log:
Add more tests for &!
refs #1372
Copied files:
test/function/suite/select/filter/set_operation/not_and/and.expected
(from test/function/suite/select/filter/set_operation/not_and.expected)
test/function/suite/select/filter/set_operation/not_and/and.test
(from test/function/suite/select/filter/set_operation/not_and.test)
test/function/suite/select/filter/set_operation/not_and/not_and.expected
(from test/function/suite/select/filter/set_operation/not_and.expected)
test/function/suite/select/filter/set_operation/not_and/not_and.test
(from test/function/suite/select/filter/set_operation/not_and.test)
test/function/suite/select/filter/set_operation/not_and/or.expected
(from test/function/suite/select/filter/set_operation/not_and.expected)
test/function/suite/select/filter/set_operation/not_and/or.test
(from test/function/suite/select/filter/set_operation/not_and.test)
Modified files:
test/function/files.am
Renamed files:
test/function/suite/select/filter/set_operation/not_and/single_expression.expected
(from test/function/suite/select/filter/set_operation/not_and.expected)
test/function/suite/select/filter/set_operation/not_and/single_expression.test
(from test/function/suite/select/filter/set_operation/not_and.test)
Modified: test/function/files.am (+8 -2)
===================================================================
--- test/function/files.am 2012-05-24 23:10:38 +0900 (73a318a)
+++ test/function/files.am 2012-05-25 10:47:23 +0900 (c1f9819)
@@ -23,7 +23,10 @@ test_files = \
suite/select/filter/geo_in_circle/sphr_without_index.test \
suite/select/filter/geo_in_circle/with_index.test \
suite/select/filter/geo_in_circle/without_index.test \
- suite/select/filter/set_operation/not_and.test \
+ suite/select/filter/set_operation/not_and/and.test \
+ suite/select/filter/set_operation/not_and/not_and.test \
+ suite/select/filter/set_operation/not_and/or.test \
+ suite/select/filter/set_operation/not_and/single_expression.test \
suite/select/filter/similar.test \
suite/select/output-columns/with-space.test \
suite/select/output/scalar-reference-default.test \
@@ -80,7 +83,10 @@ expected_files = \
suite/select/filter/geo_in_circle/sphr_without_index.expected \
suite/select/filter/geo_in_circle/with_index.expected \
suite/select/filter/geo_in_circle/without_index.expected \
- suite/select/filter/set_operation/not_and.expected \
+ suite/select/filter/set_operation/not_and/and.expected \
+ suite/select/filter/set_operation/not_and/not_and.expected \
+ suite/select/filter/set_operation/not_and/or.expected \
+ suite/select/filter/set_operation/not_and/single_expression.expected \
suite/select/filter/similar.expected \
suite/select/output-columns/with-space.expected \
suite/select/output/scalar-reference-default.expected \
Copied: test/function/suite/select/filter/set_operation/not_and/and.expected (+0 -0) 100%
===================================================================
Copied: test/function/suite/select/filter/set_operation/not_and/and.test (+0 -0) 100%
===================================================================
Copied: test/function/suite/select/filter/set_operation/not_and/not_and.expected (+4 -4) 88%
===================================================================
--- test/function/suite/select/filter/set_operation/not_and.expected 2012-05-24 23:10:38 +0900 (81d358d)
+++ test/function/suite/select/filter/set_operation/not_and/not_and.expected 2012-05-25 10:47:23 +0900 (8fc55d9)
@@ -14,7 +14,7 @@ load --table Movies
{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]}
]
[[0,0.0,0.0],4]
-select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")'
+select Movies --filter 'tags @ "English" &! (tags @ "SF" &! tags @ "Keanu Reeves")'
[
[
0,
@@ -50,10 +50,10 @@ select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "
]
],
[
- 4,
- "Star Wars",
+ 3,
+ "The Matrix",
[
- "George Lucas",
+ "Keanu Reeves",
"SF",
"English"
]
Copied: test/function/suite/select/filter/set_operation/not_and/not_and.test (+1 -1) 87%
===================================================================
--- test/function/suite/select/filter/set_operation/not_and.test 2012-05-24 23:10:38 +0900 (33e179d)
+++ test/function/suite/select/filter/set_operation/not_and/not_and.test 2012-05-25 10:47:23 +0900 (3ece8c5)
@@ -14,4 +14,4 @@ load --table Movies
]
select Movies \
- --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")'
+ --filter 'tags @ "English" &! (tags @ "SF" &! tags @ "Keanu Reeves")'
Copied: test/function/suite/select/filter/set_operation/not_and/or.expected (+2 -11) 86%
===================================================================
--- test/function/suite/select/filter/set_operation/not_and.expected 2012-05-24 23:10:38 +0900 (81d358d)
+++ test/function/suite/select/filter/set_operation/not_and/or.expected 2012-05-25 10:47:23 +0900 (10af86d)
@@ -14,7 +14,7 @@ load --table Movies
{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]}
]
[[0,0.0,0.0],4]
-select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")'
+select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" || tags @ "George Lucas")'
[
[
0,
@@ -24,7 +24,7 @@ select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "
[
[
[
- 2
+ 1
],
[
[
@@ -48,15 +48,6 @@ select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "
"English",
"Tom Cruise"
]
- ],
- [
- 4,
- "Star Wars",
- [
- "George Lucas",
- "SF",
- "English"
- ]
]
]
]
Copied: test/function/suite/select/filter/set_operation/not_and/or.test (+1 -1) 86%
===================================================================
--- test/function/suite/select/filter/set_operation/not_and.test 2012-05-24 23:10:38 +0900 (33e179d)
+++ test/function/suite/select/filter/set_operation/not_and/or.test 2012-05-25 10:47:23 +0900 (400a0b6)
@@ -14,4 +14,4 @@ load --table Movies
]
select Movies \
- --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")'
+ --filter 'tags @ "English" &! (tags @ "Keanu Reeves" || tags @ "George Lucas")'
Renamed: test/function/suite/select/filter/set_operation/not_and/single_expression.expected (+2 -11) 81%
===================================================================
--- test/function/suite/select/filter/set_operation/not_and.expected 2012-05-24 23:10:38 +0900 (81d358d)
+++ test/function/suite/select/filter/set_operation/not_and/single_expression.expected 2012-05-25 10:47:23 +0900 (220166e)
@@ -14,7 +14,7 @@ load --table Movies
{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]}
]
[[0,0.0,0.0],4]
-select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")'
+select Movies --filter 'tags @ "English" &! tags @ "SF"'
[
[
0,
@@ -24,7 +24,7 @@ select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "
[
[
[
- 2
+ 1
],
[
[
@@ -48,15 +48,6 @@ select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "
"English",
"Tom Cruise"
]
- ],
- [
- 4,
- "Star Wars",
- [
- "George Lucas",
- "SF",
- "English"
- ]
]
]
]
Renamed: test/function/suite/select/filter/set_operation/not_and/single_expression.test (+1 -2) 84%
===================================================================
--- test/function/suite/select/filter/set_operation/not_and.test 2012-05-24 23:10:38 +0900 (33e179d)
+++ test/function/suite/select/filter/set_operation/not_and/single_expression.test 2012-05-25 10:47:23 +0900 (7bf2608)
@@ -13,5 +13,4 @@ load --table Movies
{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]}
]
-select Movies \
- --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")'
+select Movies --filter 'tags @ "English" &! tags @ "SF"'