Skip to content

Provide object-level packages[].platforms[].toolsDependencies[] package index data to rules #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2021
Merged

Provide object-level packages[].platforms[].toolsDependencies[] package index data to rules #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9792b0
Use diverse tool dependencies package index test data
per1234 Jun 23, 2021
d2fc80e
Provide object-level packages[].platforms[].toolsDependencies[] packa…
per1234 Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions internal/project/projectdata/packageindex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func InitializeForPackageIndex() {
packageIndexPackages = nil
packageIndexPlatforms = nil
packageIndexBoards = nil
packageIndexToolsDependencies = nil
packageIndexTools = nil
packageIndexSystems = nil
packageIndexSchemaValidationResult = nil
Expand All @@ -57,6 +58,10 @@ func InitializeForPackageIndex() {
packageIndexBoards = append(packageIndexBoards, getPackageIndexData(platformData.Object, platformData.JSONPointer, "boards", platformData.ID, " - {{index . 0}}", []string{"name"})...)
}

for _, platformData := range PackageIndexPlatforms() {
packageIndexToolsDependencies = append(packageIndexToolsDependencies, getPackageIndexData(platformData.Object, platformData.JSONPointer, "toolsDependencies", platformData.ID, " - {{index . 0}}:{{index . 1}}@{{index . 2}}", []string{"packager", "name", "version"})...)
}

for _, packageData := range PackageIndexPackages() {
packageIndexTools = append(packageIndexTools, getPackageIndexData(packageData.Object, packageData.JSONPointer, "tools", packageData.ID, ":{{index . 0}}@{{index . 1}}", []string{"name", "version"})...)
}
Expand Down Expand Up @@ -111,6 +116,13 @@ func PackageIndexBoards() []PackageIndexData {
return packageIndexBoards
}

var packageIndexToolsDependencies []PackageIndexData

// PackageIndexToolsDependencies returns the slice of tool dependency data for the package index.
func PackageIndexToolsDependencies() []PackageIndexData {
return packageIndexToolsDependencies
}

var packageIndexTools []PackageIndexData

// PackageIndexTools returns the slice of tool data for the package index.
Expand Down
149 changes: 149 additions & 0 deletions internal/project/projectdata/packageindex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexPlatformsDataAssertion []PackageIndexData
packageIndexBoardsAssertion assert.ValueAssertionFunc
packageIndexBoardsDataAssertion []PackageIndexData
packageIndexToolsDependenciesAssertion assert.ValueAssertionFunc
packageIndexToolsDependenciesDataAssertion []PackageIndexData
packageIndexToolsAssertion assert.ValueAssertionFunc
packageIndexToolsDataAssertion []PackageIndexData
packageIndexSystemsAssertion assert.ValueAssertionFunc
Expand Down Expand Up @@ -124,6 +126,41 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/1/boards/1",
},
},
packageIndexToolsDependenciesAssertion: assert.NotNil,
packageIndexToolsDependenciesDataAssertion: []PackageIndexData{
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/0",
},
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/1",
},
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/0",
},
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/1",
},
{
ID: "foopackager2:[email protected] - arduino:arm-none-eabi-gcc@7-2017q4",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/0",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/1",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/0",
},
{
ID: "foopackager2:[email protected] - arduino:arm-none-eabi-gcc@7-2017q4",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/1",
},
},
packageIndexToolsAssertion: assert.NotNil,
packageIndexToolsDataAssertion: []PackageIndexData{
{
Expand Down Expand Up @@ -239,6 +276,57 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/boards/1",
},
},
packageIndexToolsDependenciesAssertion: assert.NotNil,
packageIndexToolsDependenciesDataAssertion: []PackageIndexData{
{
ID: "/packages/0/platforms/0/toolsDependencies/0",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/0",
},
{
ID: "/packages/0/platforms/0/toolsDependencies/1",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/1",
},
{
ID: "/packages/0/platforms/1/toolsDependencies/0",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/0",
},
{
ID: "/packages/0/platforms/1/toolsDependencies/1",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/0/toolsDependencies/0",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/0",
},
{
ID: "/packages/1/platforms/0/toolsDependencies/1",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/1/toolsDependencies/0",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/0",
},
{
ID: "/packages/1/platforms/1/toolsDependencies/1",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/2/toolsDependencies/0",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/0",
},
{
ID: "/packages/1/platforms/2/toolsDependencies/1",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/2/toolsDependencies/2",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/2",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/3",
},
},
packageIndexToolsAssertion: assert.NotNil,
packageIndexToolsDataAssertion: []PackageIndexData{
{
Expand Down Expand Up @@ -362,6 +450,57 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/boards/1",
},
},
packageIndexToolsDependenciesAssertion: assert.NotNil,
packageIndexToolsDependenciesDataAssertion: []PackageIndexData{
{
ID: "/packages/0/platforms/0/toolsDependencies/0",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/0",
},
{
ID: "/packages/0/platforms/0/toolsDependencies/1",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/1",
},
{
ID: "/packages/0/platforms/1/toolsDependencies/0",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/0",
},
{
ID: "/packages/0/platforms/1/toolsDependencies/1",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/0/toolsDependencies/0",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/0",
},
{
ID: "/packages/1/platforms/0/toolsDependencies/1",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/1/toolsDependencies/0",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/0",
},
{
ID: "/packages/1/platforms/1/toolsDependencies/1",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/2/toolsDependencies/0",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/0",
},
{
ID: "/packages/1/platforms/2/toolsDependencies/1",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/1",
},
{
ID: "/packages/1/platforms/2/toolsDependencies/2",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/2",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/3",
},
},
packageIndexToolsAssertion: assert.NotNil,
packageIndexToolsDataAssertion: []PackageIndexData{
{
Expand Down Expand Up @@ -411,6 +550,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexPackagesAssertion: assert.Nil,
packageIndexPlatformsAssertion: assert.Nil,
packageIndexBoardsAssertion: assert.Nil,
packageIndexToolsDependenciesAssertion: assert.Nil,
packageIndexToolsAssertion: assert.Nil,
packageIndexSystemsAssertion: assert.Nil,
packageIndexSchemaValidationResultAssertion: assert.Nil,
Expand All @@ -424,6 +564,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexPackagesAssertion: assert.Nil,
packageIndexPlatformsAssertion: assert.Nil,
packageIndexBoardsAssertion: assert.Nil,
packageIndexToolsDependenciesAssertion: assert.Nil,
packageIndexToolsAssertion: assert.Nil,
packageIndexSystemsAssertion: assert.Nil,
packageIndexSchemaValidationResultAssertion: assert.Nil,
Expand Down Expand Up @@ -469,6 +610,14 @@ func TestInitializeForPackageIndex(t *testing.T) {
}
}

testTable.packageIndexToolsDependenciesAssertion(t, PackageIndexToolsDependencies(), testTable.testName)
if PackageIndexToolsDependencies() != nil {
for index, packageIndexToolsDependency := range PackageIndexToolsDependencies() {
assert.Equal(t, testTable.packageIndexToolsDependenciesDataAssertion[index].ID, packageIndexToolsDependency.ID, testTable.testName)
assert.Equal(t, testTable.packageIndexToolsDependenciesDataAssertion[index].JSONPointer, packageIndexToolsDependency.JSONPointer, testTable.testName)
}
}

testTable.packageIndexToolsAssertion(t, PackageIndexTools(), testTable.testName)
if PackageIndexTools() != nil {
for index, packageIndexTool := range PackageIndexTools() {
Expand Down
34 changes: 22 additions & 12 deletions internal/project/projectdata/testdata/packageindexes/empty-ids/package_foo_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
"version": "7.3.0-atmel3.6.1-arduino7"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"version": "6.3.0-arduino17"
}
]
}
Expand Down Expand Up @@ -89,13 +89,13 @@
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
"name": "arm-none-eabi-gcc",
"version": "7-2017q4"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"name": "bossac",
"version": "1.7.0-arduino3"
}
]
},
Expand All @@ -115,13 +115,13 @@
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
"name": "openocd",
"version": "0.11.0-arduino2"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"name": "arm-none-eabi-gcc",
"version": "7-2017q4"
}
]
},
Expand All @@ -140,14 +140,24 @@
"boards": [{ "name": "" }, { "name": "My Board Pro" }],
"toolsDependencies": [
{
"packager": "arduino",
"packager": "",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
},
{
"packager": "arduino",
"name": "avrdude",
"name": "",
"version": "6.0.1-arduino5"
},
{
"packager": "arduino",
"name": "openocd",
"version": ""
},
{
"packager": "arduino",
"name": "CMSIS",
"version": "4.5.0"
}
]
}
Expand Down
31 changes: 19 additions & 12 deletions internal/project/projectdata/testdata/packageindexes/missing-ids/package_foo_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
"version": "7.3.0-atmel3.6.1-arduino7"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"version": "6.3.0-arduino17"
}
]
}
Expand Down Expand Up @@ -87,13 +87,13 @@
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
"name": "arm-none-eabi-gcc",
"version": "7-2017q4"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"name": "bossac",
"version": "1.7.0-arduino3"
}
]
},
Expand All @@ -112,13 +112,13 @@
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
"name": "openocd",
"version": "0.11.0-arduino2"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"name": "arm-none-eabi-gcc",
"version": "7-2017q4"
}
]
},
Expand All @@ -137,14 +137,21 @@
"boards": [{ "foo": "My Board" }, { "name": "My Board Pro" }],
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
},
{
"packager": "arduino",
"name": "openocd"
},
{
"packager": "arduino",
"name": "CMSIS",
"version": "4.5.0"
}
]
}
Expand Down
Loading