Skip to content

Commit b64fc36

Browse files
committed
Added Ethernet library in the test-suite
A test sketch that is supposed to fail has been slightly modified to include a non existing fake library (the old sketch included Ethernet that is now available) Signed-off-by: Cristian Maglie <[email protected]>
1 parent bb14a23 commit b64fc36

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
A*
2-
B*
3-
C*
4-
H*
5-
P*
6-
R*
1+
*

src/arduino.cc/builder/test/helper_tools_downloader.go

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
134134
Library{Name: "Adafruit PN532", Version: "1.0.0"},
135135
Library{Name: "Bridge", Version: "1.1.0"},
136136
Library{Name: "CapacitiveSensor", Version: "0.5.0", VersionInLibProperties: "0.5"},
137+
Library{Name: "Ethernet", Version: "1.1.1"},
137138
Library{Name: "Robot IR Remote", Version: "1.0.2"},
138139
}
139140

src/arduino.cc/builder/test/includes_finder_with_gcc_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func TestIncludesFinderWithGCCSketchWithThatChecksIfSPIHasTransactions(t *testin
209209
require.Equal(t, "SPI", importedLibraries[0].Name)
210210
}
211211

212-
func TestIncludesFinderWithGCCSketchWithThatChecksIfSPIHasTransactionsAndIncludesMissingEthernet(t *testing.T) {
212+
func TestIncludesFinderWithGCCSketchWithThatChecksIfSPIHasTransactionsAndIncludesMissingLib(t *testing.T) {
213213
DownloadCoresAndToolsAndLibraries(t)
214214

215215
context := make(map[string]interface{})
@@ -247,7 +247,7 @@ func TestIncludesFinderWithGCCSketchWithThatChecksIfSPIHasTransactionsAndInclude
247247
includes := context[constants.CTX_INCLUDES].([]string)
248248
require.Equal(t, 2, len(includes))
249249
sort.Strings(includes)
250-
require.Equal(t, "Ethernet.h", includes[0])
250+
require.Equal(t, "Inexistent.h", includes[0])
251251
require.Equal(t, "SPI.h", includes[1])
252252

253253
importedLibraries := context[constants.CTX_IMPORTED_LIBRARIES].([]*types.Library)

src/arduino.cc/builder/test/libraries_loader_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
6969
require.Equal(t, Abs(t, filepath.Join("libraries")), librariesFolders[2])
7070

7171
libraries := context[constants.CTX_LIBRARIES].([]*types.Library)
72-
require.Equal(t, 18, len(libraries))
72+
require.Equal(t, 19, len(libraries))
7373

7474
sort.Sort(ByLibraryName(libraries))
7575

@@ -107,6 +107,8 @@ func TestLoadLibrariesAVR(t *testing.T) {
107107
idx++
108108
require.Equal(t, "EEPROM", libraries[idx].Name)
109109
idx++
110+
require.Equal(t, "Ethernet", libraries[idx].Name)
111+
idx++
110112
require.Equal(t, "FakeAudio", libraries[idx].Name)
111113
idx++
112114
require.Equal(t, "HID", libraries[idx].Name)
@@ -175,7 +177,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
175177
require.Equal(t, Abs(t, filepath.Join("libraries")), librariesFolders[2])
176178

177179
libraries := context[constants.CTX_LIBRARIES].([]*types.Library)
178-
require.Equal(t, 16, len(libraries))
180+
require.Equal(t, 17, len(libraries))
179181

180182
sort.Sort(ByLibraryName(libraries))
181183

@@ -192,6 +194,8 @@ func TestLoadLibrariesSAM(t *testing.T) {
192194
idx++
193195
require.Equal(t, "CapacitiveSensor", libraries[idx].Name)
194196
idx++
197+
require.Equal(t, "Ethernet", libraries[idx].Name)
198+
idx++
195199
require.Equal(t, "FakeAudio", libraries[idx].Name)
196200
idx++
197201
require.Equal(t, "HID", libraries[idx].Name)

src/arduino.cc/builder/test/sketch_that_checks_if_SPI_has_transactions_and_includes_missing_Ethernet/sketch.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <SPI.h>
2-
#include <Ethernet.h>
2+
#include <Inexistent.h>
33

44
#if !defined(SPI_HAS_TRANSACTION) || !SPI_HAS_TRANSACTION
55
#error "Where is my SPI_HAS_TRANSACTION!?!?"

0 commit comments

Comments
 (0)