You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2013/07/17 13:37:10 UTC
git commit: Fixed salesforce.com unittest issues. Fixed unclosed
resources in unittests (eclipse compiler warnings)
Updated Branches:
refs/heads/master 03eea7d65 -> 07a088799
Fixed salesforce.com unittest issues.
Fixed unclosed resources in unittests (eclipse compiler warnings)
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/07a08879
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/07a08879
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/07a08879
Branch: refs/heads/master
Commit: 07a0887992368c5bbb32331ca3079b3761bb1fdc
Parents: 03eea7d
Author: kaspers <ka...@kaspers-think.humaninference.com>
Authored: Wed Jul 17 13:35:37 2013 +0200
Committer: kaspers <ka...@kaspers-think.humaninference.com>
Committed: Wed Jul 17 13:35:37 2013 +0200
----------------------------------------------------------------------
.../metamodel/data/DataSetTableModelTest.java | 3 +++
.../eobjects/metamodel/data/FirstRowDataSetTest.java | 6 ++++++
.../metamodel/data/RowPublisherDataSetTest.java | 5 ++++-
.../metamodel/query/DefaultCompiledQueryTest.java | 4 ++++
.../org/eobjects/metamodel/csv/UnicodeWriterTest.java | 2 ++
.../eobjects/metamodel/jdbc/FilteredDataSetTest.java | 2 ++
.../org/eobjects/metamodel/jdbc/JdbcSchemaTest.java | 2 ++
.../salesforce/SalesforceDataContextTest.java | 14 ++++++++++----
8 files changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/core/src/test/java/org/eobjects/metamodel/data/DataSetTableModelTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eobjects/metamodel/data/DataSetTableModelTest.java b/core/src/test/java/org/eobjects/metamodel/data/DataSetTableModelTest.java
index 8a5cb43..a0846c8 100644
--- a/core/src/test/java/org/eobjects/metamodel/data/DataSetTableModelTest.java
+++ b/core/src/test/java/org/eobjects/metamodel/data/DataSetTableModelTest.java
@@ -44,6 +44,8 @@ public class DataSetTableModelTest extends TestCase {
@SuppressWarnings("deprecation")
TableModel tableModel = data.toTableModel();
+ data.close();
+
assertEquals(3, tableModel.getColumnCount());
assertEquals("CUSTOMERNUMBER", tableModel.getColumnName(0));
assertEquals("CUSTOMERNAME", tableModel.getColumnName(1));
@@ -52,5 +54,6 @@ public class DataSetTableModelTest extends TestCase {
// Take a small sample from the data
assertEquals("Taylor", tableModel.getValueAt(1, 2).toString());
+
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/core/src/test/java/org/eobjects/metamodel/data/FirstRowDataSetTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eobjects/metamodel/data/FirstRowDataSetTest.java b/core/src/test/java/org/eobjects/metamodel/data/FirstRowDataSetTest.java
index ff23d03..5f5226f 100644
--- a/core/src/test/java/org/eobjects/metamodel/data/FirstRowDataSetTest.java
+++ b/core/src/test/java/org/eobjects/metamodel/data/FirstRowDataSetTest.java
@@ -49,11 +49,15 @@ public class FirstRowDataSetTest extends TestCase {
assertTrue(ds.next());
assertEquals(5, ds.getRow().getValue(0));
assertFalse(ds.next());
+
+ ds.close();
}
public void testOffsetHigherThanSize() throws Exception {
FirstRowDataSet ds = new FirstRowDataSet(dataSet, 8);
assertFalse(ds.next());
+
+ ds.close();
}
public void testOneOffset() throws Exception {
@@ -74,5 +78,7 @@ public class FirstRowDataSetTest extends TestCase {
assertTrue(ds.next());
assertEquals(5, ds.getRow().getValue(0));
assertFalse(ds.next());
+
+ ds.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/core/src/test/java/org/eobjects/metamodel/data/RowPublisherDataSetTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eobjects/metamodel/data/RowPublisherDataSetTest.java b/core/src/test/java/org/eobjects/metamodel/data/RowPublisherDataSetTest.java
index 9e60b30..6beb471 100644
--- a/core/src/test/java/org/eobjects/metamodel/data/RowPublisherDataSetTest.java
+++ b/core/src/test/java/org/eobjects/metamodel/data/RowPublisherDataSetTest.java
@@ -54,6 +54,8 @@ public class RowPublisherDataSetTest extends TestCase {
assertTrue(ds.next());
assertEquals("Row[values=[foo4, bar4]]", ds.getRow().toString());
assertFalse(ds.next());
+
+ ds.close();
}
public void testExceptionInAction() throws Exception {
@@ -81,7 +83,8 @@ public class RowPublisherDataSetTest extends TestCase {
} catch (Exception e) {
assertEquals("foobar!", e.getMessage());
assertEquals(IllegalStateException.class, e.getClass());
+ } finally {
+ ds.close();
}
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/core/src/test/java/org/eobjects/metamodel/query/DefaultCompiledQueryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eobjects/metamodel/query/DefaultCompiledQueryTest.java b/core/src/test/java/org/eobjects/metamodel/query/DefaultCompiledQueryTest.java
index 552d675..782eed9 100644
--- a/core/src/test/java/org/eobjects/metamodel/query/DefaultCompiledQueryTest.java
+++ b/core/src/test/java/org/eobjects/metamodel/query/DefaultCompiledQueryTest.java
@@ -75,15 +75,19 @@ public class DefaultCompiledQueryTest {
+ "SELECT changeSetColumn FROM (SELECT dataSourceIdColumn AS innerDataSourceRecordId FROM datastore WHERE dataSourceNameColumn = ? GROUP BY dataSourceIdColumn HAVING COUNT(dataSourceIdColumn) = 2) innerDS, datastore "
+ "WHERE versionColumn = 2 AND changeSetColumn = ? AND innerDS.innerDataSourceRecordId = dataSourceIdColumn AND dataSourceNameColumn = ?]",
defaultCompiledQuery.toString());
+
+ defaultCompiledQuery.close();
}
@Test
public void testCloneWithParameterValues() {
DefaultCompiledQuery defaultCompiledQuery = new DefaultCompiledQuery(query);
Query resultQuery = defaultCompiledQuery.cloneWithParameterValues(new Object[] { "BE", 1, "BE" });
+ defaultCompiledQuery.close();
defaultCompiledQuery = new DefaultCompiledQuery(resultQuery);
Assert.assertEquals(0, defaultCompiledQuery.getParameters().size());
+ defaultCompiledQuery.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/csv/src/test/java/org/eobjects/metamodel/csv/UnicodeWriterTest.java
----------------------------------------------------------------------
diff --git a/csv/src/test/java/org/eobjects/metamodel/csv/UnicodeWriterTest.java b/csv/src/test/java/org/eobjects/metamodel/csv/UnicodeWriterTest.java
index b4a0d20..ea5e1db 100644
--- a/csv/src/test/java/org/eobjects/metamodel/csv/UnicodeWriterTest.java
+++ b/csv/src/test/java/org/eobjects/metamodel/csv/UnicodeWriterTest.java
@@ -46,5 +46,7 @@ public class UnicodeWriterTest {
assertEquals(UnicodeWriter.UTF8_BOM[1], bytes[1]);
assertEquals(UnicodeWriter.UTF8_BOM[2], bytes[2]);
assertEquals((byte) 'H', bytes[3]);
+
+ is.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/jdbc/src/test/java/org/eobjects/metamodel/jdbc/FilteredDataSetTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/eobjects/metamodel/jdbc/FilteredDataSetTest.java b/jdbc/src/test/java/org/eobjects/metamodel/jdbc/FilteredDataSetTest.java
index 073efda..4d0962e 100644
--- a/jdbc/src/test/java/org/eobjects/metamodel/jdbc/FilteredDataSetTest.java
+++ b/jdbc/src/test/java/org/eobjects/metamodel/jdbc/FilteredDataSetTest.java
@@ -70,5 +70,7 @@ public class FilteredDataSetTest extends JdbcTestCase {
"Row[values=[489, Double Decker Gift Stores, Ltd, Hardy, Thomas, (171) 555-7555, 120 Hanover Sq., null, London, null, WA1 1DP, UK, 1501, 43300.0]]",
dataSet.getRow().toString());
assertFalse(dataSet.next());
+
+ dataSet.close();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/jdbc/src/test/java/org/eobjects/metamodel/jdbc/JdbcSchemaTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/eobjects/metamodel/jdbc/JdbcSchemaTest.java b/jdbc/src/test/java/org/eobjects/metamodel/jdbc/JdbcSchemaTest.java
index 9a3a99b..50a2d8f 100644
--- a/jdbc/src/test/java/org/eobjects/metamodel/jdbc/JdbcSchemaTest.java
+++ b/jdbc/src/test/java/org/eobjects/metamodel/jdbc/JdbcSchemaTest.java
@@ -66,6 +66,8 @@ public class JdbcSchemaTest extends JdbcTestCase {
ObjectInputStream objectInputStream = new ObjectInputStream(
new FileInputStream(file));
schema = (Schema) objectInputStream.readObject();
+ objectInputStream.close();
+
assertEquals("Schema[name=PUBLIC]", schema.toString());
assertTrue(schema instanceof JdbcSchema);
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/07a08879/salesforce/src/test/java/org/eobjects/metamodel/salesforce/SalesforceDataContextTest.java
----------------------------------------------------------------------
diff --git a/salesforce/src/test/java/org/eobjects/metamodel/salesforce/SalesforceDataContextTest.java b/salesforce/src/test/java/org/eobjects/metamodel/salesforce/SalesforceDataContextTest.java
index 81698d9..e21718c 100644
--- a/salesforce/src/test/java/org/eobjects/metamodel/salesforce/SalesforceDataContextTest.java
+++ b/salesforce/src/test/java/org/eobjects/metamodel/salesforce/SalesforceDataContextTest.java
@@ -45,6 +45,10 @@ import org.eobjects.metamodel.util.Month;
public class SalesforceDataContextTest extends SalesforceTestCase {
public void testQueryStrangeRecord() throws Exception {
+ if (!isConfigured()) {
+ System.err.println(getInvalidConfigurationMessage());
+ return;
+ }
SalesforceDataContext dc = new SalesforceDataContext(getUsername(), getPassword(), getSecurityToken());
Column[] timeColumns = dc.getDefaultSchema().getTableByName("Contact").getTimeBasedColumns();
@@ -60,9 +64,11 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
Arrays.toString(timeColumns));
DataSet ds = dc.query().from("Contact").select("LastModifiedDate").where("Id").eq("003b0000006xfAUAAY")
.execute();
- assertTrue(ds.next());
- System.out.println(ds.getRow());
- assertFalse(ds.next());
+ if (ds.next()) {
+ System.out.println(ds.getRow());
+ assertFalse(ds.next());
+ }
+ ds.close();
}
public void testInvalidLoginException() throws Exception {
@@ -272,7 +278,7 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
SalesforceDataContext.rewriteFilterItem(sb, filterItem);
- assertEquals("FOOBAR: (foo = 'hello\n \'world\'' OR bar = 123 OR baz = 2013-01-22T23:00:00+0000)",
+ assertEquals("FOOBAR: (foo = 'hello\\n \\'world\\'' OR bar = 123 OR baz = 2013-01-22T23:00:00+0000)",
sb.toString());
}
}