Skip to content

Commit f99ab5a

Browse files
cmagliecmaglie
committed
Renamed field Board.BoardId -> Board.BoardID (part 2...)
1 parent 8a51a33 commit f99ab5a

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎test/add_build_board_property_if_missing_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestAddBuildBoardPropertyIfMissing(t *testing.T) {
7373
require.NotNil(t, targetPlatform.Platform)
7474
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
7575
targetBoard := ctx.TargetBoard
76-
require.Equal(t, "mymega", targetBoard.BoardId)
76+
require.Equal(t, "mymega", targetBoard.BoardID)
7777
require.Equal(t, constants.EMPTY_STRING, targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
7878
require.Equal(t, "AVR_MYMEGA", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
7979
}
@@ -102,7 +102,7 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
102102
targetPlatform := ctx.TargetPlatform
103103
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
104104
targetBoard := ctx.TargetBoard
105-
require.Equal(t, "mymega", targetBoard.BoardId)
105+
require.Equal(t, "mymega", targetBoard.BoardID)
106106
require.Equal(t, "atmega2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
107107
require.Equal(t, "AVR_MEGA2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
108108
}

‎test/hardware_loader_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ func TestLoadHardware(t *testing.T) {
6060
require.NotNil(t, packages.Packages["arduino"])
6161
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms))
6262

63-
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"].BoardID)
6464
require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties["_id"])
6565

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

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

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

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

@@ -114,15 +114,15 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
114114
require.NotNil(t, packages.Packages["arduino"])
115115
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms))
116116

117-
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"].BoardID)
118118
require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties["_id"])
119119

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

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

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

127127
avrPlatform := packages.Packages["arduino"].Platforms["avr"].Releases[""]
128128
require.Equal(t, "Arduino AVR Boards", avrPlatform.Properties["name"])
@@ -140,7 +140,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
140140
myAVRPlatform := packages.Packages["my_avr_platform"]
141141
//require.Equal(t, "hello world", myAVRPlatform.Properties["example"])
142142
myAVRPlatformAvrArch := myAVRPlatform.Platforms["avr"].Releases[""]
143-
require.Equal(t, "custom_yun", myAVRPlatformAvrArch.Boards["custom_yun"].BoardId)
143+
require.Equal(t, "custom_yun", myAVRPlatformAvrArch.Boards["custom_yun"].BoardID)
144144

145145
require.False(t, utils.MapStringStringHas(myAVRPlatformAvrArch.Properties, "preproc.includes.flags"))
146146

@@ -181,7 +181,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
181181
samdPlatform := packages.Packages["arduino"].Platforms["samd"].Releases["1.6.5"]
182182
require.Equal(t, 3, len(samdPlatform.Boards))
183183

184-
require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].BoardId)
184+
require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].BoardID)
185185
require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].Properties["_id"])
186186

187187
require.Equal(t, "arduino_zero", samdPlatform.Boards["arduino_zero_native"].Properties["build.variant"])
@@ -198,7 +198,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
198198
avrRedBearPlatform := packages.Packages["RedBearLab"].Platforms["avr"].Releases["1.0.0"]
199199
require.Equal(t, 3, len(avrRedBearPlatform.Boards))
200200

201-
require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].BoardId)
201+
require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].BoardID)
202202
require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].Properties["_id"])
203203
require.Equal(t, "arduino:arduino", avrRedBearPlatform.Boards["blend"].Properties["build.core"])
204204
}

‎test/target_board_resolver_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
6060
targetPlatform := ctx.TargetPlatform
6161
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
6262
targetBoard := ctx.TargetBoard
63-
require.Equal(t, "uno", targetBoard.BoardId)
63+
require.Equal(t, "uno", targetBoard.BoardID)
6464
require.Equal(t, "atmega328p", targetBoard.Properties["build.mcu"])
6565
}
6666

@@ -85,7 +85,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
8585
targetPlatform := ctx.TargetPlatform
8686
require.Equal(t, "sam", targetPlatform.Platform.Architecture)
8787
targetBoard := ctx.TargetBoard
88-
require.Equal(t, "arduino_due_x", targetBoard.BoardId)
88+
require.Equal(t, "arduino_due_x", targetBoard.BoardID)
8989
require.Equal(t, "cortex-m3", targetBoard.Properties["build.mcu"])
9090
}
9191

@@ -110,7 +110,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
110110
targetPlatform := ctx.TargetPlatform
111111
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
112112
targetBoard := ctx.TargetBoard
113-
require.Equal(t, "mega", targetBoard.BoardId)
113+
require.Equal(t, "mega", targetBoard.BoardID)
114114
require.Equal(t, "atmega1280", targetBoard.Properties["build.mcu"])
115115
require.Equal(t, "AVR_MEGA", targetBoard.Properties["build.board"])
116116
}
@@ -136,7 +136,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
136136
targetPlatform := ctx.TargetPlatform
137137
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
138138
targetBoard := ctx.TargetBoard
139-
require.Equal(t, "mega", targetBoard.BoardId)
139+
require.Equal(t, "mega", targetBoard.BoardID)
140140
require.Equal(t, "atmega2560", targetBoard.Properties["build.mcu"])
141141
require.Equal(t, "AVR_MEGA2560", targetBoard.Properties["build.board"])
142142
}
@@ -162,7 +162,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
162162
targetPlatform := ctx.TargetPlatform
163163
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
164164
targetBoard := ctx.TargetBoard
165-
require.Equal(t, "custom_yun", targetBoard.BoardId)
165+
require.Equal(t, "custom_yun", targetBoard.BoardID)
166166
require.Equal(t, "atmega32u4", targetBoard.Properties["build.mcu"])
167167
require.Equal(t, "AVR_YUN", targetBoard.Properties["build.board"])
168168
}
@@ -188,7 +188,7 @@ func TestTargetBoardResolverCustomCore(t *testing.T) {
188188
targetPlatform := ctx.TargetPlatform
189189
require.Equal(t, "avr", targetPlatform.Platform.Architecture)
190190
targetBoard := ctx.TargetBoard
191-
require.Equal(t, "attiny841", targetBoard.BoardId)
191+
require.Equal(t, "attiny841", targetBoard.BoardID)
192192
require.Equal(t, "tiny841", ctx.BuildCore)
193193
require.Equal(t, "tiny14", targetBoard.Properties["build.variant"])
194194
}

0 commit comments

Comments
 (0)