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/19 15:28:28 UTC
[39/50] [abbrv] git commit: [OLINGO-260] fix type seraialization +
opentype integration test extension
[OLINGO-260] fix type seraialization + opentype integration test extension
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c8ede38f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c8ede38f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c8ede38f
Branch: refs/heads/master
Commit: c8ede38f65281bb283856b230ee8a3d978a4e666
Parents: e1e637f
Author: fmartelli <fa...@gmail.com>
Authored: Thu May 15 10:35:24 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Mon May 19 14:35:02 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java | 6 +++---
.../test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8ede38f/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
index 853a1b7..95a1e9f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
@@ -119,9 +119,9 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
assertEquals(String.class, rowIndex.getAdditionalProperty("aString").getClass());
assertEquals(Boolean.class, rowIndex.getAdditionalProperty("aBoolean").getClass());
assertEquals(Double.class, rowIndex.getAdditionalProperty("aDouble").getClass());
-// assertEquals(Short.class, rowIndex.getAdditionalProperty("aByte").getClass()); // trova integer
-// assertEquals(Byte.MAX_VALUE, rowIndex.getAdditionalProperty("aByte"));
-// assertEquals(Calendar.class, rowIndex.getAdditionalProperty("aDate").getClass()); // trova stringa
+ assertEquals(Byte.class, rowIndex.getAdditionalProperty("aByte").getClass());
+ assertEquals(Byte.MAX_VALUE, rowIndex.getAdditionalProperty("aByte"));
+ assertTrue(Calendar.class.isAssignableFrom(rowIndex.getAdditionalProperty("aDate").getClass()));
// assertEquals(ContactDetails.class, rowIndex.getAdditionalProperty("aContact").getClass().getInterfaces()[0]);
entityContext.detachAll();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8ede38f/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
index b3490a0..25b5065 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
@@ -81,7 +81,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
final Integer id = 1426;
ODataEntity rowIndex = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV3.RowIndex"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesService.RowIndex"));
getClient().getBinder().add(rowIndex,
getClient().getObjectFactory().newPrimitiveProperty("Id",
getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
@@ -106,7 +106,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
build()));
final ODataComplexValue<ODataProperty> contactDetails = getClient().getObjectFactory().newComplexValue(
- "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails");
+ "Microsoft.Test.OData.Services.OpenTypesService.ContactDetails");
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("FirstContacted",
getClient().getObjectFactory().newPrimitiveValueBuilder().buildBinary("text".getBytes())));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("LastContacted",
@@ -161,7 +161,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
assertTrue(rowIndex.getProperty("aDate").hasPrimitiveValue());
assertEquals(EdmPrimitiveTypeKind.DateTime, rowIndex.getProperty("aDate").getPrimitiveValue().getTypeKind());
assertTrue(rowIndex.getProperty("aContact").hasComplexValue());
- assertEquals("Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails",
+ assertEquals("Microsoft.Test.OData.Services.OpenTypesService.ContactDetails",
rowIndex.getProperty("aContact").getValue().getTypeName());
assertTrue(rowIndex.getProperty("aContact").getComplexValue().get("SignedByte").hasPrimitiveValue());