Repository: olingo-odata4 Updated Branches: refs/heads/master d2cc50fb3 -> 34e518a6e
[OLINGO-633] Fixed 'isFlags' for enum types Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/34e518a6 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/34e518a6 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/34e518a6 Branch: refs/heads/master Commit: 34e518a6e02e95aea0f18a4941b799956c226c24 Parents: d2cc50f Author: Michael Bolz <[email protected]> Authored: Tue Apr 21 15:14:06 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Apr 21 15:14:06 2015 +0200 ---------------------------------------------------------------------- .../core/edm/provider/EdmEnumTypeImpl.java | 28 +++-- .../server/core/edm/provider/EdmEnumTest.java | 125 +++++++++++++++++++ 2 files changed, 143 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/34e518a6/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java index 55fddce..53650bb 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java @@ -170,18 +170,26 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { } } - protected String constructEnumValue(final long value) throws EdmPrimitiveTypeException { + protected String constructEnumValue(final long value) + throws EdmPrimitiveTypeException { long remaining = value; StringBuilder result = new StringBuilder(); for (final EdmMember member : getMembers()) { - final long memberValue = Long.parseLong(member.getValue()); - if ((memberValue & remaining) == memberValue) { - if (result.length() > 0) { - result.append(','); + if (isFlags()) { + final long memberValue = Long.parseLong(member.getValue()); + if ((memberValue & remaining) == memberValue) { + if (result.length() > 0) { + result.append(','); + } + result.append(member.getName()); + remaining ^= memberValue; + } + } else { + final long memberValue = Long.parseLong(member.getValue()); + if (value == memberValue) { + return member.getName(); } - result.append(member.getName()); - remaining ^= memberValue; } } @@ -192,9 +200,9 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { } private Collection<EdmMember> getMembers() { - if(membersMap == null){ - createEdmMembers(); - } + if(membersMap == null){ + createEdmMembers(); + } return membersMap.values(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/34e518a6/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 401cf90..0767f65 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 @@ -18,7 +18,9 @@ */ package org.apache.olingo.server.core.edm.provider; +import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEnumType; +import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -30,6 +32,7 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.provider.EdmEnumTypeImpl; import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; import org.junit.Test; +import org.mockito.Mockito; import java.util.Arrays; import java.util.List; @@ -49,6 +52,9 @@ public class EdmEnumTest { private final EdmEnumType instance; private final EdmEnumType nonFlagsInstance; + private final EdmEnumType int16EnumType; + private final EdmEnumType int32EnumType; + private final EdmEnumType int32FlagType; public EdmEnumTest() { final List<EnumMember> memberList = Arrays.asList( @@ -64,6 +70,38 @@ public class EdmEnumTest { nonFlagsInstance = new EdmEnumTypeImpl(mock(EdmProviderImpl.class), enumName, new EnumType().setName("name").setMembers(memberList).setFlags(false) .setUnderlyingType(EdmPrimitiveTypeKind.SByte.getFullQualifiedName())); + + int16EnumType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), new EnumType() + .setName("MyEnum") + .setFlags(false) + .setUnderlyingType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()) + .setMembers( + Arrays.asList( + new EnumMember().setName("A") + .setValue("0"), + new EnumMember().setName("B") + .setValue("1"), + new EnumMember().setName("C") + .setValue("2")))); + + int32EnumType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), new EnumType() + .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")))); + + int32FlagType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), new EnumType() + .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")))); } @Test @@ -90,6 +128,11 @@ public class EdmEnumTest { @Test public void defaultType() throws Exception { assertEquals(Byte.class, instance.getDefaultType()); + EdmEnumType instance = new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), + new EnumType() + .setName("MyEnum")); + assertEquals(Integer.class, instance.getUnderlyingType().getDefaultType()); } @Test @@ -149,6 +192,20 @@ public class EdmEnumTest { expectNullErrorInValueToString(instance); expectContentErrorInValueToString(instance, 3); expectTypeErrorInValueToString(instance, 1.0); + + assertEquals("A", int32EnumType.valueToString(0, false, 0, 0, 0, false)); + assertEquals("B", int32EnumType.valueToString(1, false, 0, 0, 0, false)); + assertEquals("C", int32EnumType.valueToString(2, false, 0, 0, 0, false)); + + assertEquals("A", int16EnumType.valueToString(0, false, 0, 0, 0, false)); + assertEquals("B", int16EnumType.valueToString(1, false, 0, 0, 0, false)); + assertEquals("C", int16EnumType.valueToString(2, false, 0, 0, 0, false)); + + assertEquals("A", int32FlagType.valueToString(2, false, 0, 0, 0, false)); + assertEquals("B", int32FlagType.valueToString(4, false, 0, 0, 0, false)); + assertEquals("C", int32FlagType.valueToString(8, false, 0, 0, 0, false)); + assertEquals("A,B", int32FlagType.valueToString(0x2 + 0x4, false, 0, 0, 0, false)); + assertEquals("B,C", int32FlagType.valueToString(0x4 + 0x8, false, 0, 0, 0, false)); } @Test @@ -170,8 +227,76 @@ public class EdmEnumTest { expectContentErrorInValueOfString(instance, "1,"); expectContentErrorInValueOfString(instance, ",1"); expectTypeErrorInValueOfString(instance, "1"); + + assertEquals(Integer.valueOf(0), int32EnumType.valueOfString("A", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(1), int32EnumType.valueOfString("B", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(2), int32EnumType.valueOfString("C", null, null, null, null, null, Integer.class)); + + assertEquals(Integer.valueOf(0), int16EnumType.valueOfString("A", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(1), int16EnumType.valueOfString("B", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(2), int16EnumType.valueOfString("C", null, null, null, null, null, Integer.class)); + + assertEquals(Integer.valueOf(2), int32FlagType.valueOfString("A", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(4), int32FlagType.valueOfString("B", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(8), int32FlagType.valueOfString("C", null, null, null, null, null, Integer.class)); + assertEquals(Integer.valueOf(0x2 + 0x4), int32FlagType.valueOfString("A,B", null, null, null, null, null, + Integer.class)); + assertEquals(Integer.valueOf(0x4 + 0x8), int32FlagType.valueOfString("B,C", null, null, null, null, null, + Integer.class)); + assertEquals(Integer.valueOf(0x2 + 0x4), int32FlagType.valueOfString("B,A", null, null, null, null, null, + Integer.class)); + } + + private void expectErrorInValueToString(final EdmEnumType instance, + final Object value, final Boolean isNullable, final Integer maxLength, + final Integer precision, final Integer scale, final Boolean isUnicode, + final String message) { + try { + instance.valueToString(value, isNullable, maxLength, precision, scale, isUnicode); + fail("Expected exception not thrown"); + } catch (final EdmPrimitiveTypeException e) { + assertNotNull(e.getLocalizedMessage()); + assertThat(e.getLocalizedMessage(), containsString(message)); + } } + private void expectErrorInUnderlyingType( + final EdmPrimitiveTypeKind underlyingType, + final String message) { + try { + @SuppressWarnings("unused") + EdmEnumType instance = new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), + new EnumType() + .setName("MyEnum") + .setFlags(false) + .setUnderlyingType(underlyingType.getFullQualifiedName()) + .setMembers( + Arrays.asList( + new EnumMember().setName("A") + .setValue("0")))); + fail("Expected exception not thrown"); + } catch (final EdmException e) { + assertNotNull(e.getLocalizedMessage()); + assertThat(e.getLocalizedMessage(), containsString(message)); + } + } + + @Test + public void unsupportedUnderlyingType() throws Exception { + // Test some random unsupported types + expectErrorInUnderlyingType(EdmPrimitiveTypeKind.Date, ""); + expectErrorInUnderlyingType(EdmPrimitiveTypeKind.Geography, ""); + expectErrorInUnderlyingType(EdmPrimitiveTypeKind.Guid, ""); + } + + @Test + public void outOfRangeValueToString() throws Exception { + expectErrorInValueToString(int16EnumType, Integer.MAX_VALUE, null, null, null, null, null, ""); + } + + + protected void expectErrorInFromUriLiteral(final EdmPrimitiveType instance, final String value) { try { instance.fromUriLiteral(value);
