From 190432f252b8a531b8b4bf4745b3e86b804e2e29 Mon Sep 17 00:00:00 2001
From: Kalervo Kujala <kkujala@com>
Date: Mon, 12 Dec 2011 22:31:10 +0200
Subject: [PATCH] Remove unit_test.html.
JsTestDriver has made it obsolete. Also add explicitly the used config to
the Makefile.
---
test/unit/Makefile | 1 +
test/unit/unit_test.html | 51 ----------------------------------------
2 files changed, 1 insertion(+), 51 deletions(-)
delete mode 100644 test/unit/unit_test.html
diff --git a/test/unit/Makefile b/test/unit/Makefile
index 5a11568c3..19a072481 100644
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -11,6 +11,7 @@ PROG=java \
-Xms512m \
-Xmx1024m \
-jar ../../external/jsTestDriver/JsTestDriver-1.3.3d.jar \
+--config ./jsTestDriver.conf \
--reset \
--port 4224 \
--browser $(BROWSERS) \
diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
deleted file mode 100644
index 1fc28ef83..000000000
--- a/test/unit/unit_test.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>pdf.js unit test</title>
-
- <link rel="shortcut icon" type="image/png" href="../../external/jasmine/jasmine_favicon.png">
- <link rel="stylesheet" type="text/css" href="../../external/jasmine/jasmine.css">
-
- <script type="text/javascript" src="../../external/jasmine/jasmine.js"></script>
- <script type="text/javascript" src="../../external/jasmine/jasmine-html.js"></script>
-
- <!-- include spec files here... -->
- <script type="text/javascript" src="obj_spec.js"></script>
-
- <!-- include source files here... -->
- <script type="text/javascript" src="../../src/obj.js"></script>
-
- <script type="text/javascript">
- 'use strict';
-
- (function pdfJsUnitTest() {
- var jasmineEnv = jasmine.getEnv();
- jasmineEnv.updateInterval = 1000;
-
- var trivialReporter = new jasmine.TrivialReporter();
-
- jasmineEnv.addReporter(trivialReporter);
-
- jasmineEnv.specFilter = function pdfJsUnitTestSpecFilter(spec) {
- return trivialReporter.specFilter(spec);
- };
-
- var currentWindowOnload = window.onload;
-
- window.onload = function pdfJsUnitTestOnload() {
- if (currentWindowOnload) {
- currentWindowOnload();
- }
- execJasmine();
- };
-
- function execJasmine() {
- jasmineEnv.execute();
- }
- })();
- </script>
-</head>
-<body>
-</body>
-</html>
-