caio/clice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(tests): use Tester fixture, normalize helpers, add index tests (#377)

Browse Source 
## Summary

- **Use `Tester` as fixture base** for all test suites that need
compilation, replacing `TesterFixture` and removing redundant
`tester.clear()` calls (eventide zest now creates fresh instances per
TEST_CASE)
- **Remove local `Tester` variables** in `compilation_tests`,
`template_resolver_tests`, `selection_tests` — use inherited fixture
members directly
- **Normalize helper naming**: `expect_xxx` → `EXPECT_XXX`,
`go_to_definition` → `GO_TO_DEFINITION` for consistency
- **Extract shared `test/cdb_helper.h`**: deduplicate `CDBEntry`,
`json_escape`, `build_cdb_json` from `dependency_graph_tests` and
`compile_graph_integration_tests`
- **Add new test files/cases**: `project_index_tests.cpp`, expanded
`tu_index_tests`, `merged_index_tests`, `compilation_tests`

## Test plan

- [x] All existing unit tests pass
- [x] New index tests (TUIndex, MergedIndex, ProjectIndex) pass
- [x] Compilation tests (PCH, PCM, stop) pass

🤖 Generated with [Claude Code](https://claude.com/claude-code)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Tests**
* Standardized test fixtures and helper naming, moved suites to a shared
fixture, and unified in-memory VFS and compile flows.
* Added broad new coverage: indexing, project indexing, compilation/PCH,
diagnostics, semantic features, and many targeted unit cases.
* Introduced a small compile-database helper and improved driver-style
test compilation paths.

* **Chores**
* Consolidated and reorganized test utilities and tester APIs for easier
maintenance and reuse.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
ykiko
2026-03-31 10:29:49 +08:00
committed by GitHub
parent 6d3b6acc82
commit 0a891d8b4a
27 changed files with 1895 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
tests/unit/test/tester.cpp
View File

@@ -8,25 +8,36 @@
namespace clice::testing {
void Tester::prepare(llvm::StringRef standard) {
auto command = std::format("clang++ {} {} -fms-extensions", standard, src_path);
database.add_command("fake", src_path, command);
params.kind = CompilationKind::Content;
CommandOptions options;
options.query_toolchain = true;
options.suppress_logging = true;
params.arguments = database.lookup(src_path, options).front().arguments;
params = CompilationParams();
unit.reset();
vfs = llvm::makeIntrusiveRefCnt<TestVFS>();
for(auto& [file, source]: sources.all_files) {
if(file == src_path) {
params.add_remapped_file(file, source.content);
} else {
std::string path = path::is_absolute(file) ? file.str() : path::join(".", file);
params.add_remapped_file(path, source.content);
}
vfs->add(file, source.content);
}
owned_args.clear();
// Use -cc1 mode directly to bypass the slow driver subprocess.
owned_args.push_back("clang");
owned_args.push_back("-cc1");
owned_args.push_back("-triple");
owned_args.push_back(LLVM_DEFAULT_TARGET_TRIPLE);
owned_args.push_back(standard.str());
owned_args.push_back("-ffreestanding");
owned_args.push_back("-undef");
owned_args.push_back("-fms-extensions");
owned_args.push_back("-fsyntax-only");
owned_args.push_back("-x");
owned_args.push_back("c++");
owned_args.push_back(TestVFS::path(src_path));
params.arguments.clear();
for(auto& arg: owned_args) {
params.arguments.push_back(arg.c_str());
}
params.kind = CompilationKind::Content;
params.vfs = vfs;
}
bool Tester::compile(llvm::StringRef standard) {
@@ -45,16 +56,7 @@ bool Tester::compile(llvm::StringRef standard) {
}
bool Tester::compile_with_pch(llvm::StringRef standard) {
auto command = std::format("clang++ {} {} -fms-extensions", standard, src_path);
database.add_command("fake", src_path, command);
params.kind = CompilationKind::Preamble;
CommandOptions options;
options.query_toolchain = true;
options.suppress_logging = true;
params.arguments = database.lookup(src_path, options).front().arguments;
prepare(standard);
auto pch_path = fs::createTemporaryFile("clice", "pch");
if(!pch_path) {
@@ -62,17 +64,20 @@ bool Tester::compile_with_pch(llvm::StringRef standard) {
return false;
}
// Use an overlay VFS so the PCH temp file on real disk is accessible.
auto overlay =
llvm::makeIntrusiveRefCnt<llvm::vfs::OverlayFileSystem>(llvm::vfs::getRealFileSystem());
overlay->pushOverlay(vfs);
params.vfs = overlay;
// Phase 1: Build PCH from the preamble portion.
params.kind = CompilationKind::Preamble;
params.output_file = *pch_path;
for(auto& [file, source]: sources.all_files) {
if(file == src_path) {
auto bound = compute_preamble_bound(source.content);
params.add_remapped_file(file, source.content, bound);
} else {
std::string path = path::is_absolute(file) ? file.str() : path::join(".", file);
params.add_remapped_file(path, source.content);
}
}
auto& main_source = sources.all_files[src_path];
auto bound = compute_preamble_bound(main_source.content);
auto main_vfs_path = TestVFS::path(src_path);
params.add_remapped_file(main_vfs_path, main_source.content, bound);
PCHInfo info;
{
@@ -85,20 +90,12 @@ bool Tester::compile_with_pch(llvm::StringRef standard) {
}
}
// Phase 2: Compile content using the PCH.
params.output_file.clear();
params.kind = CompilationKind::Content;
params.pch = {info.path, static_cast<std::uint32_t>(info.preamble.size())};
params.buffers.clear();
for(auto& [file, source]: sources.all_files) {
if(file == src_path) {
params.add_remapped_file(file, source.content);
} else {
std::string path = path::is_absolute(file) ? file.str() : path::join(".", file);
params.add_remapped_file(path, source.content);
}
}
auto built = clice::compile(params);
if(!built.completed()) {
for(auto& diag: built.diagnostics()) {
@@ -149,12 +146,148 @@ LocalSourceRange Tester::range(llvm::StringRef name, llvm::StringRef file) {
return ranges.lookup(name);
}
void Tester::prepare_driver(llvm::StringRef standard) {
params = CompilationParams();
unit.reset();
vfs = llvm::makeIntrusiveRefCnt<TestVFS>();
for(auto& [file, source]: sources.all_files) {
vfs->add(file, source.content);
}
auto command = std::format("clang++ {} {} -fms-extensions", standard, src_path);
database.add_command("fake", src_path, command);
CommandOptions options;
options.query_toolchain = true;
options.suppress_logging = true;
auto commands = database.lookup(src_path, options);
assert(!commands.empty() && "lookup failed after add_command");
params.arguments = commands.front().arguments;
params.kind = CompilationKind::Content;
// Use overlay VFS: real FS (for system headers) + InMemoryFS (for test files).
auto overlay =
llvm::makeIntrusiveRefCnt<llvm::vfs::OverlayFileSystem>(llvm::vfs::getRealFileSystem());
overlay->pushOverlay(vfs);
params.vfs = overlay;
// Remap test files so clang sees our in-memory content.
for(auto& [file, source]: sources.all_files) {
if(file == src_path) {
params.add_remapped_file(file, source.content);
} else {
std::string path = path::is_absolute(file) ? file.str() : path::join(".", file);
params.add_remapped_file(path, source.content);
}
}
}
bool Tester::compile_driver(llvm::StringRef standard) {
prepare_driver(standard);
auto built = clice::compile(params);
if(!built.completed()) {
for(auto& diag: built.diagnostics()) {
LOG_ERROR("{}", diag.message);
}
return false;
}
unit.emplace(std::move(built));
return true;
}
bool Tester::compile_driver_with_pch(llvm::StringRef standard) {
params = CompilationParams();
unit.reset();
vfs = llvm::makeIntrusiveRefCnt<TestVFS>();
for(auto& [file, source]: sources.all_files) {
vfs->add(file, source.content);
}
auto command = std::format("clang++ {} {} -fms-extensions", standard, src_path);
database.add_command("fake", src_path, command);
CommandOptions options;
options.query_toolchain = true;
options.suppress_logging = true;
auto commands = database.lookup(src_path, options);
assert(!commands.empty() && "lookup failed after add_command");
params.arguments = commands.front().arguments;
auto pch_path = fs::createTemporaryFile("clice", "pch");
if(!pch_path) {
LOG_ERROR("{}", pch_path.error().message());
return false;
}
// Use overlay VFS: real FS (for system headers + PCH temp) + InMemoryFS.
auto overlay =
llvm::makeIntrusiveRefCnt<llvm::vfs::OverlayFileSystem>(llvm::vfs::getRealFileSystem());
overlay->pushOverlay(vfs);
params.vfs = overlay;
// Phase 1: Build PCH from the preamble portion.
params.kind = CompilationKind::Preamble;
params.output_file = *pch_path;
for(auto& [file, source]: sources.all_files) {
if(file == src_path) {
auto bound = compute_preamble_bound(source.content);
params.add_remapped_file(file, source.content, bound);
} else {
std::string path = path::is_absolute(file) ? file.str() : path::join(".", file);
params.add_remapped_file(path, source.content);
}
}
PCHInfo info;
{
auto preamble_unit = clice::compile(params, info);
if(!preamble_unit.completed()) {
for(auto& diag: preamble_unit.diagnostics()) {
LOG_ERROR("{}", diag.message);
}
return false;
}
}
// Phase 2: Compile content using the PCH.
params.output_file.clear();
params.kind = CompilationKind::Content;
params.pch = {info.path, static_cast<std::uint32_t>(info.preamble.size())};
params.buffers.clear();
for(auto& [file, source]: sources.all_files) {
if(file == src_path) {
params.add_remapped_file(file, source.content);
} else {
std::string path = path::is_absolute(file) ? file.str() : path::join(".", file);
params.add_remapped_file(path, source.content);
}
}
auto built = clice::compile(params);
if(!built.completed()) {
for(auto& diag: built.diagnostics()) {
LOG_ERROR("{}", diag.message);
}
return false;
}
unit.emplace(std::move(built));
return true;
}
void Tester::clear() {
params = CompilationParams();
database = CompilationDatabase();
unit.reset();
sources.all_files.clear();
src_path.clear();
owned_args.clear();
vfs.reset();
}
} // namespace clice::testing