olingo-odata4 git commit: [OLINGO-655] Fix ActionDataProvider and Tests

[ch...@apache.org]

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 7062aff86 -> 9729428c2


[OLINGO-655] Fix ActionDataProvider and Tests


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9729428c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9729428c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9729428c

Branch: refs/heads/master
Commit: 9729428c22d470ff790236fe4b2f1fe9ed3d158b
Parents: 7062aff
Author: Christian Amend <ch...@apache.org>
Authored: Tue May 12 17:17:20 2015 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Tue May 12 17:17:20 2015 +0200

----------------------------------------------------------------------
 .../olingo/server/tecsvc/data/ActionData.java   |   7 +-
 .../tecsvc/data/ActionDataProviderTest.java     | 242 +++++++++++++++++++
 2 files changed, 246 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9729428c/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
index 85bfd45..4dd118e 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
@@ -158,16 +158,17 @@ public class ActionData {
       if (paramDate != null) {
         Calendar date = (Calendar) paramDate.asPrimitive();
         boolean freeKey;
-        Short key = 0;
+        Short key = -1;
         do {
           freeKey = true;
+          key++;
           for (Entity entity : entityCollection.getEntities()) {
-            if (key.equals(entity.getProperty("PropertyInt16"))) {
+            Short entityKey = (Short) entity.getProperty("PropertyInt16").asPrimitive();
+            if (key.equals(entityKey)) {
               freeKey = false;
               break;
             }
           }
-          key++;
         } while (!freeKey);
         return new EntityActionResult().setEntity(createAllPrimEntity(key, "UARTETAllPrimParam string value", date))
             .setCreated(true);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9729428c/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java
new file mode 100644
index 0000000..87643a6
--- /dev/null
+++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java
@@ -0,0 +1,242 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.tecsvc.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.TimeZone;
+
+import org.apache.olingo.commons.api.data.ComplexValue;
+import org.apache.olingo.commons.api.data.EntityCollection;
+import org.apache.olingo.commons.api.data.Parameter;
+import org.apache.olingo.commons.api.data.Property;
+import org.apache.olingo.commons.api.data.ValueType;
+import org.apache.olingo.commons.api.http.HttpStatusCode;
+import org.apache.olingo.server.tecsvc.data.DataProvider.DataProviderException;
+import org.junit.Test;
+
+public class ActionDataProviderTest {
+
+  @Test
+  public void actionUARTString() throws Exception {
+    Property result = ActionData.primitiveAction("UARTString", null);
+    assertNotNull(result);
+    assertEquals("UARTString string value", result.asPrimitive());
+
+    result = ActionData.primitiveAction("UARTString", new HashMap<String, Parameter>());
+    assertNotNull(result);
+    assertEquals("UARTString string value", result.asPrimitive());
+  }
+
+  @Test(expected = DataProviderException.class)
+  public void actionUARTStringNegative() throws Exception {
+    ActionData.primitiveAction("Wrong", null);
+  }
+
+  @Test
+  public void actionUARTCollStringTwoParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterInt16");
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 3));
+    parameters.put("ParameterInt16", paramInt16);
+
+    Parameter paramDuration = new Parameter();
+    paramDuration.setName("ParameterDuration");
+    paramDuration.setValue(ValueType.PRIMITIVE, new BigDecimal(2));
+    parameters.put("ParameterDuration", paramDuration);
+
+    Property result = ActionData.primitiveCollectionAction("UARTCollStringTwoParam", parameters);
+    assertNotNull(result);
+    assertEquals(3, result.asCollection().size());
+  }
+
+  @Test
+  public void actionUARTCTTwoPrimParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterInt16");
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 3));
+    parameters.put("ParameterInt16", paramInt16);
+
+    Property result = ActionData.complexAction("UARTCTTwoPrimParam", parameters);
+    assertNotNull(result);
+    ComplexValue value = result.asComplex();
+    assertEquals((short) 3, value.getValue().get(0).asPrimitive());
+
+    result = ActionData.complexAction("UARTCTTwoPrimParam", new HashMap<String, Parameter>());
+    assertNotNull(result);
+    value = result.asComplex();
+    assertEquals((short) 32767, value.getValue().get(0).asPrimitive());
+  }
+
+  @Test
+  public void actionUARTCollCTTwoPrimParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterInt16");
+    parameters.put("ParameterInt16", paramInt16);
+
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 0));
+    Property result = ActionData.complexCollectionAction("UARTCollCTTwoPrimParam", parameters);
+    assertNotNull(result);
+    assertEquals((short) 0, result.asCollection().size());
+
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 1));
+    result = ActionData.complexCollectionAction("UARTCollCTTwoPrimParam", parameters);
+    assertNotNull(result);
+    assertEquals((short) 1, result.asCollection().size());
+    ComplexValue value = (ComplexValue) result.asCollection().get(0);
+    assertEquals("Test123", value.getValue().get(1).asPrimitive());
+
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 2));
+    result = ActionData.complexCollectionAction("UARTCollCTTwoPrimParam", parameters);
+    assertNotNull(result);
+    assertEquals((short) 2, result.asCollection().size());
+    value = (ComplexValue) result.asCollection().get(0);
+    assertEquals("Test123", value.getValue().get(1).asPrimitive());
+    value = (ComplexValue) result.asCollection().get(1);
+    assertEquals("Test456", value.getValue().get(1).asPrimitive());
+
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 3));
+    result = ActionData.complexCollectionAction("UARTCollCTTwoPrimParam", parameters);
+    assertNotNull(result);
+    assertEquals((short) 3, result.asCollection().size());
+    value = (ComplexValue) result.asCollection().get(0);
+    assertEquals("Test123", value.getValue().get(1).asPrimitive());
+    value = (ComplexValue) result.asCollection().get(1);
+    assertEquals("Test456", value.getValue().get(1).asPrimitive());
+    value = (ComplexValue) result.asCollection().get(2);
+    assertEquals("Test678", value.getValue().get(1).asPrimitive());
+
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 4));
+    result = ActionData.complexCollectionAction("UARTCollCTTwoPrimParam", parameters);
+    assertNotNull(result);
+    assertEquals((short) 3, result.asCollection().size());
+    value = (ComplexValue) result.asCollection().get(0);
+    assertEquals("Test123", value.getValue().get(1).asPrimitive());
+    value = (ComplexValue) result.asCollection().get(1);
+    assertEquals("Test456", value.getValue().get(1).asPrimitive());
+    value = (ComplexValue) result.asCollection().get(2);
+    assertEquals("Test678", value.getValue().get(1).asPrimitive());
+  }
+
+  @Test
+  public void actionUARTETTwoKeyTwoPrimParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterInt16");
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 32767));
+    parameters.put("ParameterInt16", paramInt16);
+
+    EntityActionResult result = ActionData.entityAction("UARTETTwoKeyTwoPrimParam", parameters);
+    assertNotNull(result);
+    assertFalse(result.isCreated());
+    assertEquals((short) 32767, result.getEntity().getProperty("PropertyInt16").asPrimitive());
+  }
+
+  @Test
+  public void actionUARTETTwoKeyTwoPrimParamNegative() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterInt16");
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 12345));
+    parameters.put("ParameterInt16", paramInt16);
+
+    try {
+      ActionData.entityAction("UARTETTwoKeyTwoPrimParam", parameters);
+      fail("Expected a DataProviderException but wasn`t thrown");
+    } catch (DataProviderException e) {
+      assertEquals("Entity not found with key: 12345", e.getMessage());
+      assertEquals(HttpStatusCode.NOT_FOUND.getStatusCode(), e.getStatusCode());
+    }
+  }
+
+  @Test
+  public void actionUARTETAllPrimParamWithoutParam() throws Exception {
+    EntityActionResult result = ActionData.entityAction("UARTETAllPrimParam", new HashMap<String, Parameter>());
+    assertNotNull(result);
+    assertFalse(result.isCreated());
+    assertEquals(Short.MAX_VALUE, result.getEntity().getProperty("PropertyInt16").asPrimitive());
+  }
+
+  @Test
+  public void actionUARTETAllPrimParamWithParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterDate");
+    paramInt16.setValue(ValueType.PRIMITIVE, null);
+    parameters.put("ParameterDate", paramInt16);
+
+    EntityActionResult result = ActionData.entityAction("UARTETAllPrimParam", parameters);
+    assertNotNull(result);
+    assertTrue(result.isCreated());
+    assertEquals((short) 1, result.getEntity().getProperty("PropertyInt16").asPrimitive());
+  }
+
+  @Test
+  public void actionUARTCollETKeyNavParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterInt16");
+    paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 5));
+    parameters.put("ParameterInt16", paramInt16);
+
+    EntityCollection result = ActionData.entityCollectionAction("UARTCollETKeyNavParam", parameters);
+    assertNotNull(result);
+    assertEquals(5, result.getEntities().size());
+  }
+
+  @Test
+  public void actionUARTCollETAllPrimParam() throws Exception {
+    HashMap<String, Parameter> parameters = new HashMap<String, Parameter>();
+    Parameter paramInt16 = new Parameter();
+    paramInt16.setName("ParameterTimeOfDay");
+    paramInt16.setValue(ValueType.PRIMITIVE, getTime(5, 0, 0));
+    parameters.put("ParameterTimeOfDay", paramInt16);
+
+    EntityCollection result = ActionData.entityCollectionAction("UARTCollETAllPrimParam", parameters);
+    assertNotNull(result);
+    assertEquals(5, result.getEntities().size());
+  }
+
+  @Test
+  public void actionUARTCollETAllPrimParamNoParam() throws Exception {
+    EntityCollection result =
+        ActionData.entityCollectionAction("UARTCollETAllPrimParam", new HashMap<String, Parameter>());
+    assertNotNull(result);
+    assertEquals(0, result.getEntities().size());
+  }
+
+  private Calendar getTime(final int hour, final int minute, final int second) {
+    Calendar time = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+    time.clear();
+    time.set(Calendar.HOUR_OF_DAY, hour);
+    time.set(Calendar.MINUTE, minute);
+    time.set(Calendar.SECOND, second);
+    return time;
+  }
+}