olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [25/59] [abbrv] [partial] Removing /ODataJClient: merge complete
Date Fri, 23 May 2014 10:58:20 GMT
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java
deleted file mode 100644
index 5cf3b41..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.v4;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.AbstractTest;
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Type;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.StoreGeneratedPattern;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Action;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotations;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Function;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Singleton;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.Apply;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.Collection;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.ConstExprConstruct;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.Path;
-import java.util.List;
-import org.junit.Test;
-
-public class V4MetadataTest extends AbstractTest {
-
-    @Override
-    protected ODataV4Client getClient() {
-        return v4Client;
-    }
-
-    @Test
-    public void parse() {
-        final EdmV4Metadata metadata = getClient().getReader().
-                readMetadata(getClass().getResourceAsStream("metadata.xml"));
-        assertNotNull(metadata);
-
-        // 1. Enum
-        final EnumType responseEnumType = metadata.getSchema(0).getEnumType("ResponseType");
-        assertNotNull(responseEnumType);
-        assertEquals(6, responseEnumType.getMembers().size());
-        assertEquals(3, responseEnumType.getMember("Accepted").getValue().intValue());
-        assertEquals("Accepted", responseEnumType.getMember(3).getName());
-
-        final EdmV4Type responseType = new EdmV4Type(metadata, "Microsoft.Exchange.Services.OData.Model.ResponseType");
-        assertNotNull(responseType);
-        assertFalse(responseType.isCollection());
-        assertFalse(responseType.isSimpleType());
-        assertTrue(responseType.isEnumType());
-        assertFalse(responseType.isComplexType());
-        assertFalse(responseType.isEntityType());
-
-        // 2. Complex
-        final ComplexType responseStatus = metadata.getSchema(0).getComplexType("ResponseStatus");
-        assertNotNull(responseStatus);
-        assertTrue(responseStatus.getNavigationProperties().isEmpty());
-        assertEquals(EdmSimpleType.DateTimeOffset,
-                EdmSimpleType.fromValue(responseStatus.getProperty("Time").getType()));
-
-        // 3. Entity
-        final EntityType user = metadata.getSchema(0).getEntityType("User");
-        assertNotNull(user);
-        assertEquals("Microsoft.Exchange.Services.OData.Model.Entity", user.getBaseType());
-        assertFalse(user.getProperties().isEmpty());
-        assertFalse(user.getNavigationProperties().isEmpty());
-        assertEquals("Microsoft.Exchange.Services.OData.Model.Folder", user.getNavigationProperty("Inbox").getType());
-
-        // 4. Action
-        final List<Action> moves = metadata.getSchema(0).getActions("Move");
-        assertFalse(moves.isEmpty());
-        Action move = null;
-        for (Action action : moves) {
-            if ("Microsoft.Exchange.Services.OData.Model.EmailMessage".equals(action.getReturnType().getType())) {
-                move = action;
-            }
-        }
-        assertNotNull(move);
-        assertTrue(move.isBound());
-        assertEquals("bindingParameter", move.getEntitySetPath());
-        assertEquals(2, move.getParameters().size());
-        assertEquals("Microsoft.Exchange.Services.OData.Model.EmailMessage", move.getParameters().get(0).getType());
-
-        // 5. EntityContainer
-        final EntityContainer container = metadata.getSchema(0).getEntityContainer();
-        assertNotNull(container);
-        final EntitySet users = container.getEntitySet("Users");
-        assertNotNull(users);
-        assertEquals(metadata.getSchema(0).getNamespace() + "." + user.getName(), users.getEntityType());
-        assertEquals(user.getNavigationProperties().size(), users.getNavigationPropertyBindings().size());
-    }
-
-    @Test
-    public void demo() {
-        final EdmV4Metadata metadata = getClient().getReader().
-                readMetadata(getClass().getResourceAsStream("demo-metadata.xml"));
-        assertNotNull(metadata);
-
-        assertFalse(metadata.getSchema(0).getAnnotationsList().isEmpty());
-        Annotations annots = metadata.getSchema(0).getAnnotationsList("ODataDemo.DemoService/Suppliers");
-        assertNotNull(annots);
-        assertFalse(annots.getAnnotations().isEmpty());
-        assertEquals(ConstExprConstruct.Type.String,
-                annots.getAnnotation("Org.OData.Publication.V1.PrivacyPolicyUrl").getConstExpr().getType());
-        assertEquals("http://www.odata.org/",
-                annots.getAnnotation("Org.OData.Publication.V1.PrivacyPolicyUrl").getConstExpr().getValue());
-    }
-
-    @Test
-    public void multipleSchemas() {
-        final EdmV4Metadata metadata = getClient().getReader().
-                readMetadata(getClass().getResourceAsStream("northwind-metadata.xml"));
-        assertNotNull(metadata);
-
-        final Schema first = metadata.getSchema("NorthwindModel");
-        assertNotNull(first);
-
-        final Schema second = metadata.getSchema("ODataWebExperimental.Northwind.Model");
-        assertNotNull(second);
-
-        assertEquals(StoreGeneratedPattern.Identity,
-                first.getEntityType("Category").getProperty("CategoryID").getStoreGeneratedPattern());
-
-        final EntityContainer entityContainer = second.getDefaultEntityContainer();
-        assertNotNull(entityContainer);
-        assertEquals("NorthwindEntities", entityContainer.getName());
-        assertTrue(entityContainer.isLazyLoadingEnabled());
-    }
-
-    /**
-     * Tests Example 85 from CSDL specification.
-     */
-    @Test
-    public void fromdoc1() {
-        final EdmV4Metadata metadata = getClient().getReader().
-                readMetadata(getClass().getResourceAsStream("fromdoc1-metadata.xml"));
-        assertNotNull(metadata);
-
-        assertFalse(metadata.getReferences().isEmpty());
-        assertEquals("Org.OData.Measures.V1", metadata.getReferences().get(1).getIncludes().get(0).getNamespace());
-
-        final EntityType product = metadata.getSchema(0).getEntityType("Product");
-        assertTrue(product.isHasStream());
-        assertEquals("UoM.ISOCurrency", product.getProperty("Price").getAnnotation().getTerm());
-        //assertEquals("Currency", product.getProperty("Price").getAnnotation().));
-        assertEquals("Products", product.getNavigationProperty("Supplier").getPartner());
-
-        final EntityType category = metadata.getSchema(0).getEntityType("Category");
-        final EdmV4Type type = new EdmV4Type(metadata, category.getNavigationProperty("Products").getType());
-        assertNotNull(type);
-        assertTrue(type.isCollection());
-        assertFalse(type.isSimpleType());
-
-        final ComplexType address = metadata.getSchema(0).getComplexType("Address");
-        assertFalse(address.getNavigationProperty("Country").getReferentialConstraints().isEmpty());
-        assertEquals("Name",
-                address.getNavigationProperty("Country").getReferentialConstraints().get(0).getReferencedProperty());
-
-        final Function productsByRating = metadata.getSchema(0).getFunctions("ProductsByRating").get(0);
-        assertNotNull(productsByRating.getParameter("Rating"));
-        assertEquals("Edm.Int32", productsByRating.getParameter("Rating").getType());
-        assertEquals("Collection(ODataDemo.Product)", productsByRating.getReturnType().getType());
-
-        final Singleton contoso = metadata.getSchema(0).getEntityContainer().getSingleton("Contoso");
-        assertNotNull(contoso);
-        assertFalse(contoso.getNavigationPropertyBindings().isEmpty());
-        assertEquals("Products", contoso.getNavigationPropertyBindings().get(0).getPath());
-
-        final FunctionImport functionImport = metadata.getSchema(0).getEntityContainer().
-                getFunctionImport("ProductsByRating");
-        assertNotNull(functionImport);
-        assertEquals(metadata.getSchema(0).getNamespace() + "." + productsByRating.getName(),
-                functionImport.getFunction());
-    }
-
-    /**
-     * Tests Example 86 from CSDL specification.
-     */
-    @Test
-    public void fromdoc2() {
-        final EdmV4Metadata metadata = getClient().getReader().
-                readMetadata(getClass().getResourceAsStream("fromdoc2-metadata.xml"));
-        assertNotNull(metadata);
-
-        // Check displayName
-        final Annotation displayName = metadata.getSchema(0).getAnnotationsList("ODataDemo.Supplier").
-                getAnnotation("Vocabulary1.DisplayName");
-        assertNotNull(displayName);
-        assertNull(displayName.getConstExpr());
-        assertNotNull(displayName.getDynExpr());
-
-        assertTrue(displayName.getDynExpr() instanceof Apply);
-        final Apply apply = (Apply) displayName.getDynExpr();
-        assertEquals(Apply.CANONICAL_FUNCTION_CONCAT, apply.getFunction());
-        assertEquals(3, apply.getParameters().size());
-
-        final Path firstArg = new Path();
-        firstArg.setValue("Name");
-        assertEquals(firstArg, apply.getParameters().get(0));
-
-        final ConstExprConstruct secondArg = new ConstExprConstruct();
-        secondArg.setType(ConstExprConstruct.Type.String);
-        secondArg.setValue(" in ");
-        assertEquals(secondArg, apply.getParameters().get(1));
-
-        final Path thirdArg = new Path();
-        thirdArg.setValue("Address/CountryName");
-        assertEquals(thirdArg, apply.getParameters().get(2));
-
-        // Check Tags
-        final Annotation tags = metadata.getSchema(0).getAnnotationsList("ODataDemo.Product").
-                getAnnotation("Vocabulary1.Tags");
-        assertNotNull(tags);
-        assertNull(tags.getConstExpr());
-        assertNotNull(tags.getDynExpr());
-
-        assertTrue(tags.getDynExpr() instanceof Collection);
-        final Collection collection = (Collection) tags.getDynExpr();
-        assertEquals(1, collection.getItems().size());
-        assertEquals(ConstExprConstruct.Type.String, ((ConstExprConstruct) collection.getItems().get(0)).getType());
-        assertEquals("MasterData", ((ConstExprConstruct) collection.getItems().get(0)).getValue());
-    }
-
-    /**
-     * Various annotation examples taken from CSDL specification.
-     */
-    @Test
-    public void fromdoc3() {
-        final EdmV4Metadata metadata = getClient().getReader().
-                readMetadata(getClass().getResourceAsStream("fromdoc3-metadata.xml"));
-        assertNotNull(metadata);
-    }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java
deleted file mode 100644
index 1b732da..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V4XMLPrimitiveTest extends V4JSONPrimitiveTest {
-
-    @Override
-    protected ODataFormat getFormat() {
-        return ODataFormat.XML;
-    }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java
deleted file mode 100644
index 19671db..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.v4;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import org.junit.Test;
-
-public class V4XMLServiceDocumentTest extends V4JSONServiceDocumentTest {
-
-    @Override
-    protected ODataFormat getFormat() {
-        return ODataFormat.XML;
-    }
-
-    @Test
-    public void parseTMP() {
-        super.parse();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json
deleted file mode 100644
index 8e18317..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeometryLineString","value":{"type":"LineString","coordinates":[[1.0,1.0],[3.0,3.0],[2.0,4.0],[2.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml
deleted file mode 100644
index e103b35..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<d:Geom xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryLineString"><gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>1 1</gml:pos><gml:pos>3 3</gml:pos><gml:pos>2 4</gml:pos><gml:pos>2 0</gml:pos></gml:LineString></d:Geom>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json
deleted file mode 100644
index a5bbb8f..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#AllGeoTypesSet/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes","odata.id":"http://192.168.0.160:8080/DefaultService.svc/AllGeoTypesSet(-5)","odata.editLink":"AllGeoTypesSet(-5)","Id":-5,"Geog@odata.type":"Edm.Geography","Geog":{"type":"GeometryCollection","geometries":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPoint":null,"GeogLine@odata.type":"Edm.GeographyLineString","GeogLine":{"type":"LineString","coordinates":[[10.5,10.5],[20.5,20.5],[10.5,40.5]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPolygon@odata.type":"Edm.GeographyPolygon","GeogPolygon":{"type":"Polygon","coordinates":[[[15.0,5.0],[40.0,10.0],[10.0,20.0],[5.0,10.0],[15.0,5.0]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogCollection@odata.type":"Edm.GeographyCollection","GeogCollection":{"type":"GeometryCollection","geometries":[{"type":"Geometry
 Collection","geometries":[]},{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,2.0]}]}],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPoint@odata.type":"Edm.GeographyMultiPoint","GeogMultiPoint":{"type":"MultiPoint","coordinates":[[-122.7,47.38]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiLine@odata.type":"Edm.GeographyMultiLineString","GeogMultiLine":{"type":"MultiLineString","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPolygon@odata.type":"Edm.GeographyMultiPolygon","GeogMultiPolygon":{"type":"MultiPolygon","coordinates":[[[[40.0,40.0],[20.0,45.0],[45.0,30.0],[40.0,40.0]]],[[[20.0,35.0],[45.0,20.0],[30.0,5.0],[10.0,10.0],[10.0,30.0],[20.0,35.0]],[[30.0,20.0],[20.0,25.0],[20.0,15.0],[30.0,20.0]]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"Geom@odata.type":"Edm.Geometry","Geom":{"type":"Polygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EP
 SG:0"}}},"GeomPoint@odata.type":"Edm.GeometryPoint","GeomPoint":{"type":"Point","coordinates":[4513675.2944411123,6032903.5882574534],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomLine@odata.type":"Edm.GeometryLineString","GeomLine":{"type":"LineString","coordinates":[[1.0,1.0],[3.0,3.0],[2.0,4.0],[2.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomPolygon@odata.type":"Edm.GeometryPolygon","GeomPolygon":{"type":"Polygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomCollection@odata.type":"Edm.GeometryCollection","GeomCollection":{"type":"GeometryCollection","geometries":[{"type":"GeometryCollection","geometries":[]},{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,2.0]}]}],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPoint@odata.type":"Edm.GeometryMultiPoint","GeomMultiPoint":{"type":"MultiPoint","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMul
 tiLine@odata.type":"Edm.GeometryMultiLineString","GeomMultiLine":{"type":"MultiLineString","coordinates":[[[10.0,10.0],[20.0,20.0],[10.0,40.0]],[[40.0,40.0],[30.0,30.0],[40.0,20.0],[30.0,10.0]]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPolygon":null}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml
deleted file mode 100644
index 3bc5f87..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<entry xml:base="http://192.168.0.160:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.0.160:8080/DefaultService.svc/AllGeoTypesSet(-5)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)" /><title /><updated>2013-09-11T07:48:06Z</updated><author><name /></author><content type="application/xml"><m:properties><d:Id m:type="Edm.Int32">-5</d:Id><d:Geog m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /></d:Geog><d:GeogPoint m:null="true" /><d:GeogLine m:type="Edm.GeographyLineString"><gml:LineString gml:srsN
 ame="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pos>10.5 10.5</gml:pos><gml:pos>20.5 20.5</gml:pos><gml:pos>40.5 10.5</gml:pos></gml:LineString></d:GeogLine><d:GeogPolygon m:type="Edm.GeographyPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:exterior><gml:LinearRing><gml:pos>5 15</gml:pos><gml:pos>10 40</gml:pos><gml:pos>20 10</gml:pos><gml:pos>10 5</gml:pos><gml:pos>5 15</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon></d:GeogPolygon><d:GeogCollection m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>2 1</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:geometryMembers></gml:MultiGeometry></d:GeogCollection><d:GeogMultiPoint m:type="Edm.GeographyMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pointMembers><gml:Point>
 <gml:pos>47.38 -122.7</gml:pos></gml:Point></gml:pointMembers></gml:MultiPoint></d:GeogMultiPoint><d:GeogMultiLine m:type="Edm.GeographyMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /></d:GeogMultiLine><d:GeogMultiPolygon m:type="Edm.GeographyMultiPolygon"><gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:surfaceMembers><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>40 40</gml:pos><gml:pos>45 20</gml:pos><gml:pos>30 45</gml:pos><gml:pos>40 40</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>35 20</gml:pos><gml:pos>20 45</gml:pos><gml:pos>5 30</gml:pos><gml:pos>10 10</gml:pos><gml:pos>30 10</gml:pos><gml:pos>35 20</gml:pos></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:pos>20 30</gml:pos><gml:pos>25 20</gml:pos><gml:pos>15 20</gml:pos><gml:pos>20 30</gml:pos></gml:LinearRing></gml:interior></gml:Polygon></gml:surfaceMembers></gml
 :MultiSurface></d:GeogMultiPolygon><d:Geom m:type="Edm.GeometryPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /></d:Geom><d:GeomPoint m:type="Edm.GeometryPoint"><gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>4513675.2944411123 6032903.5882574534</gml:pos></gml:Point></d:GeomPoint><d:GeomLine m:type="Edm.GeometryLineString"><gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>1 1</gml:pos><gml:pos>3 3</gml:pos><gml:pos>2 4</gml:pos><gml:pos>2 0</gml:pos></gml:LineString></d:GeomLine><d:GeomPolygon m:type="Edm.GeometryPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /></d:GeomPolygon><d:GeomCollection m:type="Edm.GeometryCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>1 2</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:g
 eometryMembers></gml:MultiGeometry></d:GeomCollection><d:GeomMultiPoint m:type="Edm.GeometryMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /></d:GeomMultiPoint><d:GeomMultiLine m:type="Edm.GeometryMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:curveMembers><gml:LineString><gml:pos>10 10</gml:pos><gml:pos>20 20</gml:pos><gml:pos>10 40</gml:pos></gml:LineString><gml:LineString><gml:pos>40 40</gml:pos><gml:pos>30 30</gml:pos><gml:pos>40 20</gml:pos><gml:pos>30 10</gml:pos></gml:LineString></gml:curveMembers></gml:MultiCurve></d:GeomMultiLine><d:GeomMultiPolygon m:null="true" /></m:properties></content></entry>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json
deleted file mode 100644
index 2e3469b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#AllGeoTypesSet/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes","odata.id":"http://192.168.43.55:8080/DefaultService.svc/AllGeoTypesSet(-8)","odata.editLink":"AllGeoTypesSet(-8)","Id":-8,"Geog@odata.type":"Edm.Geography","Geog":{"type":"Point","coordinates":[178.94,51.5961],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPoint@odata.type":"Edm.GeographyPoint","GeogPoint":{"type":"Point","coordinates":[178.7,51.65],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogLine@odata.type":"Edm.GeographyLineString","GeogLine":{"type":"LineString","coordinates":[[10.0,10.0],[20.0,20.0],[10.0,40.0]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPolygon@odata.type":"Edm.GeographyPolygon","GeogPolygon":{"type":"Polygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogCollection@odata.type":"Edm.GeographyColle
 ction","GeogCollection":{"type":"GeometryCollection","geometries":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPoint@odata.type":"Edm.GeographyMultiPoint","GeogMultiPoint":{"type":"MultiPoint","coordinates":[[-122.7,47.38]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiLine@odata.type":"Edm.GeographyMultiLineString","GeogMultiLine":{"type":"MultiLineString","coordinates":[[[10.5,10.5],[20.5,20.5],[10.5,40.5]],[[40.5,40.5],[30.5,30.5],[40.5,20.5],[30.5,10.5]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPolygon@odata.type":"Edm.GeographyMultiPolygon","GeogMultiPolygon":{"type":"MultiPolygon","coordinates":[[[[40.0,40.0],[20.0,45.0],[45.0,30.0],[40.0,40.0]]],[[[20.0,35.0],[45.0,20.0],[30.0,5.0],[10.0,10.0],[10.0,30.0],[20.0,35.0]],[[30.0,20.0],[20.0,25.0],[20.0,15.0],[30.0,20.0]]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"Geom@odata.type":"Edm.Geometry","Geom":{"type":"Point","coordinates":[4369367.0
 586663447,6352015.6916818349],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomPoint@odata.type":"Edm.GeometryPoint","GeomPoint":{"type":"Point","coordinates":[4377000.868172125,6348217.1067010015],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomLine@odata.type":"Edm.GeometryLineString","GeomLine":{"type":"LineString","coordinates":[[1.0,1.0],[3.0,3.0],[2.0,4.0],[2.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomPolygon@odata.type":"Edm.GeometryPolygon","GeomPolygon":{"type":"Polygon","coordinates":[[[30.0,20.0],[10.0,40.0],[45.0,40.0],[30.0,20.0]]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomCollection@odata.type":"Edm.GeometryCollection","GeomCollection":{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[4.0,6.0]},{"type":"LineString","coordinates":[[4.0,6.0],[7.0,10.0]]}],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPoint":null,"GeomMultiLine@odata.type":"Edm.GeometryMultiLineString",
 "GeomMultiLine":{"type":"MultiLineString","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPolygon@odata.type":"Edm.GeometryMultiPolygon","GeomMultiPolygon":{"type":"MultiPolygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml
deleted file mode 100644
index 81213bf..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" 
-       xmlns="http://www.w3.org/2005/Atom" 
-       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
-       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
-       xmlns:georss="http://www.georss.org/georss" 
-       xmlns:gml="http://www.opengis.net/gml">
-  <id>http://192.168.43.55:8080/DefaultService.svc/AllGeoTypesSet(-8)</id>
-  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-  <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)" />
-  <title />
-  <updated>2013-08-21T10:50:04Z</updated>
-  <author>
-    <name />
-  </author>
-  <content type="application/xml">
-    <m:properties>
-      <d:Id m:type="Edm.Int32">-8</d:Id>
-      <d:Geog m:type="Edm.GeographyPoint">
-        <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:pos>51.5961 178.94</gml:pos>
-        </gml:Point>
-      </d:Geog>
-      <d:GeogPoint m:type="Edm.GeographyPoint">
-        <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:pos>51.65 178.7</gml:pos>
-        </gml:Point>
-      </d:GeogPoint>
-      <d:GeogLine m:type="Edm.GeographyLineString">
-        <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:pos>10 10</gml:pos>
-          <gml:pos>20 20</gml:pos>
-          <gml:pos>40 10</gml:pos>
-        </gml:LineString>
-      </d:GeogLine>
-      <d:GeogPolygon m:type="Edm.GeographyPolygon">
-        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
-      </d:GeogPolygon>
-      <d:GeogCollection m:type="Edm.GeographyCollection">
-        <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
-      </d:GeogCollection>
-      <d:GeogMultiPoint m:type="Edm.GeographyMultiPoint">
-        <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:pointMembers>
-            <gml:Point>
-              <gml:pos>47.38 -122.7</gml:pos>
-            </gml:Point>
-          </gml:pointMembers>
-        </gml:MultiPoint>
-      </d:GeogMultiPoint>
-      <d:GeogMultiLine m:type="Edm.GeographyMultiLineString">
-        <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:curveMembers>
-            <gml:LineString>
-              <gml:pos>10.5 10.5</gml:pos>
-              <gml:pos>20.5 20.5</gml:pos>
-              <gml:pos>40.5 10.5</gml:pos>
-            </gml:LineString>
-            <gml:LineString>
-              <gml:pos>40.5 40.5</gml:pos>
-              <gml:pos>30.5 30.5</gml:pos>
-              <gml:pos>20.5 40.5</gml:pos>
-              <gml:pos>10.5 30.5</gml:pos>
-            </gml:LineString>
-          </gml:curveMembers>
-        </gml:MultiCurve>
-      </d:GeogMultiLine>
-      <d:GeogMultiPolygon m:type="Edm.GeographyMultiPolygon">
-        <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:surfaceMembers>
-            <gml:Polygon>
-              <gml:exterior>
-                <gml:LinearRing>
-                  <gml:pos>40 40</gml:pos>
-                  <gml:pos>45 20</gml:pos>
-                  <gml:pos>30 45</gml:pos>
-                  <gml:pos>40 40</gml:pos>
-                </gml:LinearRing>
-              </gml:exterior>
-            </gml:Polygon>
-            <gml:Polygon>
-              <gml:exterior>
-                <gml:LinearRing>
-                  <gml:pos>35 20</gml:pos>
-                  <gml:pos>20 45</gml:pos>
-                  <gml:pos>5 30</gml:pos>
-                  <gml:pos>10 10</gml:pos>
-                  <gml:pos>30 10</gml:pos>
-                  <gml:pos>35 20</gml:pos>
-                </gml:LinearRing>
-              </gml:exterior>
-              <gml:interior>
-                <gml:LinearRing>
-                  <gml:pos>20 30</gml:pos>
-                  <gml:pos>25 20</gml:pos>
-                  <gml:pos>15 20</gml:pos>
-                  <gml:pos>20 30</gml:pos>
-                </gml:LinearRing>
-              </gml:interior>
-            </gml:Polygon>
-          </gml:surfaceMembers>
-        </gml:MultiSurface>
-      </d:GeogMultiPolygon>
-      <d:Geom m:type="Edm.GeometryPoint">
-        <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:pos>4369367.0586663447 6352015.6916818349</gml:pos>
-        </gml:Point>
-      </d:Geom>
-      <d:GeomPoint m:type="Edm.GeometryPoint">
-        <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:pos>4377000.868172125 6348217.1067010015</gml:pos>
-        </gml:Point>
-      </d:GeomPoint>
-      <d:GeomLine m:type="Edm.GeometryLineString">
-        <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:pos>1 1</gml:pos>
-          <gml:pos>3 3</gml:pos>
-          <gml:pos>2 4</gml:pos>
-          <gml:pos>2 0</gml:pos>
-        </gml:LineString>
-      </d:GeomLine>
-      <d:GeomPolygon m:type="Edm.GeometryPolygon">
-        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:exterior>
-            <gml:LinearRing>
-              <gml:pos>30 20</gml:pos>
-              <gml:pos>10 40</gml:pos>
-              <gml:pos>45 40</gml:pos>
-              <gml:pos>30 20</gml:pos>
-            </gml:LinearRing>
-          </gml:exterior>
-        </gml:Polygon>
-      </d:GeomPolygon>
-      <d:GeomCollection m:type="Edm.GeometryCollection">
-        <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:geometryMembers>
-            <gml:Point>
-              <gml:pos>4 6</gml:pos>
-            </gml:Point>
-            <gml:LineString>
-              <gml:pos>4 6</gml:pos>
-              <gml:pos>7 10</gml:pos>
-            </gml:LineString>
-          </gml:geometryMembers>
-        </gml:MultiGeometry>
-      </d:GeomCollection>
-      <d:GeomMultiPoint m:null="true" />
-      <d:GeomMultiLine m:type="Edm.GeometryMultiLineString">
-        <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
-      </d:GeomMultiLine>
-      <d:GeomMultiPolygon m:type="Edm.GeometryMultiPolygon">
-        <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
-      </d:GeomMultiPolygon>
-    </m:properties>
-  </content>
-</entry>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json
deleted file mode 100644
index d62d51b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#Car/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://192.168.43.55:8080/DefaultService.svc/Car(16)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Photo@odata.mediaContentType":"application/octet-stream","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml
deleted file mode 100644
index 0560385..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.43.55:8080/DefaultService.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2013-08-21T10:31:09Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" type="application/octet-stream" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" s
 rc="Car(16)/$value" /><m:properties><d:VIN m:type="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json
deleted file mode 100644
index 88c7804..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#ComputerDetail/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpssz
 luundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml
deleted file mode 100644
index f9c0e4f..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2013-08-21T10:53:24Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrn
 qcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://192.168.43.55:8080/DefaultService.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrar
 qluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry>


Mime
View raw message