You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2013/09/25 10:43:35 UTC
git commit: Fixed minor issue in test (for fix in OLINGO-21)
Updated Branches:
refs/heads/master 2575fa7ac -> ab94bc266
Fixed minor issue in test (for fix in OLINGO-21)
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/ab94bc26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/ab94bc26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/ab94bc26
Branch: refs/heads/master
Commit: ab94bc2664d4fef28e964f42086876e9b8571188
Parents: 2575fa7
Author: Michael Bolz <mi...@apache.org>
Authored: Wed Sep 25 10:40:35 2013 +0200
Committer: Michael Bolz <mi...@apache.org>
Committed: Wed Sep 25 10:42:50 2013 +0200
----------------------------------------------------------------------
.../odata2/core/edm/EdmSimpleTypeTest.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/ab94bc26/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
index 1a7ba42..72401a6 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
@@ -581,15 +581,18 @@ public class EdmSimpleTypeTest extends BaseTest {
public void valueToStringDateTimeSpecial() throws Exception {
for (int precision = 0; precision < 3; precision++) {
- try {
- assertValueToStringDateTimeSpecial(1954, 7, 4, precision);
- fail("Expected exception not thrown");
- } catch(EdmSimpleTypeException e) { }
-
- try {
- assertValueToStringDateTimeSpecial(1999, 7, 4, precision);
- fail("Expected exception not thrown");
- } catch(EdmSimpleTypeException e) { }
+ final EdmSimpleType instance = EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance();
+ final EdmFacets facets = getPrecisionScaleFacets(precision, null);
+ final Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+ date.set(Calendar.MILLISECOND, 10 * precision+1);
+
+ date.set(1954, 7, 4);
+ expectErrorInValueToString(instance, date, EdmLiteralKind.DEFAULT, facets,
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
+
+ date.set(1999, 7, 4);
+ expectErrorInValueToString(instance, date, EdmLiteralKind.DEFAULT, facets,
+ EdmSimpleTypeException.VALUE_FACETS_NOT_MATCHED);
}
for (int precision = 3; precision < 6; precision++) {
@@ -620,6 +623,7 @@ public class EdmSimpleTypeTest extends BaseTest {
}
Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
date.set(year, month, day);
+ date.set(Calendar.MILLISECOND, 10*precision+1);
//
String formated = instance.valueToString(date, EdmLiteralKind.DEFAULT, getPrecisionScaleFacets(precision, null));