Add integration tests for actions on simple resources with explicit r…

…esource levels.
linkedin · Nov 15, 2021 · 0a9eb23 · 0a9eb23
1 parent a133830
commit 0a9eb23
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 0 deletions.
diff --git a/...est-api/src/main/idl/com.linkedin.restli.examples.greetings.client.greeting.restspec.json b/...est-api/src/main/idl/com.linkedin.restli.examples.greetings.client.greeting.restspec.json
@@ -27,6 +27,22 @@
         "type" : "int"
       } ],
       "returns" : "int"
+    }, {
+      "name" : "exampleActionThatIsExplicitlyAnyLevel",
+      "doc" : "An example action on the greeting which is explicitly set to any-level.",
+      "parameters" : [ {
+        "name" : "param1",
+        "type" : "int"
+      } ],
+      "returns" : "int"
+    }, {
+      "name" : "exampleActionThatIsExplicitlyEntityLevel",
+      "doc" : "An example action on the greeting which is explicitly set to entity-level.",
+      "parameters" : [ {
+        "name" : "param1",
+        "type" : "int"
+      } ],
+      "returns" : "int"
     }, {
       "name" : "exceptionTest",
       "doc" : "An example action throwing an exception."

diff --git a/...pi/src/main/snapshot/com.linkedin.restli.examples.greetings.client.greeting.snapshot.json b/...pi/src/main/snapshot/com.linkedin.restli.examples.greetings.client.greeting.snapshot.json
@@ -57,6 +57,22 @@
           "type" : "int"
         } ],
         "returns" : "int"
+      }, {
+        "name" : "exampleActionThatIsExplicitlyAnyLevel",
+        "doc" : "An example action on the greeting which is explicitly set to any-level.",
+        "parameters" : [ {
+          "name" : "param1",
+          "type" : "int"
+        } ],
+        "returns" : "int"
+      }, {
+        "name" : "exampleActionThatIsExplicitlyEntityLevel",
+        "doc" : "An example action on the greeting which is explicitly set to entity-level.",
+        "parameters" : [ {
+          "name" : "param1",
+          "type" : "int"
+        } ],
+        "returns" : "int"
       }, {
         "name" : "exceptionTest",
         "doc" : "An example action throwing an exception."

diff --git a/...erver/src/main/java/com/linkedin/restli/examples/greetings/server/RootSimpleResource.java b/...erver/src/main/java/com/linkedin/restli/examples/greetings/server/RootSimpleResource.java
@@ -22,6 +22,7 @@
 import com.linkedin.restli.common.PatchRequest;
 import com.linkedin.restli.examples.greetings.api.Greeting;
 import com.linkedin.restli.examples.greetings.api.Tone;
+import com.linkedin.restli.server.ResourceLevel;
 import com.linkedin.restli.server.RestLiServiceException;
 import com.linkedin.restli.server.UpdateResponse;
 import com.linkedin.restli.server.annotations.Action;
@@ -96,6 +97,24 @@ public int exampleAction(@ActionParam("param1") int param1)
     return param1 * 10;
   }
 
+  /**
+   * An example action on the greeting which is explicitly set to entity-level.
+   */
+  @Action(name="exampleActionThatIsExplicitlyEntityLevel", resourceLevel=ResourceLevel.ENTITY)
+  public int exampleActionThatIsExplicitlyEntityLevel(@ActionParam("param1") int param1)
+  {
+    return param1 * 11;
+  }
+
+  /**
+   * An example action on the greeting which is explicitly set to any-level.
+   */
+  @Action(name="exampleActionThatIsExplicitlyAnyLevel", resourceLevel=ResourceLevel.ANY)
+  public int exampleActionThatIsExplicitlyAnyLevel(@ActionParam("param1") int param1)
+  {
+    return param1 * 12;
+  }
+
   /**
    * An example action throwing an exception.
    */

diff --git a/restli-int-test/src/test/java/com/linkedin/restli/examples/TestSimpleResourceHierarchy.java b/restli-int-test/src/test/java/com/linkedin/restli/examples/TestSimpleResourceHierarchy.java
@@ -160,6 +160,24 @@ public void testRootSimpleResourceIntAction(RootBuilderWrapper<Void, Greeting> b
     Assert.assertEquals(responseFuture.getResponse().getEntity().intValue(), 10);
   }
 
+  @Test(dataProvider = com.linkedin.restli.internal.common.TestConstants.RESTLI_PROTOCOL_1_2_PREFIX + "requestBuilderDataProvider")
+  public void testRootSimpleResourceEntityAction(RootBuilderWrapper<Void, Greeting> builders) throws RemoteInvocationException
+  {
+    Request<Integer> request = builders.<Integer>action("ExampleActionThatIsExplicitlyEntityLevel").setActionParam("Param1", 3).build();
+    ResponseFuture<Integer> responseFuture = getClient().sendRequest(request);
+    Assert.assertEquals(responseFuture.getResponse().getStatus(), 200);
+    Assert.assertEquals(responseFuture.getResponse().getEntity().intValue(), 33);
+  }
+
+  @Test(dataProvider = com.linkedin.restli.internal.common.TestConstants.RESTLI_PROTOCOL_1_2_PREFIX + "requestBuilderDataProvider")
+  public void testRootSimpleResourceAnyAction(RootBuilderWrapper<Void, Greeting> builders) throws RemoteInvocationException
+  {
+    Request<Integer> request = builders.<Integer>action("ExampleActionThatIsExplicitlyAnyLevel").setActionParam("Param1", 3).build();
+    ResponseFuture<Integer> responseFuture = getClient().sendRequest(request);
+    Assert.assertEquals(responseFuture.getResponse().getStatus(), 200);
+    Assert.assertEquals(responseFuture.getResponse().getEntity().intValue(), 36);
+  }
+
   @Test(dataProvider = com.linkedin.restli.internal.common.TestConstants.RESTLI_PROTOCOL_1_2_PREFIX + "requestBuilderDataProvider")
   public void testRootSimpleResourceActionException(RootBuilderWrapper<Void, Greeting> builders) throws RemoteInvocationException
   {