[OLINGO-568] Merge branch 'master' into OLINGO-568_SearchParserPoC
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/762c924c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/762c924c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/762c924c Branch: refs/heads/master Commit: 762c924cf6a187f513bafe97d4702d4377bab655 Parents: 81fcbea 639362c Author: mibo <[email protected]> Authored: Fri Nov 6 21:33:03 2015 +0100 Committer: mibo <[email protected]> Committed: Fri Nov 6 21:33:03 2015 +0100 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/client/BasicITCase.java | 8 +- .../tecsvc/client/FilterSystemQueryITCase.java | 2 +- .../deserializer/xml/ODataXmlDeserializer.java | 188 +- .../serializer/json/ODataJsonSerializer.java | 7 +- .../olingo/server/tecsvc/data/DataCreator.java | 1052 +-- .../olingo/server/tecsvc/data/DataProvider.java | 51 +- .../tecsvc/provider/ComplexTypeProvider.java | 2 +- .../tecsvc/provider/EntityTypeProvider.java | 8 +- .../tecsvc/provider/PropertyProvider.java | 9 +- .../json/ODataJsonDeserializerEntityTest.java | 25 + .../xml/ODataXmlDeserializerTest.java | 4 +- .../json/ODataJsonSerializerTest.java | 60 +- .../serializer/xml/ODataXmlSerializerTest.java | 2 - .../core/uri/antlr/TestFullResourcePath.java | 6130 +++++++++--------- ...tityETMixEnumDefCollCompWithEnumStrings.json | 24 + 15 files changed, 3867 insertions(+), 3705 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/762c924c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java ---------------------------------------------------------------------- diff --cc lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java index 259b61f,69458ab..ffc91e8 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java @@@ -1127,60 -1146,59 +1146,60 @@@ public class TestFullResourcePath @Test public void runNonComposableFunctions() throws Exception { testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')") - .isKind(UriInfoKind.resource) - .goPath().first() - .isFunctionImport("FICRTCollETMixPrimCollCompTwoParam") - .isFunction("UFCRTCollETMixPrimCollCompTwoParam") - .isParameter(0, "ParameterInt16", "1") - .isParameter(1, "ParameterString", "'1'"); - + .isKind(UriInfoKind.resource) + .goPath().first() + .isFunctionImport("FICRTCollETMixPrimCollCompTwoParam") + .isFunction("UFCRTCollETMixPrimCollCompTwoParam") + .isParameter(0, "ParameterInt16", "1") + .isParameter(1, "ParameterString", "'1'"); + testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')(0)") - .isKind(UriInfoKind.resource) - .goPath().first() - .isFunctionImport("FICRTCollETMixPrimCollCompTwoParam") - .isFunction("UFCRTCollETMixPrimCollCompTwoParam") - .isParameter(0, "ParameterInt16", "1") - .isParameter(1, "ParameterString", "'1'"); - + .isKind(UriInfoKind.resource) + .goPath().first() + .isFunctionImport("FICRTCollETMixPrimCollCompTwoParam") + .isFunction("UFCRTCollETMixPrimCollCompTwoParam") + .isParameter(0, "ParameterInt16", "1") + .isParameter(1, "ParameterString", "'1'"); + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')(0)/PropertyInt16") - .isExValidation(UriValidationException.MessageKeys.UNALLOWED_RESOURCE_PATH); - + .isExValidation(UriValidationException.MessageKeys.UNALLOWED_RESOURCE_PATH); + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skip=1") - .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); - + .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$top=1") - .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); - - testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", + .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); + + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$filter=PropertyInt16 eq 1") - .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); - + .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skip=1") - .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); - + .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$count=true") - .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); - + .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); + testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skiptoken=5") - .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); - + .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED); + // $search is currently not implemented. Please change this exception if the implementation is done. - testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$search=test") - .isExSemantic(MessageKeys.NOT_IMPLEMENTED); - + // FIXME (151106:mibo): check after finish of OLINGO-568 +// testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$search=test") +// .isExSemantic(MessageKeys.NOT_IMPLEMENTED); + testUri.run("ESAllPrim/olingo.odata.test1.BFNESAllPrimRTCTAllPrim()") - .isKind(UriInfoKind.resource) - .goPath().first() - .isEntitySet("ESAllPrim") - .at(1) - .isFunction("BFNESAllPrimRTCTAllPrim"); - - testUri.runEx("ESAllPrim/olingo.odata.test1.BFNESAllPrimRTCTAllPrim()" - + "/PropertyString") - .isExValidation(UriValidationException.MessageKeys.UNALLOWED_RESOURCE_PATH); + .isKind(UriInfoKind.resource) + .goPath().first() + .isEntitySet("ESAllPrim") + .at(1) + .isFunction("BFNESAllPrimRTCTAllPrim"); + + testUri.runEx("ESAllPrim/olingo.odata.test1.BFNESAllPrimRTCTAllPrim()" + + "/PropertyString") + .isExValidation(UriValidationException.MessageKeys.UNALLOWED_RESOURCE_PATH); } - + @Test public void runEsNameCast() throws Exception { testUri.run("ESTwoPrim/olingo.odata.test1.ETBase")
