http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java index 8c39ac6..a0000fb 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java @@ -37,12 +37,12 @@ import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import org.apache.olingo.commons.core.edm.EdmEntityTypeImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; @@ -58,62 +58,62 @@ public class EdmEntityTypeImplTest { @Before public void setupTypes() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); FullQualifiedName baseName = new FullQualifiedName("namespace", "BaseTypeName"); - EntityType baseType = new EntityType(); + CsdlEntityType baseType = new CsdlEntityType(); baseType.setName(baseName.getName()); - List<Property> properties = new ArrayList<Property>(); - properties.add(new Property().setName("Id").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); - properties.add(new Property().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); + List<CsdlProperty> properties = new ArrayList<CsdlProperty>(); + properties.add(new CsdlProperty().setName("Id").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); + properties.add(new CsdlProperty().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); baseType.setProperties(properties); - List<PropertyRef> key = new ArrayList<PropertyRef>(); - key.add(new PropertyRef().setName("Id")); + List<CsdlPropertyRef> key = new ArrayList<CsdlPropertyRef>(); + key.add(new CsdlPropertyRef().setName("Id")); baseType.setKey(key); - List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - navigationProperties.add(new NavigationProperty().setName("nav1")); + List<CsdlNavigationProperty> navigationProperties = new ArrayList<CsdlNavigationProperty>(); + navigationProperties.add(new CsdlNavigationProperty().setName("nav1")); baseType.setNavigationProperties(navigationProperties); when(provider.getEntityType(baseName)).thenReturn(baseType); this.baseType = new EdmEntityTypeImpl(edm, baseName, baseType); FullQualifiedName typeName = new FullQualifiedName("namespace", "typeName"); - EntityType type = new EntityType(); + CsdlEntityType type = new CsdlEntityType(); type.setName(typeName.getName()); type.setBaseType(baseName); - List<Property> typeProperties = new ArrayList<Property>(); - typeProperties.add(new Property().setName("address").setType( + List<CsdlProperty> typeProperties = new ArrayList<CsdlProperty>(); + typeProperties.add(new CsdlProperty().setName("address").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); - typeProperties.add(new Property().setName("email").setType( + typeProperties.add(new CsdlProperty().setName("email").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); type.setProperties(typeProperties); - List<NavigationProperty> typeNavigationProperties = new ArrayList<NavigationProperty>(); - typeNavigationProperties.add(new NavigationProperty().setName("nav2")); + List<CsdlNavigationProperty> typeNavigationProperties = new ArrayList<CsdlNavigationProperty>(); + typeNavigationProperties.add(new CsdlNavigationProperty().setName("nav2")); type.setNavigationProperties(typeNavigationProperties); when(provider.getEntityType(typeName)).thenReturn(type); typeWithBaseType = new EdmEntityTypeImpl(edm, typeName, type); FullQualifiedName typeWithComplexKeyName = new FullQualifiedName("namespace", "typeName"); - EntityType typeWithComplexKeyProvider = new EntityType(); + CsdlEntityType typeWithComplexKeyProvider = new CsdlEntityType(); typeWithComplexKeyProvider.setName(typeWithComplexKeyName.getName()); - List<Property> typeWithComplexKeyProperties = new ArrayList<Property>(); - typeWithComplexKeyProperties.add(new Property().setName("Id").setType( + List<CsdlProperty> typeWithComplexKeyProperties = new ArrayList<CsdlProperty>(); + typeWithComplexKeyProperties.add(new CsdlProperty().setName("Id").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); - List<Property> complexTypeProperties = new ArrayList<Property>(); - complexTypeProperties.add(new Property().setName("ComplexPropName").setType( + List<CsdlProperty> complexTypeProperties = new ArrayList<CsdlProperty>(); + complexTypeProperties.add(new CsdlProperty().setName("ComplexPropName").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); FullQualifiedName complexTypeName = new FullQualifiedName("namespace", "complexTypeName"); when(provider.getComplexType(complexTypeName)).thenReturn( - new ComplexType().setName("complexTypeName").setProperties(complexTypeProperties)); + new CsdlComplexType().setName("complexTypeName").setProperties(complexTypeProperties)); - typeWithComplexKeyProperties.add(new Property().setName("Comp").setType(complexTypeName)); + typeWithComplexKeyProperties.add(new CsdlProperty().setName("Comp").setType(complexTypeName)); typeWithComplexKeyProvider.setProperties(typeWithComplexKeyProperties); - List<PropertyRef> keyForTypeWithComplexKey = new ArrayList<PropertyRef>(); - keyForTypeWithComplexKey.add(new PropertyRef().setName("Id")); - keyForTypeWithComplexKey.add(new PropertyRef().setName("Comp/ComplexPropName").setAlias("alias")); + List<CsdlPropertyRef> keyForTypeWithComplexKey = new ArrayList<CsdlPropertyRef>(); + keyForTypeWithComplexKey.add(new CsdlPropertyRef().setName("Id")); + keyForTypeWithComplexKey.add(new CsdlPropertyRef().setName("Comp/ComplexPropName").setAlias("alias")); typeWithComplexKeyProvider.setKey(keyForTypeWithComplexKey); when(provider.getEntityType(typeWithComplexKeyName)).thenReturn(typeWithComplexKeyProvider); @@ -122,18 +122,18 @@ public class EdmEntityTypeImplTest { @Test public void testAbstractBaseTypeWithoutKey() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); FullQualifiedName baseName = new FullQualifiedName("namespace", "BaseTypeName"); - EntityType baseType = new EntityType(); + CsdlEntityType baseType = new CsdlEntityType(); baseType.setName(baseName.getName()); - List<Property> properties = new ArrayList<Property>(); - properties.add(new Property().setName("Id").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); - properties.add(new Property().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); + List<CsdlProperty> properties = new ArrayList<CsdlProperty>(); + properties.add(new CsdlProperty().setName("Id").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); + properties.add(new CsdlProperty().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); baseType.setProperties(properties); - List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - navigationProperties.add(new NavigationProperty().setName("nav1")); + List<CsdlNavigationProperty> navigationProperties = new ArrayList<CsdlNavigationProperty>(); + navigationProperties.add(new CsdlNavigationProperty().setName("nav1")); baseType.setNavigationProperties(navigationProperties); when(provider.getEntityType(baseName)).thenReturn(baseType); baseType.setAbstract(true); @@ -144,20 +144,20 @@ public class EdmEntityTypeImplTest { assertEquals("Name", edmAbstarctBaseType.getPropertyNames().get(1)); FullQualifiedName typeName = new FullQualifiedName("namespace", "typeName"); - EntityType type = new EntityType(); + CsdlEntityType type = new CsdlEntityType(); type.setName(typeName.getName()); type.setBaseType(baseName); - List<Property> typeProperties = new ArrayList<Property>(); - typeProperties.add(new Property().setName("address").setType( + List<CsdlProperty> typeProperties = new ArrayList<CsdlProperty>(); + typeProperties.add(new CsdlProperty().setName("address").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); - typeProperties.add(new Property().setName("email").setType( + typeProperties.add(new CsdlProperty().setName("email").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); type.setProperties(typeProperties); - List<PropertyRef> key = new ArrayList<PropertyRef>(); - key.add(new PropertyRef().setName("email")); + List<CsdlPropertyRef> key = new ArrayList<CsdlPropertyRef>(); + key.add(new CsdlPropertyRef().setName("email")); type.setKey(key); - List<NavigationProperty> typeNavigationProperties = new ArrayList<NavigationProperty>(); - typeNavigationProperties.add(new NavigationProperty().setName("nav2")); + List<CsdlNavigationProperty> typeNavigationProperties = new ArrayList<CsdlNavigationProperty>(); + typeNavigationProperties.add(new CsdlNavigationProperty().setName("nav2")); type.setNavigationProperties(typeNavigationProperties); when(provider.getEntityType(typeName)).thenReturn(type); @@ -182,38 +182,38 @@ public class EdmEntityTypeImplTest { @Test public void testAbstractBaseTypeWithtKey() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); FullQualifiedName baseName = new FullQualifiedName("namespace", "BaseTypeName"); - EntityType baseType = new EntityType(); + CsdlEntityType baseType = new CsdlEntityType(); baseType.setName(baseName.getName()); - List<Property> properties = new ArrayList<Property>(); - properties.add(new Property().setName("Id").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); - properties.add(new Property().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); + List<CsdlProperty> properties = new ArrayList<CsdlProperty>(); + properties.add(new CsdlProperty().setName("Id").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); + properties.add(new CsdlProperty().setName("Name").setType(EdmPrimitiveTypeKind.String.getFullQualifiedName())); baseType.setProperties(properties); - List<PropertyRef> key = new ArrayList<PropertyRef>(); - key.add(new PropertyRef().setName("Id")); + List<CsdlPropertyRef> key = new ArrayList<CsdlPropertyRef>(); + key.add(new CsdlPropertyRef().setName("Id")); baseType.setKey(key); - List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - navigationProperties.add(new NavigationProperty().setName("nav1")); + List<CsdlNavigationProperty> navigationProperties = new ArrayList<CsdlNavigationProperty>(); + navigationProperties.add(new CsdlNavigationProperty().setName("nav1")); baseType.setNavigationProperties(navigationProperties); when(provider.getEntityType(baseName)).thenReturn(baseType); baseType.setAbstract(true); EdmEntityType edmAbstarctBaseType = new EdmEntityTypeImpl(edm, baseName, baseType); FullQualifiedName typeName = new FullQualifiedName("namespace", "typeName"); - EntityType type = new EntityType(); + CsdlEntityType type = new CsdlEntityType(); type.setName(typeName.getName()); type.setBaseType(baseName); - List<Property> typeProperties = new ArrayList<Property>(); - typeProperties.add(new Property().setName("address").setType( + List<CsdlProperty> typeProperties = new ArrayList<CsdlProperty>(); + typeProperties.add(new CsdlProperty().setName("address").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); - typeProperties.add(new Property().setName("email").setType( + typeProperties.add(new CsdlProperty().setName("email").setType( EdmPrimitiveTypeKind.String.getFullQualifiedName())); type.setProperties(typeProperties); - List<NavigationProperty> typeNavigationProperties = new ArrayList<NavigationProperty>(); - typeNavigationProperties.add(new NavigationProperty().setName("nav2")); + List<CsdlNavigationProperty> typeNavigationProperties = new ArrayList<CsdlNavigationProperty>(); + typeNavigationProperties.add(new CsdlNavigationProperty().setName("nav2")); type.setNavigationProperties(typeNavigationProperties); when(provider.getEntityType(typeName)).thenReturn(type); EdmEntityType edmType = new EdmEntityTypeImpl(edm, typeName, type); @@ -366,25 +366,25 @@ public class EdmEntityTypeImplTest { @Test public void abstractTypeDoesNotNeedKey() { EdmProviderImpl edm = mock(EdmProviderImpl.class); - EntityType entityType = new EntityType().setName("n").setAbstract(true); + CsdlEntityType entityType = new CsdlEntityType().setName("n").setAbstract(true); new EdmEntityTypeImpl(edm, new FullQualifiedName("n", "n"), entityType); } @Test(expected = EdmException.class) public void invalidBaseType() { EdmProviderImpl edm = mock(EdmProviderImpl.class); - EntityType entityType = new EntityType().setName("n").setBaseType(new FullQualifiedName("wrong", "wrong")); + CsdlEntityType entityType = new CsdlEntityType().setName("n").setBaseType(new FullQualifiedName("wrong", "wrong")); EdmEntityTypeImpl instance = new EdmEntityTypeImpl(edm, new FullQualifiedName("n", "n"), entityType); instance.getBaseType(); } @Test public void abstractTypeWithAbstractBaseTypeDoesNotNeedKey() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); FullQualifiedName baseName = new FullQualifiedName("n", "base"); - when(provider.getEntityType(baseName)).thenReturn(new EntityType().setName("base").setAbstract(true)); - EntityType entityType = new EntityType().setName("n").setAbstract(true).setBaseType(baseName); + when(provider.getEntityType(baseName)).thenReturn(new CsdlEntityType().setName("base").setAbstract(true)); + CsdlEntityType entityType = new CsdlEntityType().setName("n").setAbstract(true).setBaseType(baseName); new EdmEntityTypeImpl(edm, new FullQualifiedName("n", "n"), entityType); }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java index edc9a21..054f9d8 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java @@ -26,8 +26,8 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.provider.EnumMember; -import org.apache.olingo.commons.api.edm.provider.EnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmEnumTypeImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; @@ -57,51 +57,51 @@ public class EdmEnumTest { private final EdmEnumType int32FlagType; public EdmEnumTest() { - final List<EnumMember> memberList = Arrays.asList( - new EnumMember().setName("first").setValue("1"), - new EnumMember().setName("second").setValue("64")); + final List<CsdlEnumMember> memberList = Arrays.asList( + new CsdlEnumMember().setName("first").setValue("1"), + new CsdlEnumMember().setName("second").setValue("64")); final FullQualifiedName enumName = new FullQualifiedName("namespace", "name"); instance = new EdmEnumTypeImpl(mock(EdmProviderImpl.class), enumName, - new EnumType().setName("name").setMembers(memberList).setFlags(true) + new CsdlEnumType().setName("name").setMembers(memberList).setFlags(true) .setUnderlyingType(EdmPrimitiveTypeKind.SByte.getFullQualifiedName())); nonFlagsInstance = new EdmEnumTypeImpl(mock(EdmProviderImpl.class), enumName, - new EnumType().setName("name").setMembers(memberList).setFlags(false) + new CsdlEnumType().setName("name").setMembers(memberList).setFlags(false) .setUnderlyingType(EdmPrimitiveTypeKind.SByte.getFullQualifiedName())); int16EnumType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), - new FullQualifiedName("testNamespace", "testName"), new EnumType() + new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() .setName("MyEnum") .setFlags(false) .setUnderlyingType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()) .setMembers( Arrays.asList( - new EnumMember().setName("A") + new CsdlEnumMember().setName("A") .setValue("0"), - new EnumMember().setName("B") + new CsdlEnumMember().setName("B") .setValue("1"), - new EnumMember().setName("C") + new CsdlEnumMember().setName("C") .setValue("2")))); int32EnumType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), - new FullQualifiedName("testNamespace", "testName"), new EnumType() + new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() .setName("MyEnum") .setFlags(false) .setUnderlyingType(EdmPrimitiveTypeKind.Int32.getFullQualifiedName()) .setMembers(Arrays - .asList(new EnumMember().setName("A").setValue("0"), new EnumMember().setName("B").setValue("1"), - new EnumMember().setName("C").setValue("2")))); + .asList(new CsdlEnumMember().setName("A").setValue("0"), new CsdlEnumMember().setName("B").setValue("1"), + new CsdlEnumMember().setName("C").setValue("2")))); int32FlagType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), - new FullQualifiedName("testNamespace", "testName"), new EnumType() + new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() .setName("MyEnum") .setFlags(true) .setUnderlyingType(EdmPrimitiveTypeKind.Int32.getFullQualifiedName()) .setMembers(Arrays - .asList(new EnumMember().setName("A").setValue("2"), new EnumMember().setName("B").setValue("4"), - new EnumMember().setName("C").setValue("8")))); + .asList(new CsdlEnumMember().setName("A").setValue("2"), new CsdlEnumMember().setName("B").setValue("4"), + new CsdlEnumMember().setName("C").setValue("8")))); } @Test @@ -130,7 +130,7 @@ public class EdmEnumTest { assertEquals(Byte.class, instance.getDefaultType()); EdmEnumType instance = new EdmEnumTypeImpl(Mockito.mock(Edm.class), new FullQualifiedName("testNamespace", "testName"), - new EnumType() + new CsdlEnumType() .setName("MyEnum")); assertEquals(Integer.class, instance.getUnderlyingType().getDefaultType()); } @@ -267,13 +267,13 @@ public class EdmEnumTest { @SuppressWarnings("unused") EdmEnumType instance = new EdmEnumTypeImpl(Mockito.mock(Edm.class), new FullQualifiedName("testNamespace", "testName"), - new EnumType() + new CsdlEnumType() .setName("MyEnum") .setFlags(false) .setUnderlyingType(underlyingType.getFullQualifiedName()) .setMembers( Arrays.asList( - new EnumMember().setName("A") + new CsdlEnumMember().setName("A") .setValue("0")))); fail("Expected exception not thrown"); } catch (final EdmException e) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java index 8adab01..477dee4 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java @@ -22,8 +22,8 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.ReturnType; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; import org.apache.olingo.commons.core.edm.EdmFunctionImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; @@ -45,9 +45,10 @@ public class EdmFunctionImplTest { public void setupFunctions() { EdmProviderImpl provider = mock(EdmProviderImpl.class); - Function function1 = new Function().setReturnType(new ReturnType().setType(new FullQualifiedName("Edm", "String"))); + CsdlFunction function1 = new CsdlFunction().setReturnType( + new CsdlReturnType().setType(new FullQualifiedName("Edm", "String"))); functionImpl1 = new EdmFunctionImpl(provider, new FullQualifiedName("namespace", "name"), function1); - Function function2 = new Function().setComposable(true); + CsdlFunction function2 = new CsdlFunction().setComposable(true); functionImpl2 = new EdmFunctionImpl(provider, new FullQualifiedName("namespace", "name"), function2); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java index 002ec05..730322b 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java @@ -23,12 +23,12 @@ import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.FunctionImport; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.api.edm.provider.ReturnType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; +import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmEntityContainerImpl; import org.apache.olingo.commons.core.edm.EdmFunctionImportImpl; @@ -48,25 +48,25 @@ public class EdmFunctionImportImplTest { @Test public void functionImport() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName functionName = new FullQualifiedName("ns", "function"); - final Function functionProvider = new Function() + final CsdlFunction functionProvider = new CsdlFunction() .setName(functionName.getName()) - .setParameters(Collections.<Parameter> emptyList()) + .setParameters(Collections.<CsdlParameter> emptyList()) .setBound(false) .setComposable(false) - .setReturnType(new ReturnType().setType(EdmPrimitiveTypeKind.Boolean.getFullQualifiedName())); + .setReturnType(new CsdlReturnType().setType(EdmPrimitiveTypeKind.Boolean.getFullQualifiedName())); when(provider.getFunctions(functionName)).thenReturn(Arrays.asList(functionProvider)); final FullQualifiedName containerName = new FullQualifiedName("ns", "container"); - final EntityContainerInfo containerInfo = new EntityContainerInfo().setContainerName(containerName); + final CsdlEntityContainerInfo containerInfo = new CsdlEntityContainerInfo().setContainerName(containerName); when(provider.getEntityContainerInfo(containerName)).thenReturn(containerInfo); final EdmEntityContainer entityContainer = new EdmEntityContainerImpl(edm, provider, containerInfo); final String functionImportName = "functionImport"; - final FunctionImport functionImportProvider = new FunctionImport() + final CsdlFunctionImport functionImportProvider = new CsdlFunctionImport() .setName(functionImportName) .setFunction(functionName) .setIncludeInServiceDocument(true); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java index d4e957a..187534b 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java @@ -24,7 +24,7 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import org.apache.olingo.commons.core.edm.EdmKeyPropertyRefImpl; import org.junit.Test; @@ -39,7 +39,7 @@ public class EdmKeyPropertyRefImplTest { @Test public void noAlias() { - PropertyRef providerRef = new PropertyRef().setName("Id"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("Id"); EdmEntityType etMock = mock(EdmEntityType.class); EdmProperty keyPropertyMock = mock(EdmProperty.class); when(etMock.getStructuralProperty("Id")).thenReturn(keyPropertyMock); @@ -55,7 +55,7 @@ public class EdmKeyPropertyRefImplTest { @Test public void aliasForPropertyInComplexPropertyOneLevel() { - PropertyRef providerRef = new PropertyRef().setName("comp/Id").setAlias("alias"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("comp/Id").setAlias("alias"); EdmEntityType etMock = mock(EdmEntityType.class); EdmProperty keyPropertyMock = mock(EdmProperty.class); EdmProperty compMock = mock(EdmProperty.class); @@ -73,7 +73,7 @@ public class EdmKeyPropertyRefImplTest { @Test(expected = EdmException.class) public void aliasForPropertyInComplexPropertyButWrongPath() { - PropertyRef providerRef = new PropertyRef().setName("comp/wrong").setAlias("alias"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("comp/wrong").setAlias("alias"); EdmEntityType etMock = mock(EdmEntityType.class); EdmProperty keyPropertyMock = mock(EdmProperty.class); EdmElement compMock = mock(EdmProperty.class); @@ -86,7 +86,7 @@ public class EdmKeyPropertyRefImplTest { @Test(expected = EdmException.class) public void aliasForPropertyInComplexPropertyButWrongPath2() { - PropertyRef providerRef = new PropertyRef().setName("wrong/Id").setAlias("alias"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("wrong/Id").setAlias("alias"); EdmEntityType etMock = mock(EdmEntityType.class); EdmProperty keyPropertyMock = mock(EdmProperty.class); EdmElement compMock = mock(EdmProperty.class); @@ -99,7 +99,7 @@ public class EdmKeyPropertyRefImplTest { @Test public void aliasForPropertyInComplexPropertyTwoLevels() { - PropertyRef providerRef = new PropertyRef().setName("comp/comp2/Id").setAlias("alias"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("comp/comp2/Id").setAlias("alias"); EdmEntityType etMock = mock(EdmEntityType.class); EdmProperty keyPropertyMock = mock(EdmProperty.class); EdmProperty compMock = mock(EdmProperty.class); @@ -120,21 +120,21 @@ public class EdmKeyPropertyRefImplTest { @Test(expected = EdmException.class) public void oneKeyNoAliasButInvalidProperty() { - PropertyRef providerRef = new PropertyRef().setName("Id"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("Id"); EdmKeyPropertyRef ref = new EdmKeyPropertyRefImpl(mock(EdmEntityType.class), providerRef); ref.getProperty(); } @Test(expected = EdmException.class) public void aliasButNoPath() { - PropertyRef providerRef = new PropertyRef().setName("Id").setAlias("alias"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("Id").setAlias("alias"); EdmKeyPropertyRef ref = new EdmKeyPropertyRefImpl(mock(EdmEntityType.class), providerRef); ref.getProperty(); } @Test(expected = EdmException.class) public void aliasButEmptyPath() { - PropertyRef providerRef = new PropertyRef().setName("").setAlias("alias"); + CsdlPropertyRef providerRef = new CsdlPropertyRef().setName("").setAlias("alias"); EdmKeyPropertyRef ref = new EdmKeyPropertyRefImpl(mock(EdmEntityType.class), providerRef); ref.getProperty(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java index 5730d40..c284edf 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java @@ -28,9 +28,9 @@ import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Mapping; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.api.edm.provider.Property; +import org.apache.olingo.commons.api.edm.provider.CsdlMapping; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; import org.apache.olingo.commons.core.edm.EdmParameterImpl; import org.apache.olingo.commons.core.edm.EdmPropertyImpl; import org.junit.Test; @@ -39,12 +39,12 @@ public class EdmMappingTest { @Test public void initialMappingMustBeNull() { - Property property = new Property().setType(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName()); + CsdlProperty property = new CsdlProperty().setType(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName()); EdmProperty edmProperty = new EdmPropertyImpl(null, new FullQualifiedName("namespace.name"), property); assertNull(edmProperty.getMapping()); - Parameter parameter = new Parameter().setType(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName()); + CsdlParameter parameter = new CsdlParameter().setType(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName()); EdmParameter edmParameter = new EdmParameterImpl(null, parameter); assertNull(edmParameter.getMapping()); @@ -52,8 +52,8 @@ public class EdmMappingTest { @Test public void getDataClassForPrimTypeViaMapping() { - Mapping mapping = new Mapping().setMappedJavaClass(Date.class); - Property property = new Property() + CsdlMapping mapping = new CsdlMapping().setMappedJavaClass(Date.class); + CsdlProperty property = new CsdlProperty() .setType(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName()) .setMapping(mapping); EdmProperty edmProperty = new EdmPropertyImpl(null, new FullQualifiedName("namespace.name"), property); @@ -61,7 +61,7 @@ public class EdmMappingTest { assertNotNull(edmProperty.getMapping()); assertEquals(Date.class, edmProperty.getMapping().getMappedJavaClass()); - Parameter parameter = new Parameter() + CsdlParameter parameter = new CsdlParameter() .setType(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName()) .setMapping(mapping); EdmParameter edmParameter = new EdmParameterImpl(null, parameter); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java index a0c2944..d6ae3a7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.server.core.edm.provider; -import org.apache.olingo.commons.api.edm.provider.EnumMember; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; import org.apache.olingo.commons.core.edm.EdmMemberImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; @@ -30,7 +30,7 @@ public class EdmMemberImplTest { @Test public void enumMember() { - final EnumMember member = new EnumMember().setName("name").setValue("value"); + final CsdlEnumMember member = new CsdlEnumMember().setName("name").setValue("value"); final EdmMemberImpl memberImpl = new EdmMemberImpl(mock(EdmProviderImpl.class), null, member); assertEquals("name", memberImpl.getName()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java index 4751f59..fee5673 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java @@ -23,11 +23,11 @@ import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; import org.apache.olingo.commons.core.edm.EdmNavigationPropertyImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; @@ -48,13 +48,13 @@ public class EdmNavigationPropertyImplTest { @Test public void navigationProperty() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName entityTypeName = new FullQualifiedName("ns", "entity"); - EntityType entityTypeProvider = new EntityType(); - entityTypeProvider.setKey(Collections.<PropertyRef> emptyList()); + CsdlEntityType entityTypeProvider = new CsdlEntityType(); + entityTypeProvider.setKey(Collections.<CsdlPropertyRef> emptyList()); when(provider.getEntityType(entityTypeName)).thenReturn(entityTypeProvider); - NavigationProperty propertyProvider = new NavigationProperty(); + CsdlNavigationProperty propertyProvider = new CsdlNavigationProperty(); propertyProvider.setType(entityTypeName); propertyProvider.setNullable(false); EdmNavigationProperty property = new EdmNavigationPropertyImpl(edm, entityTypeName, propertyProvider); @@ -74,17 +74,17 @@ public class EdmNavigationPropertyImplTest { @Test public void navigationPropertyWithReferntialConstraint() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName entityTypeName = new FullQualifiedName("ns", "entity"); - EntityType entityTypeProvider = new EntityType(); - entityTypeProvider.setKey(Collections.<PropertyRef> emptyList()); + CsdlEntityType entityTypeProvider = new CsdlEntityType(); + entityTypeProvider.setKey(Collections.<CsdlPropertyRef> emptyList()); when(provider.getEntityType(entityTypeName)).thenReturn(entityTypeProvider); - NavigationProperty propertyProvider = new NavigationProperty(); + CsdlNavigationProperty propertyProvider = new CsdlNavigationProperty(); propertyProvider.setType(entityTypeName); propertyProvider.setNullable(false); - List<ReferentialConstraint> referentialConstraints = new ArrayList<ReferentialConstraint>(); - referentialConstraints.add(new ReferentialConstraint().setProperty("property").setReferencedProperty( + List<CsdlReferentialConstraint> referentialConstraints = new ArrayList<CsdlReferentialConstraint>(); + referentialConstraints.add(new CsdlReferentialConstraint().setProperty("property").setReferencedProperty( "referencedProperty")); propertyProvider.setReferentialConstraints(referentialConstraints); EdmNavigationProperty property = new EdmNavigationPropertyImpl(edm, entityTypeName, propertyProvider); @@ -94,17 +94,17 @@ public class EdmNavigationPropertyImplTest { @Test public void navigationPropertyWithPartner() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName entityTypeName = new FullQualifiedName("ns", "entity"); - EntityType entityTypeProvider = new EntityType(); - entityTypeProvider.setKey(Collections.<PropertyRef> emptyList()); + CsdlEntityType entityTypeProvider = new CsdlEntityType(); + entityTypeProvider.setKey(Collections.<CsdlPropertyRef> emptyList()); - List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - navigationProperties.add(new NavigationProperty().setName("partnerName").setType(entityTypeName)); + List<CsdlNavigationProperty> navigationProperties = new ArrayList<CsdlNavigationProperty>(); + navigationProperties.add(new CsdlNavigationProperty().setName("partnerName").setType(entityTypeName)); entityTypeProvider.setNavigationProperties(navigationProperties); when(provider.getEntityType(entityTypeName)).thenReturn(entityTypeProvider); - NavigationProperty propertyProvider = new NavigationProperty(); + CsdlNavigationProperty propertyProvider = new CsdlNavigationProperty(); propertyProvider.setType(entityTypeName); propertyProvider.setNullable(false); propertyProvider.setPartner("partnerName"); @@ -118,17 +118,17 @@ public class EdmNavigationPropertyImplTest { @Test(expected = EdmException.class) public void navigationPropertyWithNonexistentPartner() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName entityTypeName = new FullQualifiedName("ns", "entity"); - EntityType entityTypeProvider = new EntityType(); - entityTypeProvider.setKey(Collections.<PropertyRef> emptyList()); + CsdlEntityType entityTypeProvider = new CsdlEntityType(); + entityTypeProvider.setKey(Collections.<CsdlPropertyRef> emptyList()); - List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>(); - navigationProperties.add(new NavigationProperty().setName("partnerName").setType(entityTypeName)); + List<CsdlNavigationProperty> navigationProperties = new ArrayList<CsdlNavigationProperty>(); + navigationProperties.add(new CsdlNavigationProperty().setName("partnerName").setType(entityTypeName)); entityTypeProvider.setNavigationProperties(navigationProperties); when(provider.getEntityType(entityTypeName)).thenReturn(entityTypeProvider); - NavigationProperty propertyProvider = new NavigationProperty(); + CsdlNavigationProperty propertyProvider = new CsdlNavigationProperty(); propertyProvider.setType(entityTypeName); propertyProvider.setNullable(false); propertyProvider.setPartner("wrong"); @@ -139,7 +139,7 @@ public class EdmNavigationPropertyImplTest { @Test(expected = EdmException.class) public void navigationPropertyWithNonExistentType() throws Exception { EdmProviderImpl edm = mock(EdmProviderImpl.class); - NavigationProperty propertyProvider = new NavigationProperty(); + CsdlNavigationProperty propertyProvider = new CsdlNavigationProperty(); EdmNavigationProperty property = new EdmNavigationPropertyImpl(edm, null, propertyProvider); property.getType(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java index bbcea0b..d14fdba 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java @@ -25,11 +25,11 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; import org.apache.olingo.commons.core.edm.EdmParameterImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; @@ -44,8 +44,8 @@ public class EdmParameterImplTest { @Test public void getTypeReturnsPrimitiveType() { - EdmProviderImpl edm = new EdmProviderImpl(mock(EdmProvider.class)); - Parameter parameterProvider = new Parameter(); + EdmProviderImpl edm = new EdmProviderImpl(mock(CsdlEdmProvider.class)); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(EdmPrimitiveTypeKind.Binary.getFullQualifiedName()); final EdmParameter parameter = new EdmParameterImpl(edm, parameterProvider); final EdmType type = parameter.getType(); @@ -56,12 +56,12 @@ public class EdmParameterImplTest { @Test public void getTypeReturnsComplexType() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName complexTypeName = new FullQualifiedName("ns", "complex"); - ComplexType complexTypeProvider = new ComplexType(); + CsdlComplexType complexTypeProvider = new CsdlComplexType(); when(provider.getComplexType(complexTypeName)).thenReturn(complexTypeProvider); - Parameter parameterProvider = new Parameter(); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(complexTypeName); final EdmParameter parameter = new EdmParameterImpl(edm, parameterProvider); assertFalse(parameter.isCollection()); @@ -73,12 +73,12 @@ public class EdmParameterImplTest { @Test public void getTypeReturnsEnumType() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName enumTypeName = new FullQualifiedName("ns", "enum"); - EnumType enumTypeProvider = new EnumType(); + CsdlEnumType enumTypeProvider = new CsdlEnumType(); when(provider.getEnumType(enumTypeName)).thenReturn(enumTypeProvider); - Parameter parameterProvider = new Parameter(); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(enumTypeName); final EdmParameter parameter = new EdmParameterImpl(edm, parameterProvider); assertFalse(parameter.isCollection()); @@ -90,12 +90,13 @@ public class EdmParameterImplTest { @Test public void getTypeReturnsTypeDefinition() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName typeName = new FullQualifiedName("ns", "definition"); - TypeDefinition typeProvider = new TypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); + CsdlTypeDefinition typeProvider = + new CsdlTypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); when(provider.getTypeDefinition(typeName)).thenReturn(typeProvider); - Parameter parameterProvider = new Parameter(); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(typeName); final EdmParameter parameter = new EdmParameterImpl(edm, parameterProvider); final EdmType type = parameter.getType(); @@ -106,8 +107,8 @@ public class EdmParameterImplTest { @Test public void facets() { - EdmProviderImpl edm = new EdmProviderImpl(mock(EdmProvider.class)); - Parameter parameterProvider = new Parameter(); + EdmProviderImpl edm = new EdmProviderImpl(mock(CsdlEdmProvider.class)); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()); parameterProvider.setPrecision(42); parameterProvider.setScale(12); @@ -123,8 +124,8 @@ public class EdmParameterImplTest { @Test(expected = EdmException.class) public void getTypeWithInvalidSimpleType() { - EdmProviderImpl edm = new EdmProviderImpl(mock(EdmProvider.class)); - Parameter parameterProvider = new Parameter(); + EdmProviderImpl edm = new EdmProviderImpl(mock(CsdlEdmProvider.class)); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(new FullQualifiedName("Edm", "wrong")); final EdmParameter parameter = new EdmParameterImpl(edm, parameterProvider); parameter.getType(); @@ -132,8 +133,8 @@ public class EdmParameterImplTest { @Test(expected = EdmException.class) public void getTypeWithNonexistingType() { - EdmProviderImpl edm = new EdmProviderImpl(mock(EdmProvider.class)); - Parameter parameterProvider = new Parameter(); + EdmProviderImpl edm = new EdmProviderImpl(mock(CsdlEdmProvider.class)); + CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(new FullQualifiedName("wrong", "wrong")); final EdmParameter parameter = new EdmParameterImpl(edm, parameterProvider); parameter.getType(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java index cc3e819..b071c27 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java @@ -25,11 +25,11 @@ import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; import org.apache.olingo.commons.core.edm.EdmPropertyImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; @@ -46,8 +46,8 @@ public class EdmPropertyImplTest { @Test public void getTypeReturnsPrimitiveType() { - EdmProviderImpl edm = new EdmProviderImpl(mock(EdmProvider.class)); - Property propertyProvider = new Property(); + EdmProviderImpl edm = new EdmProviderImpl(mock(CsdlEdmProvider.class)); + CsdlProperty propertyProvider = new CsdlProperty(); propertyProvider.setType(EdmPrimitiveTypeKind.Binary.getFullQualifiedName()); final EdmProperty property = new EdmPropertyImpl(edm, null, propertyProvider); assertTrue(property.isPrimitive()); @@ -59,12 +59,12 @@ public class EdmPropertyImplTest { @Test public void getTypeReturnsComplexType() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName complexTypeName = new FullQualifiedName("ns", "complex"); - ComplexType complexTypeProvider = new ComplexType(); + CsdlComplexType complexTypeProvider = new CsdlComplexType(); when(provider.getComplexType(complexTypeName)).thenReturn(complexTypeProvider); - Property propertyProvider = new Property(); + CsdlProperty propertyProvider = new CsdlProperty(); propertyProvider.setType(complexTypeName); final EdmProperty property = new EdmPropertyImpl(edm, complexTypeName, propertyProvider); assertFalse(property.isCollection()); @@ -77,12 +77,12 @@ public class EdmPropertyImplTest { @Test public void getTypeReturnsEnumType() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName enumTypeName = new FullQualifiedName("ns", "enum"); - EnumType enumTypeProvider = new EnumType(); + CsdlEnumType enumTypeProvider = new CsdlEnumType(); when(provider.getEnumType(enumTypeName)).thenReturn(enumTypeProvider); - Property propertyProvider = new Property(); + CsdlProperty propertyProvider = new CsdlProperty(); propertyProvider.setType(enumTypeName); final EdmProperty property = new EdmPropertyImpl(edm, null, propertyProvider); assertFalse(property.isCollection()); @@ -95,12 +95,13 @@ public class EdmPropertyImplTest { @Test public void getTypeReturnsTypeDefinition() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName typeName = new FullQualifiedName("ns", "definition"); - TypeDefinition typeProvider = new TypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); + CsdlTypeDefinition typeProvider = + new CsdlTypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); when(provider.getTypeDefinition(typeName)).thenReturn(typeProvider); - Property propertyProvider = new Property(); + CsdlProperty propertyProvider = new CsdlProperty(); propertyProvider.setType(typeName); final EdmProperty property = new EdmPropertyImpl(edm, null, propertyProvider); assertFalse(property.isPrimitive()); @@ -112,9 +113,9 @@ public class EdmPropertyImplTest { @Test(expected = EdmException.class) public void getTypeReturnsWrongType() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); - final Property propertyProvider = new Property() + final CsdlProperty propertyProvider = new CsdlProperty() .setType(new FullQualifiedName("ns", "wrong")); final EdmProperty property = new EdmPropertyImpl(edm, null, propertyProvider); property.getType(); @@ -123,9 +124,9 @@ public class EdmPropertyImplTest { @Test(expected = EdmException.class) public void getTypeReturnsNoTypeKind() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); EdmProviderImpl edm = new EdmProviderImpl(provider); - final Property propertyProvider = new Property() + final CsdlProperty propertyProvider = new CsdlProperty() .setType(new FullQualifiedName(EdmPrimitiveType.EDM_NAMESPACE, "type")); final EdmProperty property = new EdmPropertyImpl(edm, null, propertyProvider); property.getType(); @@ -134,8 +135,8 @@ public class EdmPropertyImplTest { @Test public void facets() { - EdmProviderImpl edm = new EdmProviderImpl(mock(EdmProvider.class)); - Property propertyProvider = new Property(); + EdmProviderImpl edm = new EdmProviderImpl(mock(CsdlEdmProvider.class)); + CsdlProperty propertyProvider = new CsdlProperty(); propertyProvider.setType(EdmPrimitiveTypeKind.String.getFullQualifiedName()); propertyProvider.setPrecision(42); propertyProvider.setScale(12); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java index f7fb6c5..3db70de 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java @@ -23,10 +23,10 @@ import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.Parameter; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; @@ -54,48 +54,48 @@ public class EdmProviderImplOverloadingTest { @Before public void setup() throws Exception { - EdmProvider provider = mock(EdmProvider.class); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); - List<Action> actions = new ArrayList<Action>(); - Action action = new Action().setName(operationName1.getName()); + List<CsdlAction> actions = new ArrayList<CsdlAction>(); + CsdlAction action = new CsdlAction().setName(operationName1.getName()); actions.add(action); - List<Parameter> action1Parameters = new ArrayList<Parameter>(); - action1Parameters.add(new Parameter().setType(operationType1).setCollection(false)); + List<CsdlParameter> action1Parameters = new ArrayList<CsdlParameter>(); + action1Parameters.add(new CsdlParameter().setType(operationType1).setCollection(false)); action = - new Action().setName(operationName1.getName()).setBound(true).setParameters(action1Parameters); + new CsdlAction().setName(operationName1.getName()).setBound(true).setParameters(action1Parameters); actions.add(action); - List<Parameter> action2Parameters = new ArrayList<Parameter>(); - action2Parameters.add(new Parameter().setType(operationType1).setCollection(true)); + List<CsdlParameter> action2Parameters = new ArrayList<CsdlParameter>(); + action2Parameters.add(new CsdlParameter().setType(operationType1).setCollection(true)); action = - new Action().setName(operationName1.getName()).setBound(true).setParameters(action2Parameters); + new CsdlAction().setName(operationName1.getName()).setBound(true).setParameters(action2Parameters); actions.add(action); when(provider.getActions(operationName1)).thenReturn(actions); - List<Function> functions = new ArrayList<Function>(); - Function function = new Function().setName(operationName1.getName()); + List<CsdlFunction> functions = new ArrayList<CsdlFunction>(); + CsdlFunction function = new CsdlFunction().setName(operationName1.getName()); functions.add(function); - List<Parameter> function1Parameters = new ArrayList<Parameter>(); - function1Parameters.add(new Parameter().setType(operationType1).setName("a")); - function = new Function().setName(operationName1.getName()).setParameters(function1Parameters); + List<CsdlParameter> function1Parameters = new ArrayList<CsdlParameter>(); + function1Parameters.add(new CsdlParameter().setType(operationType1).setName("a")); + function = new CsdlFunction().setName(operationName1.getName()).setParameters(function1Parameters); functions.add(function); - List<Parameter> function2Parameters = new ArrayList<Parameter>(); - function2Parameters.add(new Parameter().setType(operationType1).setName("b")); - function = new Function().setName(operationName1.getName()).setParameters(function2Parameters); + List<CsdlParameter> function2Parameters = new ArrayList<CsdlParameter>(); + function2Parameters.add(new CsdlParameter().setType(operationType1).setName("b")); + function = new CsdlFunction().setName(operationName1.getName()).setParameters(function2Parameters); functions.add(function); - List<Parameter> function3Parameters = new ArrayList<Parameter>(); - function3Parameters.add(new Parameter().setName("a").setType(operationType1)); - function3Parameters.add(new Parameter().setName("b").setType(operationType1)); - function = new Function().setName(operationName1.getName()).setParameters(function3Parameters).setBound(true); + List<CsdlParameter> function3Parameters = new ArrayList<CsdlParameter>(); + function3Parameters.add(new CsdlParameter().setName("a").setType(operationType1)); + function3Parameters.add(new CsdlParameter().setName("b").setType(operationType1)); + function = new CsdlFunction().setName(operationName1.getName()).setParameters(function3Parameters).setBound(true); functions.add(function); - List<Parameter> function4Parameters = new ArrayList<Parameter>(); - function4Parameters.add(new Parameter().setName("a").setType(operationType2)); - function4Parameters.add(new Parameter().setName("b").setType(operationType2)); - function = new Function().setName(operationName1.getName()).setParameters(function4Parameters).setBound(true); + List<CsdlParameter> function4Parameters = new ArrayList<CsdlParameter>(); + function4Parameters.add(new CsdlParameter().setName("a").setType(operationType2)); + function4Parameters.add(new CsdlParameter().setName("b").setType(operationType2)); + function = new CsdlFunction().setName(operationName1.getName()).setParameters(function4Parameters).setBound(true); functions.add(function); when(provider.getFunctions(operationName1)).thenReturn(functions); - List<Function> badFunctions = new ArrayList<Function>(); - Function badFunction = new Function().setName(operationName1.getName()).setBound(true).setParameters(null); + List<CsdlFunction> badFunctions = new ArrayList<CsdlFunction>(); + CsdlFunction badFunction = new CsdlFunction().setName(operationName1.getName()).setBound(true).setParameters(null); badFunctions.add(badFunction); when(provider.getFunctions(badOperationName)).thenReturn(badFunctions); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java index aa98ad8..089f4f0 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java @@ -27,14 +27,14 @@ import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.AliasInfo; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlAliasInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; @@ -59,26 +59,26 @@ public class EdmProviderImplTest { @Before public void setup() throws Exception { - EdmProvider provider = mock(EdmProvider.class); - EntityContainerInfo containerInfo = new EntityContainerInfo().setContainerName(FQN); + CsdlEdmProvider provider = mock(CsdlEdmProvider.class); + CsdlEntityContainerInfo containerInfo = new CsdlEntityContainerInfo().setContainerName(FQN); when(provider.getEntityContainerInfo(FQN)).thenReturn(containerInfo); when(provider.getEntityContainerInfo(null)).thenReturn(containerInfo); - EnumType enumType = new EnumType().setName(FQN.getName()); + CsdlEnumType enumType = new CsdlEnumType().setName(FQN.getName()); when(provider.getEnumType(FQN)).thenReturn(enumType); - TypeDefinition typeDefinition = - new TypeDefinition().setName(FQN.getName()).setUnderlyingType(new FullQualifiedName("Edm", "String")); + CsdlTypeDefinition typeDefinition = + new CsdlTypeDefinition().setName(FQN.getName()).setUnderlyingType(new FullQualifiedName("Edm", "String")); when(provider.getTypeDefinition(FQN)).thenReturn(typeDefinition); - EntityType entityType = new EntityType().setName(FQN.getName()).setKey(new ArrayList<PropertyRef>()); + CsdlEntityType entityType = new CsdlEntityType().setName(FQN.getName()).setKey(new ArrayList<CsdlPropertyRef>()); when(provider.getEntityType(FQN)).thenReturn(entityType); - ComplexType complexType = new ComplexType().setName(FQN.getName()); + CsdlComplexType complexType = new CsdlComplexType().setName(FQN.getName()); when(provider.getComplexType(FQN)).thenReturn(complexType); - List<AliasInfo> aliasInfos = new ArrayList<AliasInfo>(); - aliasInfos.add(new AliasInfo().setAlias("alias").setNamespace("namespace")); + List<CsdlAliasInfo> aliasInfos = new ArrayList<CsdlAliasInfo>(); + aliasInfos.add(new CsdlAliasInfo().setAlias("alias").setNamespace("namespace")); when(provider.getAliasInfos()).thenReturn(aliasInfos); edm = new EdmProviderImpl(provider); @@ -86,7 +86,7 @@ public class EdmProviderImplTest { @Test public void nothingSpecifiedMustNotResultInExceptions() throws Exception { - EdmProvider localProvider = mock(EdmProvider.class); + CsdlEdmProvider localProvider = mock(CsdlEdmProvider.class); when(localProvider.getActions(FQN)).thenReturn(null); when(localProvider.getFunctions(FQN)).thenReturn(null); Edm localEdm = new EdmProviderImpl(localProvider); @@ -103,7 +103,7 @@ public class EdmProviderImplTest { @Test public void convertExceptionsTest() throws Exception { - EdmProvider localProvider = mock(EdmProvider.class); + CsdlEdmProvider localProvider = mock(CsdlEdmProvider.class); FullQualifiedName fqn = new FullQualifiedName("namespace", "name"); when(localProvider.getEntityContainerInfo(fqn)).thenThrow(new ODataException("msg")); when(localProvider.getEnumType(fqn)).thenThrow(new ODataException("msg")); @@ -161,7 +161,7 @@ public class EdmProviderImplTest { @Test(expected = EdmException.class) public void convertExceptionsAliasTest() throws Exception { - EdmProvider localProvider = mock(EdmProvider.class); + CsdlEdmProvider localProvider = mock(CsdlEdmProvider.class); when(localProvider.getAliasInfos()).thenThrow(new ODataException("msg")); Edm localEdm = new EdmProviderImpl(localProvider); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java index e8cecee..2d95ca7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ReturnType; +import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.commons.core.edm.EdmReturnTypeImpl; @@ -44,7 +44,7 @@ public class EdmReturnTypeImplTest { @Test public void primitiveReturnType() { - ReturnType providerType = new ReturnType().setType(new FullQualifiedName("Edm", "String")); + CsdlReturnType providerType = new CsdlReturnType().setType(new FullQualifiedName("Edm", "String")); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock(EdmProviderImpl.class), providerType); @@ -59,7 +59,8 @@ public class EdmReturnTypeImplTest { @Test public void primitiveCollectionReturnType() { - ReturnType providerType = new ReturnType().setType(new FullQualifiedName("Edm", "String")).setCollection(true); + CsdlReturnType providerType = new CsdlReturnType().setType( + new FullQualifiedName("Edm", "String")).setCollection(true); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock(EdmProviderImpl.class), providerType); @@ -69,7 +70,8 @@ public class EdmReturnTypeImplTest { @Test(expected = EdmException.class) public void invalidPrimitiveType() { - ReturnType providerType = new ReturnType().setType(new FullQualifiedName("Edm", "wrong")).setCollection(true); + CsdlReturnType providerType = new CsdlReturnType().setType( + new FullQualifiedName("Edm", "wrong")).setCollection(true); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock(EdmProviderImpl.class), providerType); typeImpl.getType(); } @@ -80,7 +82,7 @@ public class EdmReturnTypeImplTest { FullQualifiedName baseType = new FullQualifiedName("namespace", "type"); EdmComplexType edmType = mock(EdmComplexType.class); when(mock.getComplexType(baseType)).thenReturn(edmType); - ReturnType providerType = new ReturnType().setType(baseType); + CsdlReturnType providerType = new CsdlReturnType().setType(baseType); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock, providerType); EdmType returnedType = typeImpl.getType(); assertEquals(edmType, returnedType); @@ -92,7 +94,7 @@ public class EdmReturnTypeImplTest { FullQualifiedName baseType = new FullQualifiedName("namespace", "type"); EdmEntityType edmType = mock(EdmEntityType.class); when(mock.getEntityType(baseType)).thenReturn(edmType); - ReturnType providerType = new ReturnType().setType(baseType); + CsdlReturnType providerType = new CsdlReturnType().setType(baseType); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock, providerType); EdmType returnedType = typeImpl.getType(); assertEquals(edmType, returnedType); @@ -104,7 +106,7 @@ public class EdmReturnTypeImplTest { FullQualifiedName baseType = new FullQualifiedName("namespace", "type"); EdmEnumType edmType = mock(EdmEnumType.class); when(mock.getEnumType(baseType)).thenReturn(edmType); - ReturnType providerType = new ReturnType().setType(baseType); + CsdlReturnType providerType = new CsdlReturnType().setType(baseType); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock, providerType); EdmType returnedType = typeImpl.getType(); assertEquals(edmType, returnedType); @@ -116,7 +118,7 @@ public class EdmReturnTypeImplTest { FullQualifiedName baseType = new FullQualifiedName("namespace", "type"); EdmTypeDefinition edmType = mock(EdmTypeDefinition.class); when(mock.getTypeDefinition(baseType)).thenReturn(edmType); - ReturnType providerType = new ReturnType().setType(baseType); + CsdlReturnType providerType = new CsdlReturnType().setType(baseType); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock, providerType); EdmType returnedType = typeImpl.getType(); assertEquals(edmType, returnedType); @@ -124,7 +126,7 @@ public class EdmReturnTypeImplTest { @Test(expected = EdmException.class) public void invalidType() { - ReturnType providerType = new ReturnType().setType(new FullQualifiedName("wrong", "wrong")); + CsdlReturnType providerType = new CsdlReturnType().setType(new FullQualifiedName("wrong", "wrong")); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock(EdmProviderImpl.class), providerType); typeImpl.getType(); }
