popcorn: test test_angular with pop_tests

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

diff --git a/lib/popcorn/tests/test_example_angular.nit b/lib/popcorn/examples/angular/test_example_angular.nit
similarity index 68%
rename from lib/popcorn/tests/test_example_angular.nit
rename to lib/popcorn/examples/angular/test_example_angular.nit
index 821aa32..b61f1b0 100644 (file)
--- a/lib/popcorn/tests/test_example_angular.nit
+++ b/lib/popcorn/examples/angular/test_example_angular.nit
@@ -14,35 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+module test_example_angular is test_suite
+
+import pop_tests
 import example_angular
-import base_tests
 
-class TestClient
-       super ClientThread
+class TestExampleAngular
+       super TestPopcorn
 
-       redef fun main do
+       redef fun client_test do
                system "curl -s {host}:{port}/counter"
                system "curl -s {host}:{port}/counter -X POST"
                system "curl -s {host}:{port}/counter"
                system "curl -s {host}:{port}/not_found" # handled by angular controller
-               return null
        end
-end
-
-var app = new App
-app.use("/counter", new CounterAPI)
-app.use("/*", new StaticHandler("../examples/angular/www/", "index.html"))
-
-var host = test_host
-var port = test_port
 
-var server = new AppThread(host, port, app)
-server.start
-0.1.sleep
-
-var client = new TestClient(host, port)
-client.start
-client.join
-0.1.sleep
-
-exit 0
+       fun test_example_param_route do
+               var app = new App
+               app.use("/counter", new CounterAPI)
+               app.use("/*", new StaticHandler("../examples/angular/www/", "index.html"))
+               run_test(app)
+       end
+end

diff --git a/lib/popcorn/tests/res/test_example_angular.res b/lib/popcorn/examples/angular/test_example_angular.sav/test_example_angular.res
similarity index 100%
rename from lib/popcorn/tests/res/test_example_angular.res
rename to lib/popcorn/examples/angular/test_example_angular.sav/test_example_angular.res