test case return statements and feedback

torque59 · torque59 · commit 683233333cf7 · 2021-02-04T22:28:10.000+05:30
diff --git a/java/ql/test/library-tests/frameworks/play/PlayActionMethodQueryParameter.expected b/java/ql/test/library-tests/frameworks/play/PlayActionMethodQueryParameter.expected
@@ -1,3 +1,3 @@
-| resources/Resource.java:20:39:20:48 | uri |
-| resources/Resource.java:25:44:25:55 | token |
-| resources/Resource.java:29:58:29:67 | uri |
+| resources/Resource.java:19:37:19:46 | uri |
+| resources/Resource.java:24:42:24:53 | token |
+| resources/Resource.java:28:56:28:65 | uri |
diff --git a/java/ql/test/library-tests/frameworks/play/PlayAddCSRFTokenAnnotation.expected b/java/ql/test/library-tests/frameworks/play/PlayAddCSRFTokenAnnotation.expected
@@ -1 +1 @@
-| resources/Resource.java:13:5:13:17 | AddCSRFToken |
+| resources/Resource.java:12:3:12:15 | AddCSRFToken |
diff --git a/java/ql/test/library-tests/frameworks/play/PlayMVCResultsMethods.expected b/java/ql/test/library-tests/frameworks/play/PlayMVCResultsMethods.expected
@@ -1,3 +1,3 @@
-| resources/Resource.java:16:16:16:30 | ok(...) |
-| resources/Resource.java:26:9:26:17 | ok(...) |
-| resources/Resource.java:30:9:30:36 | ok(...) |
+| resources/Resource.java:15:12:15:26 | ok(...) |
+| resources/Resource.java:25:27:25:35 | ok(...) |
+| resources/Resource.java:29:46:29:73 | ok(...) |
diff --git a/java/ql/test/library-tests/frameworks/play/resources/Resource.java b/java/ql/test/library-tests/frameworks/play/resources/Resource.java
@@ -1,37 +1,36 @@
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import play.filters.csrf.AddCSRFToken;
+import play.libs.F;
+import play.mvc.BodyParser;
 import play.mvc.Controller;
 import play.mvc.Http.*;
-import play.mvc.Results;
 import play.mvc.Result;
-import play.filters.csrf.AddCSRFToken;
-import play.mvc.BodyParser;
-import play.libs.F;
-import java.util.concurrent.CompletionStage;
-
 
 public class Resource extends Controller {
 
-    @AddCSRFToken
-    public Result index() {
-        response().setHeader("X-Play-QL", "1");
-        return ok("It works!");
-    }
+  @AddCSRFToken
+  public Result index() {
+    response().setHeader("X-Play-QL", "1");
+    return ok("It works!");
+  }
 
-    @BodyParser.Of()
-    public Result session_redirect_me(String uri) {
-        String url = request().getQueryString("url");
-        redirect(url);
-      }
+  @BodyParser.Of()
+  public Result session_redirect_me(String uri) {
+    String url = request().getQueryString("url");
+    return redirect(url);
+  }
 
-    public F.Promise<Result> async_promise(String token) {
-        ok(token);
-      }
+  public F.Promise<Result> async_promise(String token) {
+    return F.Promise.pure(ok(token));
+  }
 
-    public CompletionStage<Result> async_completionstage(String uri) {
-        ok("Async completion Stage");
-      }
+  public CompletionStage<Result> async_completionstage(String uri) {
+    return CompletableFuture.completedFuture(ok("Async completion Stage"));
+  }
 
-    public String not_playactionmethod(String no_action) {
-        String return_code = no_action;
-        return return_code;
-      }
+  public String not_playactionmethod(String no_action) {
+    String return_code = no_action;
+    return return_code;
+  }
 }
diff --git a/java/ql/test/stubs/playframework-2.6.x/play/libs/F.java b/java/ql/test/stubs/playframework-2.6.x/play/libs/F.java
@@ -6,11 +6,14 @@
 
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.function.Supplier;
 
-//import scala.concurrent.ExecutionContext;
+// import scala.concurrent.ExecutionContext;
 
 /** Defines a set of functional programming style helpers. */
 public class F {
-    public static class Promise<A> { } // this is needed for play.libs.F for Play 2.3.x
-}
+  public static class Promise<A> { // this is needed for play.libs.F for Play 2.3.x
+    public static <A> Promise<A> pure(final A a) {
+      return null;
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| resources/Resource.java:13:5:13:17 \| AddCSRFToken \|`
	`1`	`+\| resources/Resource.java:12:3:12:15 \| AddCSRFToken \|`