Update test to match ticket version

Author: jacknojo

javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-cache.js

@@ -0,0 +1,7 @@
+function createCached(fn) {
+  return async function (...args) {
+    return fn(...args);
+  };
+}
+
+module.exports = { createCached };

javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-configurator.js

@@ -0,0 +1,30 @@
+const endpoints = [];
+
+function apiEndpoint(method, path, handler) {
+  endpoints.push({ method, path, handler });
+}
+
+function createRouteConfig(method, path, handler) {
+  const hapiHandler = async function (request, h) {
+    return handler(request.params, request.query, request.payload);
+  };
+
+  return {
+    method,
+    path,
+    handler: hapiHandler,
+  };
+}
+
+function registerEndpoints(server, serviceInstance) {
+  for (const definition of endpoints) {
+    const wrapped = async (params, query, payload) => {
+      return definition.handler.call(serviceInstance, params, query, payload);
+    };
+
+    const config = createRouteConfig(definition.method, definition.path, wrapped);
+    server.route(config);
+  }
+}
+
+module.exports = { apiEndpoint, registerEndpoints };

javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-service.js

@@ -0,0 +1,15 @@
+const { createCached } = require("./wrapped-route-cache");
+
+class ReportService {
+  async runQuery(filter) {
+    sink(filter);
+  }
+}
+
+const service = new ReportService();
+
+const getReportCached = createCached(async function (filter) {
+  return service.runQuery(filter);
+});
+
+module.exports = { getReportCached };

javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route.js

@@ -1,42 +1,22 @@
-const Hapi = require("hapi");
-
-const endpoints = [];
-
-function endpoint(handler) {
-  endpoints.push({ handler });
-}
-
-function routeConfig(handler) {
-  return {
-    handler: async function (request, h) {
-      return handler(request.query);
-    },
-  };
-}
-
-function createCached(fn) {
-  return async function (...args) {
-    return fn(...args);
-  };
-}
-
-const cached = createCached(function (filter) {
-  sink(filter);
-});
-
-class Routes {
-  get(query) {
-    return cached(query.filter);
+const Hapi = require("@hapi/hapi");
+const {
+  apiEndpoint,
+  registerEndpoints,
+} = require("./wrapped-route-configurator");
+const { getReportCached } = require("./wrapped-route-service");
+
+class ReportRoutes {
+  async getReport(params, query) {
+    return getReportCached(query.filter);
   }
 }
 
-endpoint(Routes.prototype.get);
+apiEndpoint("GET", "/reports", ReportRoutes.prototype.getReport);
 
-function register(server, instance) {
-  for (const definition of endpoints) {
-    const wrapped = async (query) => definition.handler.call(instance, query);
-    server.route(routeConfig(wrapped));
-  }
+async function main() {
+  const server = Hapi.server();
+  registerEndpoints(server, new ReportRoutes());
+  return server;
 }
 
-register(new Hapi.Server(), new Routes());
+main();

javascript/ql/test/library-tests/frameworks/hapi/tests.expected

@@ -14,7 +14,7 @@ test_RouteSetup
 | src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) |
 | src/hapihapi.js:29:1:29:20 | server2.route(route) |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) |
-| src/wrapped-route.js:38:5:38:38 | server. ... apped)) |
+| src/wrapped-route-configurator.js:26:5:26:24 | server.route(config) |
 test_RequestExpr
 | src/hapi.js:13:32:13:38 | request | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapi.js:13:32:13:38 | request | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
@@ -65,9 +65,11 @@ test_RequestExpr
 | src/hapihapi.js:25:3:25:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:26:3:26:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:34:22:34:24 | req | src/hapihapi.js:34:12:34:30 | function (req, h){} |
-| src/wrapped-route.js:11:30:11:36 | request | src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } |
-| src/wrapped-route.js:11:30:11:36 | request | src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } |
-| src/wrapped-route.js:12:22:12:28 | request | src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } |
+| src/wrapped-route-configurator.js:8:39:8:45 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:8:39:8:45 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:20:9:26 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:36:9:42 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:51:9:57 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
 test_HeaderAccess
 | src/hapi.js:25:3:25:21 | request.headers.baz | baz |
 | src/hapiglue.js:27:3:27:21 | request.headers.baz | baz |
@@ -92,7 +94,7 @@ test_RouteHandler
 | src/hapihapi.js:17:30:18:1 | functio ... ndler\\n} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:34:12:34:30 | function (req, h){} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
-| src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } | src/wrapped-route.js:42:10:42:26 | new Hapi.Server() |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route.js:17:18:17:30 | Hapi.server() |
 test_HeaderDefinition
 | src/hapi.js:14:9:14:46 | request ... 1', '') | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
@@ -106,7 +108,7 @@ test_ServerDefinition
 | src/hapiglue.js:44:45:44:51 | server_ |
 | src/hapihapi.js:1:15:1:50 | new (re ... erver() |
 | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
-| src/wrapped-route.js:42:10:42:26 | new Hapi.Server() |
+| src/wrapped-route.js:17:18:17:30 | Hapi.server() |
 test_RequestInputAccess
 | src/hapi.js:21:3:21:20 | request.rawPayload | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:22:3:22:33 | getRequ ... oad.foo | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
@@ -129,7 +131,9 @@ test_RequestInputAccess
 | src/hapihapi.js:24:3:24:18 | request.url.path | url | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:25:3:25:21 | request.headers.baz | header | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:26:3:26:21 | request.state.token | cookie | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
-| src/wrapped-route.js:12:22:12:34 | request.query | parameter | src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } |
+| src/wrapped-route-configurator.js:9:20:9:33 | request.params | parameter | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:36:9:48 | request.query | parameter | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:51:9:65 | request.payload | body | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
 test_RouteSetup_getServer
 | src/hapi.js:7:1:9:2 | server2 ... ler1\\n}) | src/hapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapi.js:12:1:15:7 | server2 ...     }}) | src/hapi.js:4:15:4:31 | new Hapi.Server() |
@@ -146,7 +150,7 @@ test_RouteSetup_getServer
 | src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:29:1:29:20 | server2.route(route) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
-| src/wrapped-route.js:38:5:38:38 | server. ... apped)) | src/wrapped-route.js:42:10:42:26 | new Hapi.Server() |
+| src/wrapped-route-configurator.js:26:5:26:24 | server.route(config) | src/wrapped-route.js:17:18:17:30 | Hapi.server() |
 test_HeaderDefinition_defines
 | src/hapi.js:14:9:14:46 | request ... 1', '') | header1 |  |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | header1 |  |
@@ -173,7 +177,7 @@ test_RouteSetup_getARouteHandler
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:33:1:35:1 | return of function getHandler |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:34:12:34:30 | function (req, h){} |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:36:25:36:36 | getHandler() |
-| src/wrapped-route.js:38:5:38:38 | server. ... apped)) | src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } |
+| src/wrapped-route-configurator.js:26:5:26:24 | server.route(config) | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
 test_RouteHandler_getARequestExpr
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:13:32:13:38 | request |
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:13:32:13:38 | request |
@@ -224,9 +228,11 @@ test_RouteHandler_getARequestExpr
 | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:25:3:25:9 | request |
 | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:26:3:26:9 | request |
 | src/hapihapi.js:34:12:34:30 | function (req, h){} | src/hapihapi.js:34:22:34:24 | req |
-| src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } | src/wrapped-route.js:11:30:11:36 | request |
-| src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } | src/wrapped-route.js:11:30:11:36 | request |
-| src/wrapped-route.js:11:14:13:5 | async f ... ;\\n    } | src/wrapped-route.js:12:22:12:28 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:8:39:8:45 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:8:39:8:45 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:9:20:9:26 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:9:36:9:42 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:9:51:9:57 | request |
 test_HeaderDefinition_getAHeaderName
 | src/hapi.js:14:9:14:46 | request ... 1', '') | header1 |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | header1 |
@@ -236,4 +242,4 @@ test_RouteHandler_getAResponseHeader
 | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapiglue.js:14:9:14:46 | request ... 1', '') |
 | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapihapi.js:14:9:14:46 | request ... 1', '') |
 test_WrappedRouteFlow
-| src/wrapped-route.js:12:22:12:34 | request.query | src/wrapped-route.js:24:8:24:13 | filter |
+| src/wrapped-route-configurator.js:9:36:9:48 | request.query | src/wrapped-route-service.js:5:10:5:15 | filter |