Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

extend const_finder to allow skipping particular classes #37257

Merged
auto-submit merged 13 commits into from
Nov 11, 2022
Merged

extend const_finder to allow skipping particular classes #37257

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f35217c
wip
christopherfujino Nov 2, 2022
f06d70a
extend const_finder_test to compile web dills
christopherfujino Nov 3, 2022
779e03a
add test
christopherfujino Nov 4, 2022
6785ce6
add back tests, including non-const for web
christopherfujino Nov 4, 2022
7abff6d
update run_tests.py
christopherfujino Nov 4, 2022
66c5236
fix whitespace
christopherfujino Nov 4, 2022
e7d1185
clean up test file
christopherfujino Nov 4, 2022
6d0431d
add new options to cli
christopherfujino Nov 9, 2022
4f2a9a3
use annotation rather than explicit deny list
christopherfujino Nov 9, 2022
1263b6d
clean up
christopherfujino Nov 9, 2022
ac499c7
Apply suggestions from code review
christopherfujino Nov 10, 2022
0977118
clean up
christopherfujino Nov 10, 2022
5894e4b
code review
christopherfujino Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clean up test file
  • Loading branch information
@christopherfujino
christopherfujino committed Nov 11, 2022
commit e7d11856d7f3f5bdd00911e19ecd9292016c5d4f
213 changes: 98 additions & 115 deletions tools/const_finder/test/const_finder_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ void expectInstances(dynamic value, dynamic expected, Compiler compiler) {
equality = const DeepCollectionEquality();
}
if (!equality.equals(value, expected)) {
stderr.writeln('Expected: ${const JsonEncoder.withIndent(' ').convert(expected)}');
stderr.writeln('Actual: ${const JsonEncoder.withIndent(' ').convert(value)}');
stderr.writeln('Expected: ${jsonEncode(expected)}');
stderr.writeln('Actual: ${jsonEncode(value)}');
exitCode = -1;
}
}
Expand Down Expand Up @@ -114,6 +114,7 @@ void _checkConsts(String dillPath, Compiler compiler) {
);
}

// Verify constants declared in a class specified in ignoredClasses will be ignored.
void _checkDenyList(String dillPath, Compiler compiler) {
stdout.writeln('Checking constant instances in a denylist are ignored with $compiler');
final ConstFinder finder = ConstFinder(
Expand Down Expand Up @@ -239,6 +240,11 @@ void checkProcessResult(ProcessResult result) {
expect(result.exitCode, 0);
}

final String basePath =
path.canonicalize(path.join(path.dirname(Platform.script.toFilePath()), '..'));
final String fixtures = path.join(basePath, 'test', 'fixtures');
final String packageConfig = path.join(fixtures, '.dart_tool', 'package_config.json');

Future<void> main(List<String> args) async {
if (args.length != 3) {
stderr.writeln('The first argument must be the path to the frontend server dill.');
Expand All @@ -247,128 +253,105 @@ Future<void> main(List<String> args) async {
exit(-1);
}

TestRunner(
frontendServer: args[0],
sdkRoot: args[1],
librariesSpec: args[2],
).test();
}

final String basePath =
path.canonicalize(path.join(path.dirname(Platform.script.toFilePath()), '..'));
final String fixtures = path.join(basePath, 'test', 'fixtures');
final String packageConfig = path.join(fixtures, '.dart_tool', 'package_config.json');

class TestRunner {
TestRunner({
required this.frontendServer,
required this.sdkRoot,
required this.librariesSpec,
});

//static final String box = path.join(fixtures, 'lib', 'box.dart');
//static final String consts = path.join(fixtures, 'lib', 'consts.dart');
//static final String constsAndNon = path.join(fixtures, 'lib', 'consts_and_non.dart');

final String frontendServer;
final String sdkRoot;
final String librariesSpec;

void test() {
final List<_Test> tests = <_Test>[
_Test(
name: 'box_frontend',
dartSource: path.join(fixtures, 'lib', 'box.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkRecursion,
compiler: Compiler.frontendServer,
),
_Test(
name: 'box_web',
dartSource: path.join(fixtures, 'lib', 'box.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkRecursion,
compiler: Compiler.dart2js,
),
_Test(
name: 'consts_frontend',
dartSource: path.join(fixtures, 'lib', 'consts.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkConsts,
compiler: Compiler.frontendServer,
),
_Test(
name: 'consts_web',
dartSource: path.join(fixtures, 'lib', 'consts.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkConsts,
compiler: Compiler.dart2js,
),
_Test(
name: 'consts_and_non_frontend',
dartSource: path.join(fixtures, 'lib', 'consts_and_non.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkNonConstsFrontend,
compiler: Compiler.frontendServer,
),
_Test(
name: 'consts_and_non_web',
dartSource: path.join(fixtures, 'lib', 'consts_and_non.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkNonConstsWeb,
compiler: Compiler.dart2js,
),
_Test(
name: 'denylist_frontend',
dartSource: path.join(fixtures, 'lib', 'denylist.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkDenyList,
compiler: Compiler.frontendServer,
),
_Test(
name: 'denylist_web',
dartSource: path.join(fixtures, 'lib', 'denylist.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkDenyList,
compiler: Compiler.dart2js,
),
];
final String frontendServer = args[0];
final String sdkRoot = args[1];
final String librariesSpec = args[2];

final List<_Test> tests = <_Test>[
_Test(
name: 'box_frontend',
dartSource: path.join(fixtures, 'lib', 'box.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkRecursion,
compiler: Compiler.frontendServer,
),
_Test(
name: 'box_web',
dartSource: path.join(fixtures, 'lib', 'box.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkRecursion,
compiler: Compiler.dart2js,
),
_Test(
name: 'consts_frontend',
dartSource: path.join(fixtures, 'lib', 'consts.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkConsts,
compiler: Compiler.frontendServer,
),
_Test(
name: 'consts_web',
dartSource: path.join(fixtures, 'lib', 'consts.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkConsts,
compiler: Compiler.dart2js,
),
_Test(
name: 'consts_and_non_frontend',
dartSource: path.join(fixtures, 'lib', 'consts_and_non.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkNonConstsFrontend,
compiler: Compiler.frontendServer,
),
_Test(
name: 'consts_and_non_web',
dartSource: path.join(fixtures, 'lib', 'consts_and_non.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkNonConstsWeb,
compiler: Compiler.dart2js,
),
_Test(
name: 'denylist_frontend',
dartSource: path.join(fixtures, 'lib', 'denylist.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkDenyList,
compiler: Compiler.frontendServer,
),
_Test(
name: 'denylist_web',
dartSource: path.join(fixtures, 'lib', 'denylist.dart'),
frontendServer: frontendServer,
sdkRoot: sdkRoot,
librariesSpec: librariesSpec,
verify: _checkDenyList,
compiler: Compiler.dart2js,
),
];
try {
stdout.writeln('Generating kernel fixtures...');

for (final _Test test in tests) {
test.run();
}
} finally {
try {
stdout.writeln('Generating kernel fixtures...');

for (final _Test test in tests) {
test.run();
test.dispose();
}
} finally {
try {
for (final _Test test in tests) {
test.dispose();
}
} finally {
stdout.writeln('Tests ${exitCode == 0 ? 'succeeded' : 'failed'} - exit code: $exitCode');
}
stdout.writeln('Tests ${exitCode == 0 ? 'succeeded' : 'failed'} - exit code: $exitCode');
}
}
}

enum Compiler {
// Uses TFA tree-shaking.
frontendServer,
// Does not have TFA tree-shaking.
dart2js,
}

Expand All @@ -395,7 +378,7 @@ class _Test {
final List<String> resourcesToDispose = <String>[];

void run() {
stdout.writeln('Compiling $dartSource to $dillPath');
stdout.writeln('Compiling $dartSource to $dillPath with $compiler');

if (compiler == Compiler.frontendServer) {
_compileTFADill();
Expand Down