You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/23 15:08:03 UTC
git commit: [OLINGO-296] JUnit and Edm.double
Repository: olingo-odata2
Updated Branches:
refs/heads/master 2baffa85c -> e4a7c710b
[OLINGO-296] JUnit and Edm.double
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/e4a7c710
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/e4a7c710
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/e4a7c710
Branch: refs/heads/master
Commit: e4a7c710bc56f36b4b86bcd45abd09edf227b125
Parents: 2baffa8
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri May 23 15:07:54 2014 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Fri May 23 15:07:54 2014 +0200
----------------------------------------------------------------------
.../odata2/core/ep/consumer/JsonPropertyConsumer.java | 1 +
.../core/ep/consumer/JsonPropertyConsumerTest.java | 12 ++++++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e4a7c710/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
index f3fdda3..1d0cd96 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
@@ -139,6 +139,7 @@ public class JsonPropertyConsumer {
}
break;
case Single:
+ case Double:
if (tokenType == JsonToken.STRING) {
value = reader.nextString();
} else if (tokenType == JsonToken.NUMBER) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e4a7c710/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
index 7d51314..cc5ec25 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
@@ -130,6 +130,12 @@ public class JsonPropertyConsumerTest extends BaseTest {
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Double.valueOf("123456789"), resultMap.get("Name"));
+ // Double without "
+ simplePropertyJson = "{\"d\":{\"Name\":123456789}}";
+ reader = prepareReader(simplePropertyJson);
+ when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance());
+ resultMap = execute(edmProperty, reader);
+ assertEquals(Double.valueOf("123456789"), resultMap.get("Name"));
// Int64
simplePropertyJson = "{\"d\":{\"Name\":\"123456789\"}}";
reader = prepareReader(simplePropertyJson);
@@ -142,6 +148,12 @@ public class JsonPropertyConsumerTest extends BaseTest {
when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance());
resultMap = execute(edmProperty, reader);
assertEquals(Float.valueOf("123456"), resultMap.get("Name"));
+ // Single without "
+ simplePropertyJson = "{\"d\":{\"Name\":123456}}";
+ reader = prepareReader(simplePropertyJson);
+ when(edmProperty.getType()).thenReturn(EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance());
+ resultMap = execute(edmProperty, reader);
+ assertEquals(Float.valueOf("123456"), resultMap.get("Name"));
// String
simplePropertyJson = "{\"d\":{\"Name\":\"123456789\"}}";
reader = prepareReader(simplePropertyJson);