You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/01/24 10:37:28 UTC
[1/2] cayenne git commit: cleaning up ExpressionTraversalTest
Repository: cayenne
Updated Branches:
refs/heads/master 244dc6cd9 -> 099e4f86c
cleaning up ExpressionTraversalTest
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a72b4056
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a72b4056
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a72b4056
Branch: refs/heads/master
Commit: a72b4056f4b19a97120a72ecd17d20d8b2052cee
Parents: 244dc6c
Author: aadamchik <aa...@apache.org>
Authored: Sun Jan 24 11:49:27 2016 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Jan 24 12:35:19 2016 +0300
----------------------------------------------------------------------
.../cayenne/exp/ExpressionTraversalTest.java | 117 +++++++++++++------
.../apache/cayenne/exp/TstTraversalHandler.java | 2 +-
2 files changed, 83 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a72b4056/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
index be442b7..ececfa9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
@@ -19,44 +19,91 @@
package org.apache.cayenne.exp;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
import org.junit.Before;
import org.junit.Test;
public class ExpressionTraversalTest {
- private TstTraversalHandler handler;
-
- @Before
- public void setUp() throws Exception {
- handler = new TstTraversalHandler();
- }
-
- @Test
- public void testUnary() throws Exception {
- doExpressionTest(new TstUnaryExpSuite());
- }
-
- @Test
- public void testBinary() throws Exception {
- doExpressionTest(new TstBinaryExpSuite());
- }
-
- @Test
- public void testTernary() throws Exception {
- doExpressionTest(new TstTernaryExpSuite());
- }
-
- private void doExpressionTest(TstExpressionSuite suite) throws Exception {
- TstExpressionCase[] cases = suite.cases();
-
- int len = cases.length;
- for (int i = 0; i < len; i++) {
- handler.reset();
- cases[i].getCayenneExp().traverse(handler);
-
- // assert statistics
- handler.assertConsistency();
- cases[i].assertParsedWell(handler.getNodeCount(), handler.getLeafs());
- }
- }
+ private TstTraversalHandler handler;
+
+ @Before
+ public void setUp() throws Exception {
+ handler = new TstTraversalHandler();
+ }
+
+ @Test
+ public void testUnary_Negative1() {
+ doExpressionTest("-5", 1, 1);
+ }
+
+ @Test
+ public void testUnary_Negative2() {
+ doExpressionTest("-estimatedPrice", 2, 1);
+ }
+
+ @Test
+ public void testUnary_Negative3() {
+ doExpressionTest("-toGallery.paintingArray.estimatedPrice", 2, 1);
+ }
+
+ @Test
+ public void testBinary_In1() throws Exception {
+ doExpressionTest("toGallery.galleryName in ('g1', 'g2', 'g3')", 3, 2);
+ }
+
+ @Test
+ public void testBinary_In2() throws Exception {
+ Expression exp = ExpressionFactory.inExp("toGallery.galleryName",
+ Arrays.asList(new Object[] { "g1", "g2", "g3" }));
+ doExpressionTest(exp, 3, 2);
+ }
+
+ @Test
+ public void testBinary_In3() throws Exception {
+ Expression exp = ExpressionFactory.inExp("toGallery.galleryName", new Object[] { "g1", "g2", "g3" });
+ doExpressionTest(exp, 3, 2);
+ }
+
+ @Test
+ public void testBinary_Like() throws Exception {
+ doExpressionTest("toGallery.galleryName like 'a%'", 2, 2);
+ }
+
+ @Test
+ public void testBinary_LikeIgnoreCase() throws Exception {
+ doExpressionTest("toGallery.galleryName likeIgnoreCase 'a%'", 2, 2);
+ }
+
+ @Test
+ public void testBinary_IsNull() throws Exception {
+ doExpressionTest("toGallery.galleryName = null", 2, 2);
+ }
+
+ @Test
+ public void testBinary_IsNotNull() throws Exception {
+ doExpressionTest("toGallery.galleryName != null", 2, 2);
+ }
+
+ @Test
+ public void testTernary_Between() throws Exception {
+ doExpressionTest("estimatedPrice between 3000 and 15000", 2, 3);
+ }
+
+ private void doExpressionTest(String expression, int totalNodes, int totalLeaves) {
+ doExpressionTest(ExpressionFactory.exp(expression), totalNodes, totalLeaves);
+ }
+
+ private void doExpressionTest(Expression expression, int totalNodes, int totalLeaves) {
+ handler.reset();
+ expression.traverse(handler);
+
+ // assert statistics
+ handler.assertConsistency();
+ assertEquals(totalNodes, handler.getNodeCount());
+ assertEquals(totalLeaves, handler.getLeafs());
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a72b4056/cayenne-server/src/test/java/org/apache/cayenne/exp/TstTraversalHandler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/TstTraversalHandler.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/TstTraversalHandler.java
index 9c1b40d..a16c78a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/TstTraversalHandler.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/TstTraversalHandler.java
@@ -54,7 +54,7 @@ public class TstTraversalHandler implements TraversalHandler {
}
- public void assertConsistency() throws Exception {
+ public void assertConsistency() {
Assert.assertEquals(nodesStarted, nodes);
}
[2/2] cayenne git commit: unused class
Posted by aa...@apache.org.
unused class
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/099e4f86
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/099e4f86
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/099e4f86
Branch: refs/heads/master
Commit: 099e4f86c9cb7f4ed12f62a5864e9e5226e9cc6b
Parents: a72b405
Author: aadamchik <aa...@apache.org>
Authored: Sun Jan 24 12:36:52 2016 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Jan 24 12:36:52 2016 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/query/TstQueryCase.java | 34 --------------------
1 file changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/099e4f86/cayenne-server/src/test/java/org/apache/cayenne/query/TstQueryCase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/TstQueryCase.java b/cayenne-server/src/test/java/org/apache/cayenne/query/TstQueryCase.java
deleted file mode 100644
index e05b8b1..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/TstQueryCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.cayenne.query;
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-
-import org.apache.cayenne.TranslationCase;
-
-
-public class TstQueryCase extends TranslationCase {
- public TstQueryCase(String rootEntity, Query query, String sqlExp) {
- super(rootEntity, query, sqlExp);
- }
-
-
- public Query getQuery() {
- return (Query)tstObject;
- }
-}