Skip to content

Commit 2d6273e

Browse files
committed
test: add accessor methods and improve config change tests
1 parent bc192ae commit 2d6273e

File tree

4 files changed

+135
-20
lines changed

4 files changed

+135
-20
lines changed

.serena/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/cache

.serena/project.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# language of the project (csharp, python, rust, java, typescript, go, cpp, or ruby)
2+
# * For C, use cpp
3+
# * For JavaScript, use typescript
4+
# Special requirements:
5+
# * csharp: Requires the presence of a .sln file in the project folder.
6+
language: go
7+
8+
# whether to use the project's gitignore file to ignore files
9+
# Added on 2025-04-07
10+
ignore_all_files_in_gitignore: true
11+
# list of additional paths to ignore
12+
# same syntax as gitignore, so you can use * and **
13+
# Was previously called `ignored_dirs`, please update your config if you are using that.
14+
# Added (renamed) on 2025-04-07
15+
ignored_paths: []
16+
17+
# whether the project is in read-only mode
18+
# If set to true, all editing tools will be disabled and attempts to use them will result in an error
19+
# Added on 2025-04-18
20+
read_only: false
21+
22+
# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
23+
# Below is the complete list of tools for convenience.
24+
# To make sure you have the latest list of tools, and to view their descriptions,
25+
# execute `uv run scripts/print_tool_overview.py`.
26+
#
27+
# * `activate_project`: Activates a project by name.
28+
# * `check_onboarding_performed`: Checks whether project onboarding was already performed.
29+
# * `create_text_file`: Creates/overwrites a file in the project directory.
30+
# * `delete_lines`: Deletes a range of lines within a file.
31+
# * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
32+
# * `execute_shell_command`: Executes a shell command.
33+
# * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
34+
# * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
35+
# * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
36+
# * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
37+
# * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
38+
# * `initial_instructions`: Gets the initial instructions for the current project.
39+
# Should only be used in settings where the system prompt cannot be set,
40+
# e.g. in clients you have no control over, like Claude Desktop.
41+
# * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
42+
# * `insert_at_line`: Inserts content at a given line in a file.
43+
# * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
44+
# * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
45+
# * `list_memories`: Lists memories in Serena's project-specific memory store.
46+
# * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
47+
# * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
48+
# * `read_file`: Reads a file within the project directory.
49+
# * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
50+
# * `remove_project`: Removes a project from the Serena configuration.
51+
# * `replace_lines`: Replaces a range of lines within a file with new content.
52+
# * `replace_symbol_body`: Replaces the full definition of a symbol.
53+
# * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
54+
# * `search_for_pattern`: Performs a search for a pattern in the project.
55+
# * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
56+
# * `switch_modes`: Activates modes by providing a list of their names
57+
# * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
58+
# * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
59+
# * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
60+
# * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
61+
excluded_tools: []
62+
63+
# initial prompt for the project. It will always be given to the LLM upon activating the project
64+
# (contrary to the memories, which are loaded on demand).
65+
initial_prompt: ""
66+
67+
project_name: "pipeline2"

pkg/remoteresolution/resolver/framework/cache/cache.go

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@ var _ resolutionframework.ConfigWatcher = (*resolverCache)(nil)
3434
// resolverCache is a wrapper around utilcache.LRUExpireCache that provides
3535
// type-safe methods for caching resolver results.
3636
type resolverCache struct {
37-
cache *utilcache.LRUExpireCache
38-
logger *zap.SugaredLogger
39-
ttl time.Duration
40-
clock Clock
37+
cache *utilcache.LRUExpireCache
38+
logger *zap.SugaredLogger
39+
ttl time.Duration
40+
maxSize int
41+
clock Clock
4142
}
4243

4344
func newResolverCache(maxSize int, ttl time.Duration) *resolverCache {
4445
return &resolverCache{
45-
cache: utilcache.NewLRUExpireCache(maxSize),
46-
ttl: ttl,
47-
clock: realClock{},
46+
cache: utilcache.NewLRUExpireCache(maxSize),
47+
ttl: ttl,
48+
maxSize: maxSize,
49+
clock: realClock{},
4850
}
4951
}
5052

@@ -56,7 +58,17 @@ func (c *resolverCache) GetConfigName(_ context.Context) string {
5658
// withLogger returns a new ResolverCache instance with the provided logger.
5759
// This prevents state leak by not storing logger in the global singleton.
5860
func (c *resolverCache) withLogger(logger *zap.SugaredLogger) *resolverCache {
59-
return &resolverCache{logger: logger, cache: c.cache, ttl: c.ttl, clock: c.clock}
61+
return &resolverCache{logger: logger, cache: c.cache, ttl: c.ttl, maxSize: c.maxSize, clock: c.clock}
62+
}
63+
64+
// TTL returns the time-to-live duration for cache entries.
65+
func (c *resolverCache) TTL() time.Duration {
66+
return c.ttl
67+
}
68+
69+
// MaxSize returns the maximum number of entries the cache can hold.
70+
func (c *resolverCache) MaxSize() int {
71+
return c.maxSize
6072
}
6173

6274
// Get retrieves a cached resource by resolver type and parameters, returning

pkg/remoteresolution/resolver/framework/cache/configstore_test.go

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,12 @@ func TestParseCacheConfigMap(t *testing.T) {
198198
}
199199

200200
func TestOnCacheConfigChanged(t *testing.T) {
201-
// Test that onCacheConfigChanged updates the shared cache
201+
ctx := logtesting.TestContextWithLogger(t)
202+
203+
// Ensure cache is initialized first
204+
_ = Get(ctx)
205+
206+
// Test that onCacheConfigChanged updates the shared cache with new config values
202207
config := &cacheConfig{
203208
maxSize: 500,
204209
ttl: 10 * time.Minute,
@@ -207,25 +212,55 @@ func TestOnCacheConfigChanged(t *testing.T) {
207212
// Call onCacheConfigChanged to update the shared cache
208213
onCacheConfigChanged("test-config", config)
209214

210-
// Verify the shared cache was updated by checking we can still get it
211-
// We can't directly verify the size/ttl without accessing the internal cache,
212-
// but we can verify it doesn't panic and returns a valid cache
213-
ctx := logtesting.TestContextWithLogger(t)
215+
// Verify the shared cache was updated with the correct config values
214216
cache := Get(ctx)
215217
if cache == nil {
216-
t.Error("Expected cache after config change but got nil")
218+
t.Fatal("Expected cache after config change but got nil")
219+
}
220+
221+
// Verify TTL was applied
222+
if cache.TTL() != config.ttl {
223+
t.Errorf("Expected TTL to be %v, got %v", config.ttl, cache.TTL())
224+
}
225+
226+
// Verify MaxSize was applied
227+
if cache.MaxSize() != config.maxSize {
228+
t.Errorf("Expected MaxSize to be %d, got %d", config.maxSize, cache.MaxSize())
217229
}
218230
}
219231

220232
func TestOnCacheConfigChangedWithInvalidType(t *testing.T) {
233+
// First, set up a known good config
234+
goodConfig := &cacheConfig{
235+
maxSize: defaultCacheSize,
236+
ttl: defaultExpiration,
237+
}
238+
onCacheConfigChanged("test-config", goodConfig)
239+
240+
ctx := logtesting.TestContextWithLogger(t)
241+
cacheBefore := Get(ctx)
242+
if cacheBefore == nil {
243+
t.Fatal("Expected cache before invalid config change")
244+
}
245+
ttlBefore := cacheBefore.TTL()
246+
maxSizeBefore := cacheBefore.MaxSize()
247+
221248
// Test that onCacheConfigChanged handles invalid types gracefully
222-
// This should not panic
249+
// This should not panic and should preserve the existing cache
223250
onCacheConfigChanged("test-config", "invalid-type")
224251

225-
// Verify we can still get the cache
226-
ctx := logtesting.TestContextWithLogger(t)
227-
cache := Get(ctx)
228-
if cache == nil {
229-
t.Error("Expected cache after invalid config change but got nil")
252+
// Verify we can still get the cache and it wasn't modified
253+
cacheAfter := Get(ctx)
254+
if cacheAfter == nil {
255+
t.Fatal("Expected cache after invalid config change but got nil")
256+
}
257+
258+
// Verify cache config wasn't changed by invalid input
259+
if cacheAfter.TTL() != ttlBefore {
260+
t.Errorf("Expected TTL to remain %v after invalid config, got %v", ttlBefore, cacheAfter.TTL())
261+
}
262+
263+
if cacheAfter.MaxSize() != maxSizeBefore {
264+
t.Errorf("Expected MaxSize to remain %d after invalid config, got %d", maxSizeBefore, cacheAfter.MaxSize())
230265
}
231266
}

0 commit comments

Comments
 (0)