Skip to content

Commit eed6d58

Browse files
mascimasci
committed
fix legacy code
1 parent 311edfa commit eed6d58

File tree

2 files changed

+52
-54
lines changed

2 files changed

+52
-54
lines changed

Diff for: ‎legacy/builder/test/hardware_loader_test.go

+48-48
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,23 @@ func TestLoadHardware(t *testing.T) {
5555
}
5656

5757
packages := ctx.Hardware
58-
require.Equal(t, 2, len(packages.Packages))
59-
require.NotNil(t, packages.Packages["arduino"])
60-
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms))
58+
require.Equal(t, 2, len(packages))
59+
require.NotNil(t, packages["arduino"])
60+
require.Equal(t, 2, len(packages["arduino"].Platforms))
6161

62-
require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].BoardID)
63-
require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties.Get("_id"))
62+
require.Equal(t, "uno", packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].BoardID)
63+
require.Equal(t, "uno", packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties.Get("_id"))
6464

65-
require.Equal(t, "yun", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].BoardID)
66-
require.Equal(t, "true", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].Properties.Get("upload.wait_for_upload_port"))
65+
require.Equal(t, "yun", packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].BoardID)
66+
require.Equal(t, "true", packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].Properties.Get("upload.wait_for_upload_port"))
6767

68-
require.Equal(t, "{build.usb_flags}", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["robotMotor"].Properties.Get("build.extra_flags"))
68+
require.Equal(t, "{build.usb_flags}", packages["arduino"].Platforms["avr"].Releases[""].Boards["robotMotor"].Properties.Get("build.extra_flags"))
6969

70-
require.Equal(t, "arduino_due_x", packages.Packages["arduino"].Platforms["sam"].Releases[""].Boards["arduino_due_x"].BoardID)
70+
require.Equal(t, "arduino_due_x", packages["arduino"].Platforms["sam"].Releases[""].Boards["arduino_due_x"].BoardID)
7171

72-
require.Equal(t, "ATmega123", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["diecimila"].Properties.Get("menu.cpu.atmega123"))
72+
require.Equal(t, "ATmega123", packages["arduino"].Platforms["avr"].Releases[""].Boards["diecimila"].Properties.Get("menu.cpu.atmega123"))
7373

74-
avrPlatform := packages.Packages["arduino"].Platforms["avr"]
74+
avrPlatform := packages["arduino"].Platforms["avr"]
7575
require.Equal(t, "Arduino AVR Boards", avrPlatform.Releases[""].Properties.Get("name"))
7676
require.Equal(t, "-v", avrPlatform.Releases[""].Properties.Get("tools.avrdude.bootloader.params.verbose"))
7777
require.Equal(t, "/my/personal/avrdude", avrPlatform.Releases[""].Properties.Get("tools.avrdude.cmd.path"))
@@ -105,25 +105,25 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
105105

106106
if runtime.GOOS == "windows" {
107107
//a package is a symlink, and windows does not support them
108-
require.Equal(t, 3, len(packages.Packages))
108+
require.Equal(t, 3, len(packages))
109109
} else {
110-
require.Equal(t, 4, len(packages.Packages))
110+
require.Equal(t, 4, len(packages))
111111
}
112112

113-
require.NotNil(t, packages.Packages["arduino"])
114-
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms))
113+
require.NotNil(t, packages["arduino"])
114+
require.Equal(t, 2, len(packages["arduino"].Platforms))
115115

116-
require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].BoardID)
117-
require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties.Get("_id"))
116+
require.Equal(t, "uno", packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].BoardID)
117+
require.Equal(t, "uno", packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties.Get("_id"))
118118

119-
require.Equal(t, "yun", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].BoardID)
120-
require.Equal(t, "true", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].Properties.Get("upload.wait_for_upload_port"))
119+
require.Equal(t, "yun", packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].BoardID)
120+
require.Equal(t, "true", packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].Properties.Get("upload.wait_for_upload_port"))
121121

122-
require.Equal(t, "{build.usb_flags}", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["robotMotor"].Properties.Get("build.extra_flags"))
122+
require.Equal(t, "{build.usb_flags}", packages["arduino"].Platforms["avr"].Releases[""].Boards["robotMotor"].Properties.Get("build.extra_flags"))
123123

124-
require.Equal(t, "arduino_due_x", packages.Packages["arduino"].Platforms["sam"].Releases[""].Boards["arduino_due_x"].BoardID)
124+
require.Equal(t, "arduino_due_x", packages["arduino"].Platforms["sam"].Releases[""].Boards["arduino_due_x"].BoardID)
125125

126-
avrPlatform := packages.Packages["arduino"].Platforms["avr"].Releases[""]
126+
avrPlatform := packages["arduino"].Platforms["avr"].Releases[""]
127127
require.Equal(t, "Arduino AVR Boards", avrPlatform.Properties.Get("name"))
128128
require.Equal(t, "-v", avrPlatform.Properties.Get("tools.avrdude.bootloader.params.verbose"))
129129
require.Equal(t, "/my/personal/avrdude", avrPlatform.Properties.Get("tools.avrdude.cmd.path"))
@@ -135,8 +135,8 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
135135
require.Equal(t, "\"{compiler.path}{compiler.cpp.cmd}\" {compiler.cpp.flags} {preproc.includes.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} \"{source_file}\"", avrPlatform.Properties.Get("recipe.preproc.includes"))
136136
require.False(t, avrPlatform.Properties.ContainsKey("preproc.macros.compatibility_flags"))
137137

138-
require.NotNil(t, packages.Packages["my_avr_platform"])
139-
myAVRPlatform := packages.Packages["my_avr_platform"]
138+
require.NotNil(t, packages["my_avr_platform"])
139+
myAVRPlatform := packages["my_avr_platform"]
140140
//require.Equal(t, "hello world", myAVRPlatform.Properties.Get("example"))
141141
myAVRPlatformAvrArch := myAVRPlatform.Platforms["avr"].Releases[""]
142142
require.Equal(t, "custom_yun", myAVRPlatformAvrArch.Boards["custom_yun"].BoardID)
@@ -149,8 +149,8 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
149149
//require.Equal(t, "-w -x c++ -E -CC", packages.Properties.Get("preproc.macros.flags"))
150150

151151
if runtime.GOOS != "windows" {
152-
require.NotNil(t, packages.Packages["my_symlinked_avr_platform"])
153-
require.NotNil(t, packages.Packages["my_symlinked_avr_platform"].Platforms["avr"])
152+
require.NotNil(t, packages["my_symlinked_avr_platform"])
153+
require.NotNil(t, packages["my_symlinked_avr_platform"].Platforms["avr"])
154154
}
155155
}
156156

@@ -169,15 +169,15 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
169169
}
170170

171171
packages := ctx.Hardware
172-
require.Equal(t, 3, len(packages.Packages))
173-
require.NotNil(t, packages.Packages["arduino"])
174-
require.Equal(t, 1, len(packages.Packages["arduino"].Platforms))
175-
require.NotNil(t, packages.Packages["RedBearLab"])
176-
require.Equal(t, 1, len(packages.Packages["RedBearLab"].Platforms))
177-
require.NotNil(t, packages.Packages["RFduino"])
178-
require.Equal(t, 0, len(packages.Packages["RFduino"].Platforms))
179-
180-
samdPlatform := packages.Packages["arduino"].Platforms["samd"].Releases["1.6.5"]
172+
require.Equal(t, 3, len(packages))
173+
require.NotNil(t, packages["arduino"])
174+
require.Equal(t, 1, len(packages["arduino"].Platforms))
175+
require.NotNil(t, packages["RedBearLab"])
176+
require.Equal(t, 1, len(packages["RedBearLab"].Platforms))
177+
require.NotNil(t, packages["RFduino"])
178+
require.Equal(t, 0, len(packages["RFduino"].Platforms))
179+
180+
samdPlatform := packages["arduino"].Platforms["samd"].Releases["1.6.5"]
181181
require.Equal(t, 3, len(samdPlatform.Boards))
182182

183183
require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].BoardID)
@@ -194,7 +194,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
194194
require.Equal(t, "Atmel EDBG", samdPlatform.Programmers["edbg"].Get("name"))
195195
require.Equal(t, "openocd", samdPlatform.Programmers["edbg"].Get("program.tool"))
196196

197-
avrRedBearPlatform := packages.Packages["RedBearLab"].Platforms["avr"].Releases["1.0.0"]
197+
avrRedBearPlatform := packages["RedBearLab"].Platforms["avr"].Releases["1.0.0"]
198198
require.Equal(t, 3, len(avrRedBearPlatform.Boards))
199199

200200
require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].BoardID)
@@ -220,24 +220,24 @@ func TestLoadLotsOfHardware(t *testing.T) {
220220

221221
if runtime.GOOS == "windows" {
222222
//a package is a symlink, and windows does not support them
223-
require.Equal(t, 5, len(packages.Packages))
223+
require.Equal(t, 5, len(packages))
224224
} else {
225-
require.Equal(t, 6, len(packages.Packages))
225+
require.Equal(t, 6, len(packages))
226226
}
227227

228-
require.NotNil(t, packages.Packages["arduino"])
229-
require.NotNil(t, packages.Packages["my_avr_platform"])
228+
require.NotNil(t, packages["arduino"])
229+
require.NotNil(t, packages["my_avr_platform"])
230230

231-
require.Equal(t, 3, len(packages.Packages["arduino"].Platforms))
232-
require.Equal(t, 20, len(packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards))
233-
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms["sam"].Releases[""].Boards))
234-
require.Equal(t, 3, len(packages.Packages["arduino"].Platforms["samd"].Releases["1.6.5"].Boards))
231+
require.Equal(t, 3, len(packages["arduino"].Platforms))
232+
require.Equal(t, 20, len(packages["arduino"].Platforms["avr"].Releases[""].Boards))
233+
require.Equal(t, 2, len(packages["arduino"].Platforms["sam"].Releases[""].Boards))
234+
require.Equal(t, 3, len(packages["arduino"].Platforms["samd"].Releases["1.6.5"].Boards))
235235

236-
require.Equal(t, 1, len(packages.Packages["my_avr_platform"].Platforms))
237-
require.Equal(t, 2, len(packages.Packages["my_avr_platform"].Platforms["avr"].Releases[""].Boards))
236+
require.Equal(t, 1, len(packages["my_avr_platform"].Platforms))
237+
require.Equal(t, 2, len(packages["my_avr_platform"].Platforms["avr"].Releases[""].Boards))
238238

239239
if runtime.GOOS != "windows" {
240-
require.Equal(t, 1, len(packages.Packages["my_symlinked_avr_platform"].Platforms))
241-
require.Equal(t, 2, len(packages.Packages["my_symlinked_avr_platform"].Platforms["avr"].Releases[""].Boards))
240+
require.Equal(t, 1, len(packages["my_symlinked_avr_platform"].Platforms))
241+
require.Equal(t, 2, len(packages["my_symlinked_avr_platform"].Platforms["avr"].Releases[""].Boards))
242242
}
243243
}

Diff for: ‎legacy/builder/test/rewrite_hardware_keys_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ import (
4242
func TestRewriteHardwareKeys(t *testing.T) {
4343
ctx := &types.Context{}
4444

45-
packages := &cores.Packages{}
46-
packages.Packages = map[string]*cores.Package{}
45+
packages := cores.Packages{}
4746
aPackage := &cores.Package{Name: "dummy"}
48-
packages.Packages["dummy"] = aPackage
47+
packages["dummy"] = aPackage
4948
aPackage.Platforms = map[string]*cores.Platform{}
5049

5150
platform := &cores.PlatformRelease{
@@ -83,10 +82,9 @@ func TestRewriteHardwareKeys(t *testing.T) {
8382
func TestRewriteHardwareKeysWithRewritingDisabled(t *testing.T) {
8483
ctx := &types.Context{}
8584

86-
packages := &cores.Packages{}
87-
packages.Packages = make(map[string]*cores.Package)
85+
packages := cores.Packages{}
8886
aPackage := &cores.Package{Name: "dummy"}
89-
packages.Packages["dummy"] = aPackage
87+
packages["dummy"] = aPackage
9088
aPackage.Platforms = make(map[string]*cores.Platform)
9189

9290
platform := &cores.PlatformRelease{

0 commit comments

Comments
 (0)