popcorn: test test_popcorn with pop_tests

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/lib/popcorn/test_popcorn.nit b/lib/popcorn/test_popcorn.nit
new file mode 100644 (file)
index 0000000..108eb7a
--- /dev/null
+++ b/lib/popcorn/test_popcorn.nit
@@ -0,0 +1,97 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2016 Alexandre Terrasa <alexandre@moz-code.org>
+#
+# Licensed 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.
+
+module test_popcorn is test_suite
+
+import pop_tests
+import popcorn
+
+class TestHandler
+       super Handler
+
+       var marker: String
+
+       redef fun get(req, res) do res.send marker
+end
+
+class TestPopcornRouter
+       super TestPopcorn
+
+       redef fun client_test do
+               system "curl -s {host}:{port}"
+               system "curl -s {host}:{port}/"
+               system "curl -s {host}:{port}/user"
+               system "curl -s {host}:{port}/user/"
+               system "curl -s {host}:{port}/user/settings"
+               system "curl -s {host}:{port}/products"
+               system "curl -s {host}:{port}/products/"
+               system "curl -s {host}:{port}/products/list"
+               system "curl -s {host}:{port}/not_found"
+               system "curl -s {host}:{port}/user/not_found"
+               system "curl -s {host}:{port}/products/not_found"
+       end
+
+       fun test_router do
+               var app = new App
+               app.use("/", new TestHandler("/"))
+               app.use("/about", new TestHandler("/about"))
+
+               var router1 = new App
+               router1.use("/", new TestHandler("/user"))
+               router1.use("/settings", new TestHandler("/user/settings"))
+               app.use("/user", router1)
+
+               var router2 = new App
+               router2.use("/", new TestHandler("/products"))
+               router2.use("/list", new TestHandler("/products/list"))
+               app.use("/products", router2)
+
+               run_test(app)
+       end
+end
+
+class TestPopcornRoutes
+       super TestPopcorn
+
+       redef fun client_test do
+               system "curl -s {host}:{port}"
+               system "curl -s {host}:{port}/"
+               system "curl -s {host}:{port}/misc"
+               system "curl -s {host}:{port}/misc/foo"
+               system "curl -s {host}:{port}/misc/foo/bar"
+               system "curl -s {host}:{port}/misc/foo/baz"
+               system "curl -s {host}:{port}/user"
+               system "curl -s {host}:{port}/user/"
+               system "curl -s {host}:{port}/user/id"
+               system "curl -s {host}:{port}/user/id/profile"
+               system "curl -s {host}:{port}/user/id/misc/foo"
+               system "curl -s {host}:{port}/user/id/misc/foo/bar"
+               system "curl -s {host}:{port}/user/id/misc/foo/bar/baz"
+               system "curl -s {host}:{port}/not_found"
+               system "curl -s {host}:{port}/user/id/not_found"
+       end
+
+       fun test_routes do
+               var app = new App
+               app.use("/", new TestHandler("/"))
+               app.use("/user", new TestHandler("/user"))
+               app.use("/misc/*", new TestHandler("/misc/everything"))
+               app.use("/user/:id", new TestHandler("/user/id"))
+               app.use("/user/:id/profile", new TestHandler("/user/id/profile"))
+               app.use("/user/:id/misc/*", new TestHandler("/user/id/misc/everything"))
+               run_test(app)
+       end
+end

diff --git a/lib/popcorn/tests/res/test_router.res b/lib/popcorn/test_popcorn.sav/test_router.res
similarity index 98%
rename from lib/popcorn/tests/res/test_router.res
rename to lib/popcorn/test_popcorn.sav/test_router.res
index 37be3a6..1022411 100644 (file)
--- a/lib/popcorn/tests/res/test_router.res
+++ b/lib/popcorn/test_popcorn.sav/test_router.res
@@ -47,4 +47,4 @@
                <body>
                <h1>404 Not Found</h1>
                </body>
-               </html>
\ No newline at end of file
+               </html>

diff --git a/lib/popcorn/tests/res/test_routes.res b/lib/popcorn/test_popcorn.sav/test_routes.res
similarity index 99%
rename from lib/popcorn/tests/res/test_routes.res
rename to lib/popcorn/test_popcorn.sav/test_routes.res
index 0c1abfa..58e47d0 100644 (file)
--- a/lib/popcorn/tests/res/test_routes.res
+++ b/lib/popcorn/test_popcorn.sav/test_routes.res
@@ -46,4 +46,4 @@
                <body>
                <h1>404 Not Found</h1>
                </body>
-               </html>
\ No newline at end of file
+               </html>

diff --git a/lib/popcorn/tests/test_router.nit b/lib/popcorn/tests/test_router.nit
deleted file mode 100644 (file)
index 915ce4a..0000000
--- a/lib/popcorn/tests/test_router.nit
+++ /dev/null
@@ -1,73 +0,0 @@
-# This file is part of NIT ( http://www.nitlanguage.org ).
-#
-# Copyright 2016 Alexandre Terrasa <alexandre@moz-code.org>
-#
-# Licensed 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.
-
-import base_tests
-
-class TestHandler
-       super Handler
-
-       var marker: String
-
-       redef fun get(req, res) do res.send marker
-end
-
-class HelloClient
-       super ClientThread
-
-       redef fun main do
-               system "curl -s {host}:{port}"
-               system "curl -s {host}:{port}/"
-               system "curl -s {host}:{port}/user"
-               system "curl -s {host}:{port}/user/"
-               system "curl -s {host}:{port}/user/settings"
-               system "curl -s {host}:{port}/products"
-               system "curl -s {host}:{port}/products/"
-               system "curl -s {host}:{port}/products/list"
-
-               system "curl -s {host}:{port}/not_found"
-               system "curl -s {host}:{port}/user/not_found"
-               system "curl -s {host}:{port}/products/not_found"
-               return null
-       end
-end
-
-var app = new App
-app.use("/", new TestHandler("/"))
-app.use("/about", new TestHandler("/about"))
-
-var router1 = new App
-router1.use("/", new TestHandler("/user"))
-router1.use("/settings", new TestHandler("/user/settings"))
-app.use("/user", router1)
-
-var router2 = new App
-router2.use("/", new TestHandler("/products"))
-router2.use("/list", new TestHandler("/products/list"))
-app.use("/products", router2)
-
-var host = test_host
-var port = test_port
-
-var server = new AppThread(host, port, app)
-server.start
-0.1.sleep
-
-var client = new HelloClient(host, port)
-client.start
-client.join
-0.1.sleep
-
-exit 0

diff --git a/lib/popcorn/tests/test_routes.nit b/lib/popcorn/tests/test_routes.nit
deleted file mode 100644 (file)
index 2db660a..0000000
--- a/lib/popcorn/tests/test_routes.nit
+++ /dev/null
@@ -1,76 +0,0 @@
-# This file is part of NIT ( http://www.nitlanguage.org ).
-#
-# Copyright 2016 Alexandre Terrasa <alexandre@moz-code.org>
-#
-# Licensed 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.
-
-import base_tests
-
-class TestHandler
-       super Handler
-
-       var marker: String
-
-       redef fun get(req, res) do res.send marker
-end
-
-class HelloClient
-       super ClientThread
-
-       redef fun main do
-               system "curl -s {host}:{port}"
-               system "curl -s {host}:{port}/"
-
-               system "curl -s {host}:{port}/misc"
-               system "curl -s {host}:{port}/misc/foo"
-               system "curl -s {host}:{port}/misc/foo/bar"
-               system "curl -s {host}:{port}/misc/foo/baz"
-
-               system "curl -s {host}:{port}/user"
-               system "curl -s {host}:{port}/user/"
-               system "curl -s {host}:{port}/user/id"
-               system "curl -s {host}:{port}/user/id/profile"
-               system "curl -s {host}:{port}/user/id/misc/foo"
-               system "curl -s {host}:{port}/user/id/misc/foo/bar"
-               system "curl -s {host}:{port}/user/id/misc/foo/bar/baz"
-
-               system "curl -s {host}:{port}/not_found"
-               system "curl -s {host}:{port}/user/id/not_found"
-               return null
-       end
-end
-
-var app = new App
-app.use("/", new TestHandler("/"))
-app.use("/user", new TestHandler("/user"))
-app.use("/misc/*", new TestHandler("/misc/everything"))
-app.use("/user/:id", new TestHandler("/user/id"))
-app.use("/user/:id/profile", new TestHandler("/user/id/profile"))
-app.use("/user/:id/misc/*", new TestHandler("/user/id/misc/everything"))
-
-var host = test_host
-var port = test_port
-
-# First, launch a server in the background
-var server = new AppThread(host, port, app)
-server.start
-0.1.sleep
-
-# Then, launch a client running test requests
-var client = new HelloClient(host, port)
-client.start
-client.join
-0.1.sleep
-
-# Force quit the server
-exit 0