From 6318994e4369de4fed98114c2b3c9acbb6e9180d Mon Sep 17 00:00:00 2001 From: "Theodor S. Midtlien" Date: Wed, 3 Jun 2026 12:32:52 +0200 Subject: [PATCH] Fix test and runes in ShortID() --- client/internal/profilemanager/id.go | 5 +++-- client/internal/profilemanager/profilemanager_test.go | 4 ++-- client/internal/profilemanager/service_test.go | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/client/internal/profilemanager/id.go b/client/internal/profilemanager/id.go index d96925a70..3b82c8779 100644 --- a/client/internal/profilemanager/id.go +++ b/client/internal/profilemanager/id.go @@ -106,10 +106,11 @@ func (id ID) ShortID() string { if id == DefaultProfileName { return DefaultProfileName } - if len(id) <= shortIDLen { + runes := []rune(id) + if len(runes) <= shortIDLen { return id.String() } - return id.String()[:shortIDLen] + return string(runes[:shortIDLen]) } func (id ID) String() string { diff --git a/client/internal/profilemanager/profilemanager_test.go b/client/internal/profilemanager/profilemanager_test.go index 515fe1476..882a71d0a 100644 --- a/client/internal/profilemanager/profilemanager_test.go +++ b/client/internal/profilemanager/profilemanager_test.go @@ -50,14 +50,14 @@ func TestServiceManager_CreateAndGetDefaultProfile(t *testing.T) { state, err := sm.GetActiveProfileState() assert.NoError(t, err) - assert.Equal(t, defaultProfileName, state.ID) // No active profile state yet + assert.Equal(t, defaultProfileName, state.ID.String()) // No active profile state yet err = sm.SetActiveProfileStateToDefault() assert.NoError(t, err) active, err := sm.GetActiveProfileState() assert.NoError(t, err) - assert.Equal(t, "default", active.ID) + assert.Equal(t, "default", active.ID.String()) }) }) } diff --git a/client/internal/profilemanager/service_test.go b/client/internal/profilemanager/service_test.go index 76204e4e3..5e051b15d 100644 --- a/client/internal/profilemanager/service_test.go +++ b/client/internal/profilemanager/service_test.go @@ -110,7 +110,7 @@ func TestServiceProfile_DefaultByExactID(t *testing.T) { withTestSM(t, func(sm *ServiceManager, username string) { got, err := sm.ResolveProfile(defaultProfileName, username) require.NoError(t, err) - assert.Equal(t, defaultProfileName, got.ID) + assert.Equal(t, defaultProfileName, got.ID.String()) }) } @@ -125,7 +125,7 @@ func TestServiceProfile_LegacyFilenameCoexists(t *testing.T) { got, err := sm.ResolveProfile("legacy", username) require.NoError(t, err) - assert.Equal(t, "legacy", got.ID) + assert.Equal(t, "legacy", got.ID.String()) // Name falls back to the filename stem when JSON omits it. assert.Equal(t, "legacy", got.Name) })