olingo-odata4 git commit: [OLINGO-1132]Fixing tests

2017-06-08 Thread ramyav 
Repository: olingo-odata4
Updated Branches:
  refs/heads/master ce076387c -> d1ef643c9


[OLINGO-1132]Fixing tests


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d1ef643c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d1ef643c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d1ef643c

Branch: refs/heads/master
Commit: d1ef643c97afebb591183cd4731e77af708fac04
Parents: ce07638
Author: ramya vasanth 
Authored: Thu Jun 8 18:07:52 2017 +0530
Committer: ramya vasanth 
Committed: Thu Jun 8 18:07:52 2017 +0530

--
 .../java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1ef643c/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index c07a6cf..cbccb00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -1493,8 +1493,10 @@ public class BasicITCase extends 
AbstractParamTecSvcITCase {
 assertNotNull(entity.getProperty(PROPERTY_COMP).getComplexValue());
 assertEquals("olingo.odata.test1.CTAllPrim", 
entity.getProperty(PROPERTY_COMP).getComplexValue().getTypeName());
 assertEquals(PROPERTY_COMP, entity.getProperty(PROPERTY_COMP).getName());
-
assertNull(entity.getProperty(PROPERTY_COMP).getComplexValue().get("PropertyString").getPrimitiveValue());
-
assertNull(entity.getProperty(PROPERTY_COMP).getComplexValue().get("PropertyBoolean").getPrimitiveValue());
+
assertNull(entity.getProperty(PROPERTY_COMP).getComplexValue().get("PropertyString").
+getPrimitiveValue().toValue());
+
assertNull(entity.getProperty(PROPERTY_COMP).getComplexValue().get("PropertyBoolean").
+getPrimitiveValue().toValue());
   }
   
   @Test

olingo-odata4 git commit: [OLINGO-1132]Type information is lost when primitive properties with null value is updated

2017-06-08 Thread ramyav 
Repository: olingo-odata4
Updated Branches:
  refs/heads/master 66ea810b0 -> ce076387c


[OLINGO-1132]Type information is lost when primitive properties with null value 
is updated


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ce076387
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ce076387
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ce076387

Branch: refs/heads/master
Commit: ce076387c38b14a35b9824cc26a3e0e806c7e6ae
Parents: 66ea810
Author: ramya vasanth 
Authored: Thu Jun 8 17:40:55 2017 +0530
Committer: ramya vasanth 
Committed: Thu Jun 8 17:40:55 2017 +0530

--
 .../fit/tecsvc/client/AsyncSupportITCase.java   |   2 +-
 .../olingo/fit/tecsvc/client/BasicITCase.java   |   8 +-
 .../client/core/domain/ClientValuableImpl.java  |   2 +-
 .../apache/olingo/client/core/EntityTest.java   |  20 
 .../apache/olingo/client/core/ESTwoKeyNav.json  | 105 +++
 5 files changed, 131 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ce076387/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
index 68098e6..2263e9b 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AsyncSupportITCase.java
@@ -211,7 +211,7 @@ public final class AsyncSupportITCase extends 
AbstractParamTecSvcITCase {
 assertShortOrInt(42, property1.getPrimitiveValue().toValue());
 final ClientProperty property2 = 
createdEntity.getProperty("PropertyDecimal");
 assertNotNull(property2);
-assertNull(property2.getPrimitiveValue());
+assertNull(property2.getPrimitiveValue().toValue());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ce076387/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
--
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 3d33ee9..c07a6cf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -412,7 +412,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
 property2.getPrimitiveValue().toValue());
 final ClientProperty property3 = entity.getProperty(PROPERTY_INT64);
 assertNotNull(property3);
-assertNull(property3.getPrimitiveValue());
+assertNull(property3.getPrimitiveValue().toValue());
 final ClientProperty property4 = entity.getProperty("PropertyDuration");
 assertNotNull(property4);
 assertEquals(isJson() ? "PT6S" : BigDecimal.valueOf(6), 
property4.getPrimitiveValue().toValue());
@@ -439,7 +439,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
 assertShortOrInt(42, property1.getPrimitiveValue().toValue());
 final ClientProperty property2 = entity.getProperty(PROPERTY_DECIMAL);
 assertNotNull(property2);
-assertNull(property2.getPrimitiveValue());
+assertNull(property2.getPrimitiveValue().toValue());
   }
 
   @Test
@@ -504,7 +504,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
 assertNotNull(complex);
 final ClientProperty property = complex.get(PROPERTY_INT16);
 assertNotNull(property);
-assertNull(property.getPrimitiveValue());
+assertNull(property.getPrimitiveValue().toValue());
   }
 
   @Test
@@ -534,7 +534,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
 assertShortOrInt(42, property1.getPrimitiveValue().toValue());
 final ClientProperty property2 = 
createdEntity.getProperty(PROPERTY_DECIMAL);
 assertNotNull(property2);
-assertNull(property2.getPrimitiveValue());
+assertNull(property2.getPrimitiveValue().toValue());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ce076387/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
--
diff --git 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
index 4b94be6..d2f1a3a 100644
--- 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
+++ 
b/lib/client-core/src/main/java/org/apache/ol

<    1   2   3