You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by an...@apache.org on 2013/12/02 15:12:27 UTC
git commit: Setting a fixed timestamp in the test case as with
different timezones the old way of getting time from a Date variable was
failing.
Updated Branches:
refs/heads/master c549ef0da -> 409ee548b
Setting a fixed timestamp in the test case as with different timezones
the old way of getting time from a Date variable was failing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/409ee548
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/409ee548
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/409ee548
Branch: refs/heads/master
Commit: 409ee548b22b05b2eefa61042bb50ae8b0d49951
Parents: c549ef0
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Mon Dec 2 15:14:20 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Mon Dec 2 15:14:20 2013 +0100
----------------------------------------------------------------------
.../salesforce/SalesforceDataContextTest.java | 23 +++++---------------
1 file changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/409ee548/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
----------------------------------------------------------------------
diff --git a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
index 8d4da09..e7acc84 100644
--- a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
+++ b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
@@ -41,6 +41,8 @@ import org.apache.metamodel.schema.ColumnType;
import org.apache.metamodel.schema.MutableColumn;
import org.apache.metamodel.schema.Schema;
import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.util.DateUtils;
+import org.apache.metamodel.util.Month;
public class SalesforceDataContextTest extends SalesforceTestCase {
@@ -351,29 +353,14 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
public void testRewriteWhereItem() throws Exception {
final StringBuilder sb = new StringBuilder("FOOBAR: ");
- final Calendar cal = Calendar.getInstance();
- cal.setTimeZone(TimeZone.getTimeZone("GMT+1"));
- cal.setTimeInMillis(0);
- cal.set(Calendar.HOUR, 0);
- cal.set(Calendar.MINUTE, 0);
- cal.set(Calendar.SECOND, 0);
- cal.set(Calendar.MILLISECOND, 0);
- cal.set(Calendar.HOUR, 0);
- cal.set(Calendar.MINUTE, 0);
- cal.set(Calendar.YEAR, 2013);
- cal.set(Calendar.MONTH, Calendar.JANUARY);
- cal.set(Calendar.DAY_OF_MONTH, 23);
- cal.set(Calendar.AM_PM, 0);
- final Date date = cal.getTime();
- final Timestamp dateTime = new Timestamp(date.getTime());
+ final Date date = DateUtils.get(2013, Month.JANUARY, 23);
+ final Timestamp dateTime = new Timestamp(0l);
final List<FilterItem> children = new ArrayList<FilterItem>();
children.add(new FilterItem(new SelectItem(new MutableColumn("foo")), OperatorType.EQUALS_TO, "hello\n 'world'"));
children.add(new FilterItem(new SelectItem(new MutableColumn("bar")), OperatorType.EQUALS_TO, 123));
children.add(new FilterItem(new SelectItem(new MutableColumn("baz").setType(ColumnType.DATE)),
OperatorType.EQUALS_TO, date));
- children.add(new FilterItem(new SelectItem(new MutableColumn("zaz").setType(ColumnType.TIMESTAMP)),
- OperatorType.EQUALS_TO, date));
children.add(new FilterItem(new SelectItem(new MutableColumn("saz").setType(ColumnType.TIMESTAMP)),
OperatorType.EQUALS_TO, dateTime));
@@ -382,7 +369,7 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
SalesforceDataContext.rewriteFilterItem(sb, filterItem);
assertEquals(
- "FOOBAR: (foo = 'hello\\n \\'world\\'' OR bar = 123 OR baz = 2013-01-23 OR zaz = 2013-01-22T23:00:00+0000 OR saz = 2013-01-22T23:00:00+0000)",
+ "FOOBAR: (foo = 'hello\\n \\'world\\'' OR bar = 123 OR baz = 2013-01-23 OR saz = 1970-01-01T00:00:00+0000)",
sb.toString());
}
}