diff options
| author | Fabio Buso <dev.siroibaf@gmail.com> | 2016-08-09 10:25:37 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-10 14:32:32 +0000 |
| commit | 2c76fd1e04441889fbc416d4e5815ef31b474193 (patch) | |
| tree | cd7aea0a33a0df8a3bef79ec801db5bed2fd62bf /qadevOOo | |
| parent | d6e8d4f773d970b69baedd8523a426f18a8d8eef (diff) | |
tdf#67647 getStructuredFilter returns operator
Change-Id: I010ea3c24b4d5411711a93e35d4b173f5bde9e55
Reviewed-on: https://gerrit.libreoffice.org/28000
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'qadevOOo')
| -rw-r--r-- | qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java | 5 | ||||
| -rw-r--r-- | qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java index a69e99251580..0eb16534efb7 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java @@ -149,9 +149,10 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { requiredMethod("getFilter()"); try{ oObj.setQuery("SELECT \"Identifier\", \"Type\", \"Address\" FROM \"biblio\" \"biblio\""); - String complexFilter = "( \"Identifier\" = '1' AND \"Type\" = '4' ) OR ( \"Identifier\" = '2' AND \"Type\" = '5' ) OR ( \"Identifier\" = '3' AND \"Type\" = '6' AND \"Address\" = '7' ) OR ( \"Address\" = '8' ) OR ( \"Type\" = '9' )"; + String complexFilter = "( \"Identifier\" >= '1' AND \"Type\" <= '4' ) OR ( \"Identifier\" <> '2' AND \"Type\" = '5' ) OR ( \"Identifier\" < '3' AND \"Type\" > '6' AND \"Address\" = '7' ) OR ( \"Address\" >= '8' ) OR ( \"Type\" = '9' )"; xComposer.setFilter(complexFilter); PropertyValue[][] aStructuredFilter = oObj.getStructuredFilter(); + xComposer.setFilter(""); xComposer.setStructuredFilter(aStructuredFilter); tRes.tested("getStructuredFilter()", oObj.getFilter().equals(complexFilter)); @@ -233,8 +234,8 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { requiredMethod("setQuery()"); requiredMethod("getFilter()"); executeMethod("getStructuredFilter()"); - String complexFilter = "( \"Identifier\" = '1' AND \"Type\" = '4' ) OR ( \"Identifier\" = '2' AND \"Type\" = '5' ) OR ( \"Identifier\" = '3' AND \"Type\" = '6' AND \"Address\" = '7' ) OR ( \"Address\" = '8' ) OR ( \"Type\" = '9' )"; + String complexFilter = "( \"Identifier\" >= '1' AND \"Type\" <= '4' ) OR ( \"Identifier\" <> '2' AND \"Type\" = '5' ) OR ( \"Identifier\" < '3' AND \"Type\" > '6' AND \"Address\" = '7' ) OR ( \"Address\" >= '8' ) OR ( \"Type\" = '9' )"; try{ xComposer.setHavingClause(complexFilter); PropertyValue[][] aStructuredHaving = oObj.getStructuredHavingClause(); diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index 2764574bb193..0b35515513e6 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -147,7 +147,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { requiredMethod("setFilter()"); try{ xQueryAna.setQuery("SELECT \"Identifier\", \"Type\", \"Address\" FROM \"biblio\" \"biblio\""); - String complexFilter = "( \"Identifier\" = '1' AND \"Type\" = '4' ) OR ( \"Identifier\" = '2' AND \"Type\" = '5' ) OR ( \"Identifier\" = '3' AND \"Type\" = '6' AND \"Address\" = '7' ) OR ( \"Address\" = '8' ) OR ( \"Type\" = '9' )"; + String complexFilter = "( \"Identifier\" >= '1' AND \"Type\" <= '4' ) OR ( \"Identifier\" <> '2' AND \"Type\" = '5' ) OR ( \"Identifier\" < '3' AND \"Type\" > '6' AND \"Address\" = '7' ) OR ( \"Address\" >= '8' ) OR ( \"Type\" = '9' )"; oObj.setFilter(complexFilter); PropertyValue[][] aStructuredFilter = xQueryAna.getStructuredFilter(); oObj.setFilter(""); @@ -358,8 +358,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { public void _setStructuredHavingClause() { requiredMethod("setHavingClause()"); executeMethod("setStructuredFilter()"); - String complexFilter = "( \"Identifier\" = '1' AND \"Type\" = '4' ) OR ( \"Identifier\" = '2' AND \"Type\" = '5' ) OR ( \"Identifier\" = '3' AND \"Type\" = '6' AND \"Address\" = '7' ) OR ( \"Address\" = '8' ) OR ( \"Type\" = '9' )"; - + String complexFilter = "( \"Identifier\" >= '1' AND \"Type\" <= '4' ) OR ( \"Identifier\" <> '2' AND \"Type\" = '5' ) OR ( \"Identifier\" < '3' AND \"Type\" > '6' AND \"Address\" = '7' ) OR ( \"Address\" >= '8' ) OR ( \"Type\" = '9' )"; try{ oObj.setHavingClause(complexFilter); PropertyValue[][] aStructuredHaving = |