Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-530] Finalize Deserialization

This commit is contained in:
Christian Amend 2015-01-22 12:25:28 +01:00
parent 6a6730fbaa
commit ce76e2ddd3
3 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java
View File

@ -39,7 +39,7 @@ public class EnumTypeProvider {
.setMembers(Arrays.asList( .setMembers(Arrays.asList(
new EnumMember().setName("String1").setValue("1"), new EnumMember().setName("String1").setValue("1"),
new EnumMember().setName("String2").setValue("2"), new EnumMember().setName("String2").setValue("2"),
new EnumMember().setName("String3").setValue("3"))); new EnumMember().setName("String3").setValue("4")));
} }
return null; return null;

61
lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java
View File

@ -39,7 +39,6 @@ import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.OData;
import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerException;
import org.apache.olingo.server.api.deserializer.ODataDeserializer; import org.apache.olingo.server.api.deserializer.ODataDeserializer;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTest { public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTest {
@ -416,26 +415,26 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
assertTrue(bindingToMany.getBindingLinks().isEmpty()); assertTrue(bindingToMany.getBindingLinks().isEmpty());
} }
@Ignore
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void eTTwoKeyNavEnumTest() throws Exception { public void eTTwoKeyNavEnumTest() throws Exception {
String entityString = "{" InputStream stream = getFileAsStream("EntityETMixEnumDefCollComp.json");
+ "\"PropertyEnumString\" : 2,"
+ "\"PropertyCompEnum\" : {"
+ "\"PropertyEnumString\" : 2"
+ "}}";
InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
Entity entity = Entity entity =
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm
.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
assertEquals(6, entity.getProperties().size());
Property enumProperty = entity.getProperty("PropertyEnumString"); Property enumProperty = entity.getProperty("PropertyEnumString");
assertNotNull(enumProperty); assertNotNull(enumProperty);
assertEquals((short) 2, enumProperty.getValue()); assertEquals((short) 2, enumProperty.getValue());
Property complexProperty = entity.getProperty("PropertyCompEnum"); Property defProperty = entity.getProperty("PropertyDefString");
assertNotNull(defProperty);
assertEquals("string", defProperty.getValue());
Property complexProperty = entity.getProperty("PropertyCompMixedEnumTypeDefColl");
List<Property> value = (List<Property>) complexProperty.getValue(); List<Property> value = (List<Property>) complexProperty.getValue();
assertEquals((short) 2, value.get(0).getValue()); assertEquals((short) 2, value.get(0).getValue());
} }
@ -1078,9 +1077,8 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
} }
} }
@Ignore
@Test(expected = DeserializerException.class) @Test(expected = DeserializerException.class)
public void eTTwoKeyNavInvalidEnumValueNull() throws Exception { public void eTMixEnumDefCollCompInvalidEnumValueNull() throws Exception {
String entityString = "{" String entityString = "{"
+ "\"PropertyEnumString\" : null," + "\"PropertyEnumString\" : null,"
+ "\"PropertyCompEnum\" : {" + "\"PropertyCompEnum\" : {"
@ -1090,35 +1088,33 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
InputStream stream = new ByteArrayInputStream(entityString.getBytes()); InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
try { try {
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
} catch (DeserializerException e) { } catch (DeserializerException e) {
assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey()); assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey());
throw e; throw e;
} }
} }
@Ignore
@Test(expected = DeserializerException.class) @Test(expected = DeserializerException.class)
public void eTTwoKeyNavInvalidComplexEnumValueNull() throws Exception { public void eTMixEnumDefCollCompNavInvalidComplexEnumValueNull() throws Exception {
String entityString = "{" String entityString = "{"
+ "\"PropertyEnumString\" : 2," + "\"PropertyEnumString\" : 2,"
+ "\"PropertyCompEnum\" : {" + "\"PropertyCompMixedEnumTypeDefColl\" : {"
+ "\"PropertyEnumString\" : null" + "\"PropertyEnumString\" : null"
+ "}}"; + "}}";
InputStream stream = new ByteArrayInputStream(entityString.getBytes()); InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
try { try {
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
} catch (DeserializerException e) { } catch (DeserializerException e) {
assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey()); assertEquals(DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, e.getMessageKey());
throw e; throw e;
} }
} }
@Ignore
@Test(expected = DeserializerException.class) @Test(expected = DeserializerException.class)
public void eTTwoKeyNavInvalidEnumValueArray() throws Exception { public void eTMixEnumDefCollCompInvalidEnumValueArray() throws Exception {
String entityString = "{" String entityString = "{"
+ "\"PropertyEnumString\" : []," + "\"PropertyEnumString\" : [],"
+ "\"PropertyCompEnum\" : {" + "\"PropertyCompEnum\" : {"
@ -1128,16 +1124,15 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
InputStream stream = new ByteArrayInputStream(entityString.getBytes()); InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
try { try {
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
} catch (DeserializerException e) { } catch (DeserializerException e) {
assertEquals(DeserializerException.MessageKeys.INVALID_JSON_TYPE_FOR_PROPERTY, e.getMessageKey()); assertEquals(DeserializerException.MessageKeys.INVALID_JSON_TYPE_FOR_PROPERTY, e.getMessageKey());
throw e; throw e;
} }
} }
@Ignore
@Test(expected = DeserializerException.class) @Test(expected = DeserializerException.class)
public void eTTwoKeyNavInvalidEnumValueObject() throws Exception { public void eTMixEnumDefCollCompInvalidEnumValueObject() throws Exception {
String entityString = "{" String entityString = "{"
+ "\"PropertyEnumString\" : {}," + "\"PropertyEnumString\" : {},"
+ "\"PropertyCompEnum\" : {" + "\"PropertyCompEnum\" : {"
@ -1147,16 +1142,15 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
InputStream stream = new ByteArrayInputStream(entityString.getBytes()); InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
try { try {
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
} catch (DeserializerException e) { } catch (DeserializerException e) {
assertEquals(DeserializerException.MessageKeys.INVALID_JSON_TYPE_FOR_PROPERTY, e.getMessageKey()); assertEquals(DeserializerException.MessageKeys.INVALID_JSON_TYPE_FOR_PROPERTY, e.getMessageKey());
throw e; throw e;
} }
} }
@Ignore
@Test(expected = DeserializerException.class) @Test(expected = DeserializerException.class)
public void eTTwoKeyNavInvalidEnumValue() throws Exception { public void eTMixEnumDefCollCompInvalidEnumValue() throws Exception {
String entityString = "{" String entityString = "{"
+ "\"PropertyEnumString\" : \"invalid\"," + "\"PropertyEnumString\" : \"invalid\","
+ "\"PropertyCompEnum\" : {" + "\"PropertyCompEnum\" : {"
@ -1166,16 +1160,15 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
InputStream stream = new ByteArrayInputStream(entityString.getBytes()); InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
try { try {
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
} catch (DeserializerException e) { } catch (DeserializerException e) {
assertEquals(DeserializerException.MessageKeys.INVALID_VALUE_FOR_PROPERTY, e.getMessageKey()); assertEquals(DeserializerException.MessageKeys.INVALID_VALUE_FOR_PROPERTY, e.getMessageKey());
throw e; throw e;
} }
} }
@Ignore
@Test(expected = DeserializerException.class) @Test(expected = DeserializerException.class)
public void eTTwoKeyNavInvalidEnumValueByPrimitiveTypeException() throws Exception { public void eTMixEnumDefCollCompInvalidEnumValueByPrimitiveTypeException() throws Exception {
String entityString = "{" String entityString = "{"
+ "\"PropertyEnumString\" : 18," + "\"PropertyEnumString\" : 18,"
+ "\"PropertyCompEnum\" : {" + "\"PropertyCompEnum\" : {"
@ -1185,13 +1178,13 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
InputStream stream = new ByteArrayInputStream(entityString.getBytes()); InputStream stream = new ByteArrayInputStream(entityString.getBytes());
ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON);
try { try {
deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETTwoKeyNav"))); deserializer.entity(stream, edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETMixEnumDefCollComp")));
} catch (DeserializerException e) { } catch (DeserializerException e) {
assertEquals(DeserializerException.MessageKeys.INVALID_VALUE_FOR_PROPERTY, e.getMessageKey()); assertEquals(DeserializerException.MessageKeys.INVALID_VALUE_FOR_PROPERTY, e.getMessageKey());
throw e; throw e;
} }
} }
// @Test(expected = DeserializerException.class) // @Test(expected = DeserializerException.class)
// public void invalidJsonValueForPrimCollectionTypeObject() throws Exception { // public void invalidJsonValueForPrimCollectionTypeObject() throws Exception {
// final String entityString = "{" // final String entityString = "{"

24
lib/server-test/src/test/resources/EntityETMixEnumDefCollComp.json Normal file
View File

@ -0,0 +1,24 @@
{
"PropertyEnumString" : 2,
"PropertyDefString" : "string",
"CollPropertyEnumString" : [1, 2],
"CollPropertyDefString" : ["string1", "string2"],
"PropertyCompMixedEnumTypeDefColl" : {
"PropertyEnumString" : 2,
"PropertyDefString" : "string",
"CollPropertyEnumString" : [1, 2],
"CollPropertyDefString" : ["string1", "string2"]
},
"CollPropertyCompMixedEnumDefColl" : [{
"PropertyEnumString" : 2,
"PropertyDefString" : "string",
"CollPropertyEnumString" : [1, 2],
"CollPropertyDefString" : ["string1", "string2"]
}, {
"PropertyEnumString" : 2,
"PropertyDefString" : "string",
"CollPropertyEnumString" : [1, 2],
"CollPropertyDefString" : ["string1", "string2"]
}
]
}