[gjs/wip/ptomato/mozjs38: 1/22] coverage: Stop using JSUnit in tests
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs38: 1/22] coverage: Stop using JSUnit in tests
- Date: Mon, 30 Jan 2017 06:46:28 +0000 (UTC)
commit 4bad8c241c4fa044b2fe07516198b6e8ede75231
Author: Philip Chimento <philip chimento gmail com>
Date: Sun Jan 29 22:36:31 2017 -0800
coverage: Stop using JSUnit in tests
There was some hidden usage of JSUnit in the C++ coverage tests, where we
imported the module inside a generated script that was executed from
C++. It only used assertEquals() from the module, so we just add an
equivalent of that function instead, then we don't have to import the
module multiple times per test run.
https://bugzilla.gnome.org/show_bug.cgi?id=776966
test/gjs-test-coverage.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/test/gjs-test-coverage.cpp b/test/gjs-test-coverage.cpp
index 9d02417..c613644 100644
--- a/test/gjs-test-coverage.cpp
+++ b/test/gjs-test-coverage.cpp
@@ -1602,12 +1602,15 @@ generate_coverage_compartment_verify_script(GFile *coverage_script,
{
char *coverage_script_filename = g_file_get_path(coverage_script);
char *retval =
- g_strdup_printf("const JSUnit = imports.jsUnit;\n"
- "const covered_script_filename = '%s';\n"
+ g_strdup_printf("const covered_script_filename = '%s';\n"
+ "function assertEquals(lhs, rhs) {\n"
+ " if (lhs !== rhs)\n"
+ " throw new Error('Assertion failure');\n"
+ "}\n"
"function assertArrayEquals(lhs, rhs) {\n"
- " JSUnit.assertEquals(lhs.length, rhs.length);\n"
+ " assertEquals(lhs.length, rhs.length);\n"
" for (let i = 0; i < lhs.length; i++)\n"
- " JSUnit.assertEquals(lhs[i], rhs[i]);\n"
+ " assertEquals(lhs[i], rhs[i]);\n"
"}\n"
"\n"
"%s", coverage_script_filename, user_script);
@@ -2313,14 +2316,14 @@ void gjs_test_add_tests_for_coverage()
"} else {\n"
" i = 2;\n"
"}\n",
- "JSUnit.assertEquals(2,
JSON.parse(coverage_cache)[covered_script_filename].branches[0].point);\n"
+ "assertEquals(2, JSON.parse(coverage_cache)[covered_script_filename].branches[0].point);\n"
"assertArrayEquals([3, 5],
JSON.parse(coverage_cache)[covered_script_filename].branches[0].exits);\n"
},
{
"simple_function",
"function f() {\n"
"}\n",
- "JSUnit.assertEquals('f:1:0',
JSON.parse(coverage_cache)[covered_script_filename].functions[0].key);\n"
+ "assertEquals('f:1:0', JSON.parse(coverage_cache)[covered_script_filename].functions[0].key);\n"
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]