http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6a3a4a1d/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java index 6a0708f..81f638d 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java @@ -40,7 +40,7 @@ public class SchemaProvider { public static final String nameSpace = "com.sap.odata.test1"; - public SchemaProvider(EdmTechProvider prov) { + public SchemaProvider(final EdmTechProvider prov) { this.prov = prov; } @@ -105,17 +105,17 @@ public class SchemaProvider { // Actions List<Action> actions = new ArrayList<Action>(); schema.setActions(actions); - actions.addAll(prov.getActions(ActionProvider.nameUARTPrimParam)); - actions.addAll(prov.getActions(ActionProvider.nameUARTPrimCollParam)); - actions.addAll(prov.getActions(ActionProvider.nameUARTCompParam)); - actions.addAll(prov.getActions(ActionProvider.nameUARTCompCollParam)); - actions.addAll(prov.getActions(ActionProvider.nameUARTETParam)); - actions.addAll(prov.getActions(ActionProvider.nameUARTETCollAllPrimParam)); actions.addAll(prov.getActions(ActionProvider.nameBAETTwoKeyNavRTETTwoKeyNav)); actions.addAll(prov.getActions(ActionProvider.nameBAESAllPrimRTETAllPrim)); actions.addAll(prov.getActions(ActionProvider.nameBAESTwoKeyNavRTESTwoKeyNav)); actions.addAll(prov.getActions(ActionProvider.nameBAETBaseTwoKeyNavRTETBaseTwoKeyNav)); actions.addAll(prov.getActions(ActionProvider.nameBAETTwoBaseTwoKeyNavRTETBaseTwoKeyNav)); + actions.addAll(prov.getActions(ActionProvider.nameUARTPrimParam)); + actions.addAll(prov.getActions(ActionProvider.nameUARTPrimCollParam)); + actions.addAll(prov.getActions(ActionProvider.nameUARTCompParam)); + actions.addAll(prov.getActions(ActionProvider.nameUARTCompCollParam)); + actions.addAll(prov.getActions(ActionProvider.nameUARTETParam)); + actions.addAll(prov.getActions(ActionProvider.nameUARTESParam)); // Functions List<Function> functions = new ArrayList<Function>(); @@ -127,7 +127,6 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTETTwoKeyNavParamCTTwoPrim)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTStringTwoParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTESTwoKeyNavParam)); - // TODO: check why it exists twice functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTString)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTCollStringTwoParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTCollString)); @@ -140,6 +139,7 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameUFNRTESMixPrimCollCompTwoParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTETAllPrimTwoParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameUFCRTESMixPrimCollCompTwoParam)); + functions.addAll(prov.getFunctions(FunctionProvider.nameUFNRTCollCTNavFiveProp)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTESTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCStringRTESTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCETBaseTwoKeyNavRTETTwoKeyNav)); @@ -163,11 +163,14 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameBFESTwoKeyNavRTESTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCETTwoKeyNavRTETTwoKeyNav)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCETTwoKeyNavRTCTTwoPrim)); + + functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTCTNavFiveProp)); + functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTCollCTNavFiveProp)); + functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTStringParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESKeyNavRTETKeyNavParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTETTwoKeyNavParam)); - functions.addAll(prov.getFunctions(FunctionProvider.nameBAETTwoKeyNavRTETTwoKeyNav)); - functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTESTwoKeyNavParam)); + //functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTESTwoKeyNavParam)); // EntityContainer EntityContainer container = new EntityContainer();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6a3a4a1d/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/TypeDefinitionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/TypeDefinitionProvider.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/TypeDefinitionProvider.java index 879affd..dc34b31 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/TypeDefinitionProvider.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/TypeDefinitionProvider.java @@ -23,7 +23,7 @@ import org.apache.olingo.server.api.edm.provider.TypeDefinition; public class TypeDefinitionProvider { - public TypeDefinition getTypeDefinition(FullQualifiedName typeDefinitionName) { + public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) { return null; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6a3a4a1d/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java index ab0b1d3..50b7a5d 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java @@ -593,7 +593,7 @@ public class TestUriParserImpl { testRes.run("FINRTInt16()") .isFunctionImport("FINRTInt16") .isFunction("UFNRTInt16") - .isType(PropertyProvider.nameString); + .isType(PropertyProvider.nameInt16); // one input testRes.run("FICRTETTwoKeyNavParam(ParameterInt16=1)") @@ -614,7 +614,7 @@ public class TestUriParserImpl { testRes.run("FINRTInt16()") .isFunctionImport("FINRTInt16") .isFunction("UFNRTInt16") - .isType(PropertyProvider.nameString, false); + .isType(PropertyProvider.nameInt16, false); // returning collection of primitive testRes.run("FICRTCollStringTwoParam(ParameterString='ABC',ParameterInt16=1)")
