Skip to content

Commit 9d90188

Browse files
committed
Increasing coverage for library resolver
1 parent 2bb8702 commit 9d90188

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Diff for: arduino/libraries/librariesresolver/cpp.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,12 @@ func findLibraryWithNameBestDistance(name string, libs libraries.List) *librarie
151151
closestName := cm.Closest(name)
152152

153153
// Return the closest-matching lib
154+
var winner *libraries.Library
154155
for _, lib := range libs {
155156
if closestName == simplify(lib.Name) {
156-
return lib
157+
winner = lib
158+
break
157159
}
158160
}
159-
return nil
161+
return winner
160162
}

Diff for: arduino/libraries/librariesresolver/cpp_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ func TestCppHeaderPriority(t *testing.T) {
4848
require.True(t, r6 == r7)
4949
}
5050

51+
func TestCppHeaderResolverWithNilResult(t *testing.T) {
52+
resolver := NewCppResolver()
53+
libraryList := libraries.List{}
54+
libraryList.Add(l1)
55+
resolver.headers["aaa.h"] = libraryList
56+
require.Nil(t, resolver.ResolveFor("bbb.h", "avr"))
57+
}
58+
5159
func TestCppHeaderResolver(t *testing.T) {
5260
resolve := func(header string, libs ...*libraries.Library) string {
5361
resolver := NewCppResolver()

0 commit comments

Comments
 (0)