aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/servo/testing_commands.py17
-rw-r--r--python/tidy.py1
-rw-r--r--python/tidy_self_test/__init__.py8
-rw-r--r--python/tidy_self_test/incorrect_license.rs1
-rw-r--r--python/tidy_self_test/long_line.rs5
-rw-r--r--python/tidy_self_test/rust_tidy.rs37
-rw-r--r--python/tidy_self_test/spec.webidl10
-rw-r--r--python/tidy_self_test/test.toml5
-rw-r--r--python/tidy_self_test/tidy_self_test.py73
-rw-r--r--python/tidy_self_test/whatwg_link.rs6
-rw-r--r--python/tidy_self_test/wrong_space.rs7
11 files changed, 166 insertions, 4 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 66785e30abe..ea7cb7e50b8 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -30,6 +30,7 @@ from servo.command_base import CommandBase, call, check_call
from wptrunner import wptcommandline
from update import updatecommandline
import tidy
+from tidy_self_test import tidy_self_test
SCRIPT_PATH = os.path.split(__file__)[0]
PROJECT_TOPLEVEL_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, "..", ".."))
@@ -71,9 +72,12 @@ class MachCommands(CommandBase):
help="Only check changed files and skip the WPT lint in tidy")
@CommandArgument('--no-progress', default=False, action="store_true",
help="Don't show progress for tidy")
- def test(self, params, render_mode=DEFAULT_RENDER_MODE, release=False, faster=False, no_progress=False):
+ @CommandArgument('--self-test', default=False, action="store_true",
+ help="Run unit tests for tidy")
+ def test(self, params, render_mode=DEFAULT_RENDER_MODE, release=False, faster=False, no_progress=False,
+ self_test=False):
suites = OrderedDict([
- ("tidy", {"kwargs": {"faster": faster, "no_progress": no_progress},
+ ("tidy", {"kwargs": {"faster": faster, "no_progress": no_progress, "self_test": self_test},
"include_arg": "include"}),
("wpt", {"kwargs": {"release": release},
"paths": [path.abspath(path.join("tests", "wpt", "web-platform-tests")),
@@ -271,8 +275,13 @@ class MachCommands(CommandBase):
"if there are no changes in the WPT files")
@CommandArgument('--no-progress', default=False, action="store_true",
help="Don't show progress for tidy")
- def test_tidy(self, faster, no_progress):
- return tidy.scan(faster, not no_progress)
+ @CommandArgument('--self-test', default=False, action="store_true",
+ help="Run unit tests for tidy")
+ def test_tidy(self, faster, no_progress, self_test):
+ if self_test:
+ return tidy_self_test.do_tests()
+ else:
+ return tidy.scan(faster, not no_progress)
@Command('test-webidl',
description='Run the WebIDL parser tests',
diff --git a/python/tidy.py b/python/tidy.py
index aea25c23107..6110a9ea4eb 100644
--- a/python/tidy.py
+++ b/python/tidy.py
@@ -56,6 +56,7 @@ ignored_dirs = [
os.path.join(".", "tests", "wpt", "sync"),
os.path.join(".", "tests", "wpt", "sync_css"),
os.path.join(".", "python", "mach"),
+ os.path.join(".", "python", "tidy_self_test"),
os.path.join(".", "components", "script", "dom", "bindings", "codegen", "parser"),
os.path.join(".", "components", "script", "dom", "bindings", "codegen", "ply"),
os.path.join(".", "python", "_virtualenv"),
diff --git a/python/tidy_self_test/__init__.py b/python/tidy_self_test/__init__.py
new file mode 100644
index 00000000000..6b6351ddd2b
--- /dev/null
+++ b/python/tidy_self_test/__init__.py
@@ -0,0 +1,8 @@
+# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
diff --git a/python/tidy_self_test/incorrect_license.rs b/python/tidy_self_test/incorrect_license.rs
new file mode 100644
index 00000000000..cf85f0e2623
--- /dev/null
+++ b/python/tidy_self_test/incorrect_license.rs
@@ -0,0 +1 @@
+/* Incorrect license here */
diff --git a/python/tidy_self_test/long_line.rs b/python/tidy_self_test/long_line.rs
new file mode 100644
index 00000000000..cdc0b2045bc
--- /dev/null
+++ b/python/tidy_self_test/long_line.rs
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+println!("really really loooooooooooooooooooooooooooooooooooooooooooong lineeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
diff --git a/python/tidy_self_test/rust_tidy.rs b/python/tidy_self_test/rust_tidy.rs
new file mode 100644
index 00000000000..680b527f679
--- /dev/null
+++ b/python/tidy_self_test/rust_tidy.rs
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use app_units::Au;
+use azure::azure_hl::{AntialiasMode, Color,
+ColorPattern, CompositionOp};
+use euclid::size::Size2D;
+use azure::azure::AzIntSize;
+
+use std;
+
+mod paint_context;
+pub mod display_list;
+mod test::{
+};
+
+extern crate webrender_traits;
+extern crate style_traits;
+
+impl test {
+
+ fn test_fun(y:f32)->f32{
+ let x=5;
+ x = x-1;
+ x = x*x;
+ let z = match y {
+ 1 =>2,
+ 2 => 1,
+ };
+ let z = &Vec<T>;
+ }
+
+ fn test_fun2(y : &String, z : &Vec<f32>) -> f32 {
+ 1
+ }
+}
diff --git a/python/tidy_self_test/spec.webidl b/python/tidy_self_test/spec.webidl
new file mode 100644
index 00000000000..51993ea0d41
--- /dev/null
+++ b/python/tidy_self_test/spec.webidl
@@ -0,0 +1,10 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+interface Test {
+ [SameObject ]
+ readonly attribute Node root;
+};
diff --git a/python/tidy_self_test/test.toml b/python/tidy_self_test/test.toml
new file mode 100644
index 00000000000..c979a5cbd34
--- /dev/null
+++ b/python/tidy_self_test/test.toml
@@ -0,0 +1,5 @@
+[package]
+name = "test"
+version = "*"
+authors = ["The Servo Project Developers"]
+publish = false
diff --git a/python/tidy_self_test/tidy_self_test.py b/python/tidy_self_test/tidy_self_test.py
new file mode 100644
index 00000000000..d7666b58b73
--- /dev/null
+++ b/python/tidy_self_test/tidy_self_test.py
@@ -0,0 +1,73 @@
+# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+import unittest
+import tidy
+
+
+def iterFile(name):
+ return iter(['python/tidy_self_test/' + name])
+
+
+class CheckTidiness(unittest.TestCase):
+ def test_spaces_correctnes(self):
+ errors = tidy.collect_errors_for_files(iterFile('wrong_space.rs'), [], [tidy.check_by_line])
+ self.assertEqual('trailing whitespace', errors.next()[2])
+ self.assertEqual('no newline at EOF', errors.next()[2])
+ self.assertEqual('tab on line', errors.next()[2])
+ self.assertEqual('CR on line', errors.next()[2])
+
+ def test_long_line(self):
+ errors = tidy.collect_errors_for_files(iterFile('long_line.rs'), [], [tidy.check_by_line])
+ self.assertEqual('Line is longer than 120 characters', errors.next()[2])
+
+ def test_whatwg_link(self):
+ errors = tidy.collect_errors_for_files(iterFile('whatwg_link.rs'), [], [tidy.check_by_line])
+ self.assertTrue('link to WHATWG may break in the future, use this format instead:' in errors.next()[2])
+ self.assertTrue('links to WHATWG single-page url, change to multi page:' in errors.next()[2])
+
+ def test_licence(self):
+ errors = tidy.collect_errors_for_files(iterFile('incorrect_license.rs'), [], [tidy.check_license])
+ self.assertEqual('incorrect license', errors.next()[2])
+
+ def test_rust(self):
+ errors = tidy.collect_errors_for_files(iterFile('rust_tidy.rs'), [], [tidy.check_rust])
+ self.assertEqual('use statement spans multiple lines', errors.next()[2])
+ self.assertEqual('missing space before }', errors.next()[2])
+ self.assertTrue('use statement is not in alphabetical order' in errors.next()[2])
+ self.assertEqual('encountered whitespace following a use statement', errors.next()[2])
+ self.assertTrue('mod declaration is not in alphabetical order' in errors.next()[2])
+ self.assertEqual('mod declaration spans multiple lines', errors.next()[2])
+ self.assertTrue('extern crate declaration is not in alphabetical order' in errors.next()[2])
+ self.assertEqual('missing space before ->', errors.next()[2])
+ self.assertEqual('missing space after ->', errors.next()[2])
+ self.assertEqual('missing space after :', errors.next()[2])
+ self.assertEqual('missing space before {', errors.next()[2])
+ self.assertEqual('missing space before =', errors.next()[2])
+ self.assertEqual('missing space after =', errors.next()[2])
+ self.assertEqual('missing space before -', errors.next()[2])
+ self.assertEqual('missing space before *', errors.next()[2])
+ self.assertEqual('missing space after =>', errors.next()[2])
+ self.assertEqual('extra space before :', errors.next()[2])
+ self.assertEqual('extra space before :', errors.next()[2])
+ self.assertEqual('use &[T] instead of &Vec<T>', errors.next()[2])
+ self.assertEqual('use &str instead of &String', errors.next()[2])
+
+ def test_webidl(self):
+ errors = tidy.collect_errors_for_files(iterFile('spec.webidl'), [tidy.check_webidl_spec], [])
+ self.assertEqual('No specification link found.', errors.next()[2])
+
+ def test_toml(self):
+ errors = tidy.collect_errors_for_files(iterFile('test.toml'), [tidy.check_toml], [])
+ self.assertEqual('found asterisk instead of minimum version number', errors.next()[2])
+
+
+def do_tests():
+ suite = unittest.TestLoader().loadTestsFromTestCase(CheckTidiness)
+ unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/python/tidy_self_test/whatwg_link.rs b/python/tidy_self_test/whatwg_link.rs
new file mode 100644
index 00000000000..e8edfbace49
--- /dev/null
+++ b/python/tidy_self_test/whatwg_link.rs
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-putimagedata
+// https://html.spec.whatwg.org/#typographic-conventions
diff --git a/python/tidy_self_test/wrong_space.rs b/python/tidy_self_test/wrong_space.rs
new file mode 100644
index 00000000000..50ee5de75b4
--- /dev/null
+++ b/python/tidy_self_test/wrong_space.rs
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+pub struct TestStruct(
+ pub testMember1: usize,
+ pub testMember2: bool, ); \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 16:35:45 +0000