Skip to content

Commit 6e520e2

Browse files
authored
Wrap LLM runner tests in anonymous namespace (unbreak unittest-release) (#13524)
This prevents our test classes from colliding with other global-namespace classes. The specific cause was MockModule being (apparently) the name of a class in gmock or gtest, but I went ahead and did all the tests in this directory to be safe.
1 parent cc88b03 commit 6e520e2

File tree

5 files changed

+12
-1
lines changed

5 files changed

+12
-1
lines changed

extension/llm/runner/test/test_generation_config.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using namespace ::testing;
1313
using executorch::extension::llm::GenerationConfig;
1414

15+
namespace {
1516
class GenerationConfigTest : public Test {};
1617

1718
TEST_F(GenerationConfigTest, TestResolveMaxNewTokensBothDefault) {
@@ -112,3 +113,4 @@ TEST_F(GenerationConfigTest, TestResolveMaxNewTokensBothSpecified) {
112113
// Expected: min(max_new_tokens, available) = min(5, 30) = 5
113114
EXPECT_EQ(config.resolve_max_new_tokens(100, 20), 5);
114115
}
116+
} // namespace

extension/llm/runner/test/test_multimodal_input.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ using executorch::extension::llm::make_image_input;
1616
using executorch::extension::llm::make_text_input;
1717
using executorch::extension::llm::MultimodalInput;
1818

19+
namespace {
1920
class MultimodalInputTest : public Test {
2021
protected:
2122
std::string createTestText() {
@@ -430,3 +431,4 @@ TEST_F(MultimodalInputTest, AssignmentBetweenTypes) {
430431
EXPECT_TRUE(input.is_text());
431432
EXPECT_EQ(input.get_text(), text);
432433
}
434+
} // namespace

extension/llm/runner/test/test_text_decoder_runner.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ using executorch::runtime::EValue;
2626
using executorch::runtime::Result;
2727
using executorch::runtime::testing::TensorFactory;
2828

29-
// Mock Module class for testing
29+
namespace {
3030
class MockModule : public Module {
3131
public:
3232
MockModule() : Module("") {}
@@ -204,3 +204,5 @@ TEST_F(TextDecoderRunnerTest, StepWithAllModels) {
204204
ASSERT_TRUE(any_model_tested)
205205
<< "No models were tested despite environment variables being set";
206206
}
207+
208+
} // namespace

extension/llm/runner/test/test_text_llm_runner.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ using executorch::extension::llm::TextTokenGenerator;
2626
using executorch::runtime::Error;
2727
using executorch::runtime::Result;
2828
using executorch::runtime::testing::TensorFactory;
29+
30+
namespace {
2931
// Mock classes for dependencies
3032
class MockTokenizer : public ::tokenizers::Tokenizer {
3133
public:
@@ -392,3 +394,4 @@ TEST_F(RunnerTest, GenerateFromPosErrorsWithNegativeMaxNewTokens) {
392394
// Verify that an InvalidArgument error is returned
393395
EXPECT_EQ(err, Error::InvalidArgument);
394396
}
397+
} // namespace

extension/llm/runner/test/test_text_prefiller.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ using executorch::runtime::Error;
2121
using executorch::runtime::Result;
2222
using executorch::runtime::testing::TensorFactory;
2323

24+
namespace {
2425
// Mock class for TextDecoderRunner
2526
class MockTextDecoderRunner : public TextDecoderRunner {
2627
public:
@@ -304,3 +305,4 @@ TEST_F(TextPrefillerTest, PrefillChunkWorksWithParallelPrefill) {
304305
// Verify that start_pos has been updated correctly
305306
EXPECT_EQ(start_pos, prompt_tokens.size());
306307
}
308+
} // namespace

0 commit comments

Comments
 (0)