You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/11/05 08:41:49 UTC
[3/4] cayenne git commit: Tests cleanup
Tests cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5ae8ffd1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5ae8ffd1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5ae8ffd1
Branch: refs/heads/master
Commit: 5ae8ffd1f600a67edd35ff8800f9a53528984ec5
Parents: b1f9ad5
Author: Arseni Bulatski <an...@gmail.com>
Authored: Wed Oct 31 12:06:53 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Oct 31 12:06:53 2018 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/query/SQLSelectIT.java | 55 +++---
.../org/apache/cayenne/query/SQLTemplateIT.java | 183 +++++++------------
2 files changed, 88 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5ae8ffd1/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 cbc7c83..51dbc48 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
@@ -69,15 +69,19 @@ public class SQLSelectIT extends ServerCase {
tArtistCt.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH");
}
- protected void createPaintingsDataSet() throws Exception {
+ private void createPaintingsDataSet() throws Exception {
for (int i = 1; i <= 20; i++) {
tPainting.insert(i, "painting" + i, 10000. * i);
}
}
+ private void createArtistDataSet() throws SQLException {
+ tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
+ tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ }
+
@Test
public void test_DataRows_DataMapNameRoot() throws Exception {
-
createPaintingsDataSet();
SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("testmap", "SELECT * FROM PAINTING");
@@ -90,7 +94,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_DefaultRoot() throws Exception {
-
createPaintingsDataSet();
SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("SELECT * FROM PAINTING");
@@ -103,7 +106,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_ClassRoot() throws Exception {
-
createPaintingsDataSet();
SQLSelect<Painting> q1 = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING").columnNameCaps(
@@ -116,8 +118,8 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRowWithTypes() throws Exception {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
+
List<DataRow> result = SQLSelect.dataRowQuery("SELECT * FROM ARTIST_CT", Integer.class, String.class, LocalDateTime.class)
.columnNameCaps(CapsStrategy.UPPER)
.select(context);
@@ -128,8 +130,8 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRowWithDirectives() throws Exception {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
+
List<DataRow> result = SQLSelect.dataRowQuery("SELECT #result('ARTIST_ID' 'java.lang.Double'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST_CT")
.select(context);
assertEquals(2, result.size());
@@ -139,15 +141,16 @@ public class SQLSelectIT extends ServerCase {
@Test(expected = CayenneRuntimeException.class)
public void test_DataRowWithTypesException() throws Exception {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
+
SQLSelect.dataRowQuery("SELECT * FROM ARTIST_CT", Integer.class, String.class)
.select(context);
}
@Test
public void testObjectArrayWithDefaultTypesReturnAndDirectives() throws Exception {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
+
List<Object[]> result = SQLSelect.scalarQuery("SELECT #result('ARTIST_ID' 'java.lang.Long'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST_CT")
.select(context);
@@ -160,16 +163,16 @@ public class SQLSelectIT extends ServerCase {
@Test(expected = CayenneRuntimeException.class)
public void testObjectArrayReturnAndDirectives() throws Exception {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
+
SQLSelect.scalarQuery("SELECT #result('ARTIST_ID' 'java.lang.Long'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST_CT",
Integer.class, String.class).select(context);
}
@Test
public void testObjectArrayWithOneObjectDefaultTypesReturnAndDirectives() throws Exception {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
+
List<Object[]> result = SQLSelect.scalarQuery("SELECT #result('ARTIST_ID' 'java.lang.Long') FROM ARTIST_CT")
.select(context);
@@ -182,6 +185,7 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_ObjectArrayQueryWithDefaultTypes() throws Exception {
createPaintingsDataSet();
+
List<Object[]> result = SQLSelect.scalarQuery("SELECT PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE FROM PAINTING")
.select(context);
@@ -192,6 +196,7 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_ObjectQueryWithDefaultType() throws Exception {
createPaintingsDataSet();
+
List<Object[]> result = SQLSelect.scalarQuery("SELECT PAINTING_ID FROM PAINTING")
.select(context);
assertEquals(20, result.size());
@@ -202,6 +207,7 @@ public class SQLSelectIT extends ServerCase {
@Test(expected = CayenneRuntimeException.class)
public void test_ObjectArrayQueryException() throws Exception {
createPaintingsDataSet();
+
SQLSelect<Object[]> query = SQLSelect.scalarQuery("SELECT PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE FROM PAINTING", Integer.class, String.class);
context.performQuery(query);
}
@@ -209,6 +215,7 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_SingleObjectQuery() throws Exception {
createPaintingsDataSet();
+
List<Integer> result = SQLSelect.scalarQuery("SELECT PAINTING_ID FROM PAINTING", Integer.class)
.select(context);
assertEquals(20, result.size());
@@ -217,8 +224,7 @@ public class SQLSelectIT extends ServerCase {
@Test
public void testObjectArrayWithCustomType() throws SQLException {
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
+ createArtistDataSet();
List<Object[]> results = SQLSelect.scalarQuery("SELECT * FROM ARTIST_CT",
Integer.class, String.class, LocalDateTime.class).select(context);
@@ -231,7 +237,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_ClassRoot_Parameters() throws Exception {
-
createPaintingsDataSet();
SQLSelect<Painting> q1 = SQLSelect.query(Painting.class,
@@ -245,7 +250,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_ClassRoot_Bind() throws Exception {
-
createPaintingsDataSet();
SQLSelect<Painting> q1 = SQLSelect.query(Painting.class,
@@ -259,7 +263,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_ColumnNameCaps() throws Exception {
-
SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("SELECT * FROM PAINTING WHERE PAINTING_TITLE = 'painting2'");
q1.upperColumnNames();
@@ -273,7 +276,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_FetchLimit() throws Exception {
-
createPaintingsDataSet();
SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("SELECT * FROM PAINTING");
@@ -284,7 +286,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_DataRows_FetchOffset() throws Exception {
-
createPaintingsDataSet();
SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("SELECT * FROM PAINTING");
@@ -295,7 +296,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_Append() throws Exception {
-
createPaintingsDataSet();
SQLSelect<Painting> q1 = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING")
@@ -308,7 +308,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_Select() throws Exception {
-
createPaintingsDataSet();
List<Painting> result = SQLSelect
@@ -320,7 +319,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_SelectOne() throws Exception {
-
createPaintingsDataSet();
Painting a = SQLSelect.query(Painting.class, "SELECT * FROM PAINTING WHERE PAINTING_TITLE = #bind($a)")
@@ -403,7 +401,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_SelectLong() throws Exception {
-
createPaintingsDataSet();
long id = SQLSelect
@@ -415,7 +412,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_SelectLongArray() throws Exception {
-
createPaintingsDataSet();
List<Integer> ids = SQLSelect.scalarQuery(Integer.class,
@@ -427,7 +423,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_SelectCount() throws Exception {
-
createPaintingsDataSet();
int c = SQLSelect.scalarQuery("SELECT COUNT(*) FROM PAINTING", Integer.class).selectOne(context);
@@ -437,7 +432,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_ParamsArray_Single() throws Exception {
-
createPaintingsDataSet();
Integer id = SQLSelect
@@ -449,7 +443,6 @@ public class SQLSelectIT extends ServerCase {
@Test
public void test_ParamsArray_Multiple() throws Exception {
-
createPaintingsDataSet();
List<Integer> ids = SQLSelect
@@ -465,7 +458,6 @@ public class SQLSelectIT extends ServerCase {
@Ignore("This is supported by Velocity only")
// TODO: move this test to new cayenne-velocity module
public void test_ParamsArray_Multiple_OptionalChunks() throws Exception {
-
tPainting.insert(1, "painting1", 1.0);
tPainting.insert(2, "painting2", null);
@@ -485,7 +477,6 @@ public class SQLSelectIT extends ServerCase {
@Ignore("This is supported by Velocity only")
// TODO: move this test to new cayenne-velocity module
public void test_Params_Multiple_OptionalChunks() throws Exception {
-
tPainting.insert(1, "painting1", 1.0);
tPainting.insert(2, "painting2", null);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5ae8ffd1/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
index da4fff4..09a425a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
@@ -71,7 +71,7 @@ public class SQLTemplateIT extends ServerCase {
@Before
public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
- tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
+ tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH");
tPainting = new TableHelper(dbHelper, "PAINTING");
tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE");
@@ -80,6 +80,11 @@ public class SQLTemplateIT extends ServerCase {
tArtistCt.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH");
}
+ private void createArtistDataSet() throws SQLException {
+ tArtist.insert(15, "Surikov", new Date(System.currentTimeMillis()));
+ tArtist.insert(16, "Ivanov", new Date(System.currentTimeMillis()));
+ }
+
@Test
public void testSQLTemplateForDataMap() {
DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
@@ -89,15 +94,13 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testSQLTemplateForDataMapWithInsert() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
+ public void testSQLTemplateForDataMapWithInsert() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q2 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST", true);
List<DataRow> result = context.performQuery(q2);
- assertEquals(1, result.size());
+ assertEquals(2, result.size());
}
@Test
@@ -119,12 +122,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testSQLTemplateForDataMapWithInsertException() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
+ public void testSQLTemplateForDataMapWithInsertException() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q2 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST", false);
boolean gotRuntimeException = false;
try {
@@ -137,11 +138,9 @@ public class SQLTemplateIT extends ServerCase {
}
@Test(expected = CayenneRuntimeException.class)
- public void testExceptionWhenUsingColumnsTypesAndSQLResult(){
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
+ public void testExceptionWhenUsingColumnsTypesAndSQLResult() throws SQLException {
+ createArtistDataSet();
+
SQLTemplate query = new SQLTemplate("SELECT ARTIST_ID P FROM ARTIST", true);
query.setResultColumnsTypes(Float.class);
SQLResult resultDescriptor = new SQLResult();
@@ -151,11 +150,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test(expected = CayenneRuntimeException.class)
- public void testExceptionWhenUsingColumnsTypesAndSQLResultUsingScalar() {
+ public void testExceptionWhenUsingColumnsTypesAndSQLResultUsingScalar() throws SQLException {
+ createArtistDataSet();
+
DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
SQLTemplate query = new SQLTemplate(testDataMap, "SELECT ARTIST_ID, ARTIST_NAME P FROM ARTIST", false);
query.setResultColumnsTypes(Float.class, String.class);
query.setUseScalar(true);
@@ -167,14 +165,9 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testWithRootUsingScalar() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testWithRootUsingScalar() throws SQLException {
+ createArtistDataSet();
+
SQLTemplate q3 = new SQLTemplate(Artist.class, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST");
q3.setResultColumnsTypes(Double.class, String.class);
q3.setUseScalar(true);
@@ -185,14 +178,9 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testWithRootUsingDataRow() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testWithRootUsingDataRow() throws SQLException {
+ createArtistDataSet();
+
SQLTemplate q3 = new SQLTemplate(Artist.class, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST");
q3.setResultColumnsTypes(Double.class, String.class);
q3.setFetchingDataRows(true);
@@ -204,22 +192,18 @@ public class SQLTemplateIT extends ServerCase {
}
@Test(expected = CayenneRuntimeException.class)
- public void testWithRootException() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
+ public void testWithRootException() throws SQLException {
+ createArtistDataSet();
+
SQLTemplate q3 = new SQLTemplate(Artist.class, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST");
q3.setResultColumnsTypes(Double.class, String.class);
context.performQuery(q3);
}
@Test(expected = CayenneRuntimeException.class)
- public void testUsingScalarAndDataRow() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
+ public void testUsingScalarAndDataRow() throws SQLException {
+ createArtistDataSet();
+
SQLTemplate q3 = new SQLTemplate(Artist.class, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST");
q3.setUseScalar(true);
q3.setFetchingDataRows(true);
@@ -227,15 +211,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testDataRowWithTypes() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testDataRowWithTypes() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST", true);
q3.setResultColumnsTypes(Double.class, String.class);
q3.setColumnNamesCapitalization(CapsStrategy.UPPER);
@@ -246,15 +225,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testDataRowReturnAndDirectives() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testDataRowReturnAndDirectives() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT #result('ARTIST_ID' 'java.lang.Long'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST", true);
List<DataRow> result = context.performQuery(q3);
assertEquals(2, result.size());
@@ -265,26 +239,20 @@ public class SQLTemplateIT extends ServerCase {
}
@Test(expected = CayenneRuntimeException.class)
- public void testDataRowReturnAndDirectivesExc() {
+ public void testDataRowReturnAndDirectivesExc() throws SQLException {
+ createArtistDataSet();
+
DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT #result('ARTIST_ID' 'java.lang.Long'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST", true);
q3.setResultColumnsTypes(Integer.class, String.class);
context.performQuery(q3);
}
@Test
- public void testObjectArrayReturnAndDirectives() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testObjectArrayReturnAndDirectives() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT #result('ARTIST_ID' 'java.lang.Long'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST", false);
q3.setUseScalar(true);
List<Object[]> result = context.performQuery(q3);
@@ -296,15 +264,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test(expected = CayenneRuntimeException.class)
- public void testObjectArrayReturnAndDirectivesException() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testObjectArrayReturnAndDirectivesException() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT #result('ARTIST_ID' 'java.lang.Long'), #result('ARTIST_NAME' 'java.lang.String') FROM ARTIST", false);
q3.setResultColumnsTypes(Integer.class, String.class);
q3.setUseScalar(true);
@@ -312,15 +275,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testObjectArrayWithSingleObjectReturnAndDirectives() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testObjectArrayWithSingleObjectReturnAndDirectives() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT #result('ARTIST_ID' 'java.lang.Long') FROM ARTIST", false);
q3.setUseScalar(true);
List<Object[]> result = context.performQuery(q3);
@@ -331,11 +289,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test(expected = CayenneRuntimeException.class)
- public void testObjectArrayReturnWithException() {
+ public void testObjectArrayReturnWithException() throws SQLException {
+ createArtistDataSet();
+
DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST", false);
q3.setResultColumnsTypes(Integer.class);
q3.setUseScalar(true);
@@ -343,15 +300,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testObjectArrayWithSingleObjectReturn() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testObjectArrayWithSingleObjectReturn() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT ARTIST_ID FROM ARTIST", false);
q3.setUseScalar(true);
List<Object[]> artists = context.performQuery(q3);
@@ -362,15 +314,10 @@ public class SQLTemplateIT extends ServerCase {
}
@Test
- public void testObjectArrayReturnWithDefaultTypes() {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
- String sql1 = "INSERT INTO ARTIST VALUES (16, 'Ivanov', null)";
- SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
- context.performNonSelectingQuery(q1);
- SQLTemplate q2 = new SQLTemplate(testDataMap, sql1, true);
- context.performNonSelectingQuery(q2);
+ public void testObjectArrayReturnWithDefaultTypes() throws SQLException {
+ createArtistDataSet();
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q3 = new SQLTemplate(testDataMap, "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST", false);
q3.setUseScalar(true);
List<Object[]> artists = context.performQuery(q3);
@@ -382,10 +329,10 @@ public class SQLTemplateIT extends ServerCase {
@Test
public void testObjectArrayReturn() throws SQLException {
+ createArtistDataSet();
+
DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
- tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
- tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis()));
- SQLTemplate q5 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST_CT", false);
+ SQLTemplate q5 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST", false);
q5.setResultColumnsTypes(Float.class, String.class, LocalDateTime.class);
q5.setUseScalar(true);
List dates = context.performQuery(q5);
@@ -397,8 +344,9 @@ public class SQLTemplateIT extends ServerCase {
@Test
public void testSingleObjectReturn() throws SQLException {
- DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis()));
+
+ DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
SQLTemplate q5 = new SQLTemplate(testDataMap, "SELECT ARTIST_NAME FROM ARTIST_CT", false);
q5.setResultColumnsTypes(String.class);
q5.setUseScalar(true);
@@ -471,7 +419,6 @@ public class SQLTemplateIT extends ServerCase {
public void testSQLTemplateSelectNullObjects() throws Exception {
tPainting.insert(1, null, "p1", 10);
-
String sql = "SELECT p.GALLERY_ID FROM PAINTING p";
SQLTemplate q1 = new SQLTemplate(Gallery.class, sql);
q1.setColumnNamesCapitalization(CapsStrategy.UPPER);
@@ -495,8 +442,8 @@ public class SQLTemplateIT extends ServerCase {
@Test
public void testSQLTemplateWithDisjointByIdPrefetch() throws Exception {
- tArtist.insert(1, "artist1");
- tArtist.insert(2, "artist2");
+ tArtist.insert(1, "artist1", null);
+ tArtist.insert(2, "artist2", null);
tPainting.insert(1, 1, "p1", 10);
tPainting.insert(2, 2, "p2", 20);