You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/01/29 14:40:52 UTC
cayenne git commit: fix tests for postgres
Repository: cayenne
Updated Branches:
refs/heads/4.0.M3_prerelease aeb0a91a3 -> 0965aee4e
fix tests for postgres
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0965aee4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0965aee4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0965aee4
Branch: refs/heads/4.0.M3_prerelease
Commit: 0965aee4e52b7e5f21464ad2118f90ff651b5dc1
Parents: aeb0a91
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Jan 29 16:39:41 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Jan 29 16:39:41 2016 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/query/SQLSelectIT.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0965aee4/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
index 1ff4e4b..3adfdfe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
@@ -18,16 +18,6 @@
****************************************************************/
package org.apache.cayenne.query;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.Types;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ResultBatchIterator;
import org.apache.cayenne.ResultIterator;
@@ -43,6 +33,16 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Before;
import org.junit.Test;
+import java.sql.Types;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class SQLSelectIT extends ServerCase {
@@ -211,7 +211,7 @@ public class SQLSelectIT extends ServerCase {
public void test_SelectFirst() throws Exception {
createPaintingsDataSet();
- Painting p = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING ORDER BY PAINTING_TITLE").selectFirst(
+ Painting p = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING ORDER BY PAINTING_TITLE").columnNameCaps(CapsStrategy.UPPER).selectFirst(
context);
assertNotNull(p);
@@ -222,7 +222,7 @@ public class SQLSelectIT extends ServerCase {
public void test_SelectFirstByContext() throws Exception {
createPaintingsDataSet();
- SQLSelect<Painting> q = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING ORDER BY PAINTING_TITLE");
+ SQLSelect<Painting> q = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING ORDER BY PAINTING_TITLE").columnNameCaps(CapsStrategy.UPPER);
Painting p = context.selectFirst(q);
assertNotNull(p);