Skip to content

Commit b40fa52

Browse files
connorsheaconnorshea
committed
test(linter): Improve consistency by removing unnecessary tuples in tests (#20095)
This makes it easier to compare with rulegen-generated tests and removes a bunch of redundant code.
1 parent 2baa5fb commit b40fa52

13 files changed

+676
-812
lines changed

‎crates/oxc_linter/src/rules/eslint/no_empty_character_class.rs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -87,52 +87,52 @@ fn test() {
8787
use crate::tester::Tester;
8888

8989
let pass = vec![
90-
("var foo = /^abc[a-zA-Z]/;", None),
91-
("var regExp = new RegExp(\"^abc[]\");", None),
92-
("var foo = /^abc/;", None),
93-
("var foo = /[\\[]/;", None),
94-
("var foo = /[\\]]/;", None),
95-
("var foo = /[a-zA-Z\\[]/;", None),
96-
("var foo = /[[]/;", None),
97-
("var foo = /[\\[a-z[]]/;", None),
98-
("var foo = /[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\^\\$\\|]/g;", None),
99-
("var foo = /\\s*:\\s*/gim;", None),
100-
("var foo = /[\\]]/uy;", None),
101-
("var foo = /[\\]]/s;", None),
102-
("var foo = /[\\]]/d;", None),
103-
("var foo = /\\[]/", None),
90+
"var foo = /^abc[a-zA-Z]/;",
91+
"var regExp = new RegExp(\"^abc[]\");",
92+
"var foo = /^abc/;",
93+
"var foo = /[\\[]/;",
94+
"var foo = /[\\]]/;",
95+
"var foo = /[a-zA-Z\\[]/;",
96+
"var foo = /[[]/;",
97+
"var foo = /[\\[a-z[]]/;",
98+
"var foo = /[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\^\\$\\|]/g;",
99+
"var foo = /\\s*:\\s*/gim;",
100+
"var foo = /[\\]]/uy;",
101+
"var foo = /[\\]]/s;",
102+
"var foo = /[\\]]/d;",
103+
"var foo = /\\[]/",
104104
// ES2024
105-
("var foo = /[[^]]/v;", None), // { "ecmaVersion": 2024 }
106-
("var foo = /[[\\]]]/v;", None), // { "ecmaVersion": 2024 }
107-
("var foo = /[[\\[]]/v;", None), // { "ecmaVersion": 2024 }
108-
("var foo = /[a--b]/v;", None), // { "ecmaVersion": 2024 }
109-
("var foo = /[a&&b]/v;", None), // { "ecmaVersion": 2024 }
110-
("var foo = /[[a][b]]/v;", None), // { "ecmaVersion": 2024 }
111-
("var foo = /[\\q{}]/v;", None), // { "ecmaVersion": 2024 }
112-
("var foo = /[[^]--\\p{ASCII}]/v;", None), // { "ecmaVersion": 2024 }
105+
"var foo = /[[^]]/v;", // { "ecmaVersion": 2024 }
106+
"var foo = /[[\\]]]/v;", // { "ecmaVersion": 2024 }
107+
"var foo = /[[\\[]]/v;", // { "ecmaVersion": 2024 }
108+
"var foo = /[a--b]/v;", // { "ecmaVersion": 2024 }
109+
"var foo = /[a&&b]/v;", // { "ecmaVersion": 2024 }
110+
"var foo = /[[a][b]]/v;", // { "ecmaVersion": 2024 }
111+
"var foo = /[\\q{}]/v;", // { "ecmaVersion": 2024 }
112+
"var foo = /[[^]--\\p{ASCII}]/v;", // { "ecmaVersion": 2024 }
113113
];
114114

115115
let fail = vec![
116-
("var foo = /^abc[]/;", None),
117-
("var foo = /foo[]bar/;", None),
118-
("if (foo.match(/^abc[]/)) {}", None),
119-
("if (/^abc[]/.test(foo)) {}", None),
120-
("var foo = /[]]/;", None),
121-
("var foo = /\\[[]/;", None),
122-
("var foo = /\\[\\[\\]a-z[]/;", None),
123-
("var foo = /[]]/d;", None),
124-
("var foo = /[[][]]/v;", None),
125-
("var foo = /[[]]|[]/v;", None),
126-
("var foo = /[(]\\u{0}*[]/u;", None), // { "ecmaVersion": 2015 }
116+
"var foo = /^abc[]/;",
117+
"var foo = /foo[]bar/;",
118+
"if (foo.match(/^abc[]/)) {}",
119+
"if (/^abc[]/.test(foo)) {}",
120+
"var foo = /[]]/;",
121+
"var foo = /\\[[]/;",
122+
"var foo = /\\[\\[\\]a-z[]/;",
123+
"var foo = /[]]/d;",
124+
"var foo = /[[][]]/v;",
125+
"var foo = /[[]]|[]/v;",
126+
"var foo = /[(]\\u{0}*[]/u;", // { "ecmaVersion": 2015 }
127127
// ES2024
128-
("var foo = /[]/v;", None), // { "ecmaVersion": 2024 }
129-
("var foo = /[[]]/v;", None), // { "ecmaVersion": 2024 }
130-
("var foo = /[[a][]]/v;", None), // { "ecmaVersion": 2024 }
131-
("var foo = /[a[[b[]c]]d]/v;", None), // { "ecmaVersion": 2024 }
132-
("var foo = /[a--[]]/v;", None), // { "ecmaVersion": 2024 }
133-
("var foo = /[[]--b]/v;", None), // { "ecmaVersion": 2024 }
134-
("var foo = /[a&&[]]/v;", None), // { "ecmaVersion": 2024 }
135-
("var foo = /[[]&&b]/v;", None), // { "ecmaVersion": 2024 }
128+
"var foo = /[]/v;", // { "ecmaVersion": 2024 }
129+
"var foo = /[[]]/v;", // { "ecmaVersion": 2024 }
130+
"var foo = /[[a][]]/v;", // { "ecmaVersion": 2024 }
131+
"var foo = /[a[[b[]c]]d]/v;", // { "ecmaVersion": 2024 }
132+
"var foo = /[a--[]]/v;", // { "ecmaVersion": 2024 }
133+
"var foo = /[[]--b]/v;", // { "ecmaVersion": 2024 }
134+
"var foo = /[a&&[]]/v;", // { "ecmaVersion": 2024 }
135+
"var foo = /[[]&&b]/v;", // { "ecmaVersion": 2024 }
136136
];
137137

138138
Tester::new(NoEmptyCharacterClass::NAME, NoEmptyCharacterClass::PLUGIN, pass, fail)

‎crates/oxc_linter/src/rules/eslint/no_empty_pattern.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,26 +103,26 @@ fn test() {
103103
use crate::tester::Tester;
104104

105105
let pass = vec![
106-
("var {a = {}} = foo;", None),
107-
("var {a, b = {}} = foo;", None),
108-
("var {a = []} = foo;", None),
109-
("function foo({a = {}}) {}", None),
110-
("function foo({a = []}) {}", None),
111-
("var [a] = foo", None),
112-
("var {...x} = foo;", None),
113-
("var [...x] = foo;", None),
106+
"var {a = {}} = foo;",
107+
"var {a, b = {}} = foo;",
108+
"var {a = []} = foo;",
109+
"function foo({a = {}}) {}",
110+
"function foo({a = []}) {}",
111+
"var [a] = foo",
112+
"var {...x} = foo;",
113+
"var [...x] = foo;",
114114
];
115115

116116
let fail = vec![
117-
("var {} = foo", None),
118-
("var [] = foo", None),
119-
("var {a: {}} = foo", None),
120-
("var {a, b: {}} = foo", None),
121-
("var {a: []} = foo", None),
122-
("function foo({}) {}", None),
123-
("function foo([]) {}", None),
124-
("function foo({a: {}}) {}", None),
125-
("function foo({a: []}) {}", None),
117+
"var {} = foo",
118+
"var [] = foo",
119+
"var {a: {}} = foo",
120+
"var {a, b: {}} = foo",
121+
"var {a: []} = foo",
122+
"function foo({}) {}",
123+
"function foo([]) {}",
124+
"function foo({a: {}}) {}",
125+
"function foo({a: []}) {}",
126126
];
127127

128128
Tester::new(NoEmptyPattern::NAME, NoEmptyPattern::PLUGIN, pass, fail).test_and_snapshot();

0 commit comments

Comments
 (0)