Commit 50a7c88

committed

Generate a correct yaml when properties are empty

1 parent 8a49960 commit 50a7c88Copy full SHA for 50a7c88

File tree

3 files changed

-5

lines changed

commands
- service_profile_init.go
internal
- arduino/sketch
  - profiles.go
- integrationtest/profiles
  - profiles_test.go

3 files changed

-5

lines changed

`‎commands/service_profile_init.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (s arduinoCoreServerImpl) InitProfile(ctx context.Context, req rpc.InitPr`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`if !projectFilePath.Exist() {`
`49`		`- err := projectFilePath.WriteFile([]byte("profiles:\n"))`
	`49`	`+ err := projectFilePath.WriteFile([]byte("profiles: {}\n"))`
`50`	`50`	`if err != nil {`
`51`	`51`	`return nil, err`
`52`	`52`	`}`

`‎internal/arduino/sketch/profiles.go‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,9 @@ type ProfileRequiredPlatforms []*ProfilePlatformReference`
`195`	`195`
`196`	`196`	`// AsYaml outputs the required platforms as Yaml`
`197`	`197`	`func (p *ProfileRequiredPlatforms) AsYaml() string {`
	`198`	`+ if len(*p) == 0 {`
	`199`	`+ return " platforms: []\n"`
	`200`	`+ }`
`198`	`201`	`res := " platforms:\n"`
`199`	`202`	`for _, platform := range *p {`
`200`	`203`	`res += platform.AsYaml()`
`@@ -223,7 +226,7 @@ type ProfileRequiredLibraries []*ProfileLibraryReference`
`223`	`226`	`// AsYaml outputs the required libraries as Yaml`
`224`	`227`	`func (p *ProfileRequiredLibraries) AsYaml() string {`
`225`	`228`	`if len(*p) == 0 {`
`226`		`- return ""`
	`229`	`+ return " libraries: []\n"`
`227`	`230`	`}`
`228`	`231`	`res := " libraries:\n"`
`229`	`232`	`for _, lib := range *p {`

`‎internal/integrationtest/profiles/profiles_test.go‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func initNoProfile(t testing.T, env integrationtest.Environment, cli *integrat`
`184`	`184`	`require.FileExists(t, projectFile.String())`
`185`	`185`	`fileContent, err := projectFile.ReadFile()`
`186`	`186`	`require.NoError(t, err)`
`187`		`- require.Equal(t, "profiles:\n", string(fileContent))`
	`187`	`+ require.Equal(t, "profiles: {}\n", string(fileContent))`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`func initWithCorrectFqbn(t testing.T, env integrationtest.Environment, cli *integrationtest.ArduinoCLI) {`
`@@ -195,7 +195,7 @@ func initWithCorrectFqbn(t testing.T, env integrationtest.Environment, cli *in`
`195`	`195`	`require.FileExists(t, projectFile.String())`
`196`	`196`	`fileContent, err := projectFile.ReadFile()`
`197`	`197`	`require.NoError(t, err)`
`198`		`- require.Equal(t, "profiles:\n Uno:\n fqbn: arduino:avr:uno\n platforms:\n - platform: arduino:avr (1.8.6)\n libraries:\n\ndefault_profile: Uno\n", string(fileContent))`
	`198`	`+ require.Equal(t, "profiles:\n Uno:\n fqbn: arduino:avr:uno\n platforms:\n - platform: arduino:avr (1.8.6)\n libraries: []\n\ndefault_profile: Uno\n", string(fileContent))`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`func initWithWrongFqbn(t testing.T, env integrationtest.Environment, cli *integrationtest.ArduinoCLI) {`
`@@ -315,7 +315,7 @@ func removeLibFromDefaultProfile(t testing.T, env integrationtest.Environment,`
`315`	`315`	`require.NoError(t, err)`
`316`	`316`	`fileContent, err := cli.SketchbookDir().Join("Simple", "sketch.yaml").ReadFile()`
`317`	`317`	`require.NoError(t, err)`
`318`		`- require.Equal(t, "profiles:\n Uno:\n fqbn: arduino:avr:uno\n platforms:\n - platform: arduino:avr (1.8.6)\n libraries:\n\ndefault_profile: Uno\n", string(fileContent))`
	`318`	`+ require.Equal(t, "profiles:\n Uno:\n fqbn: arduino:avr:uno\n platforms:\n - platform: arduino:avr (1.8.6)\n libraries: []\n\ndefault_profile: Uno\n", string(fileContent))`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`func addInexistentLibToDefaultProfile(t testing.T, env integrationtest.Environment, cli *integrationtest.ArduinoCLI) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 50a7c88

File tree

3 files changed

3 files changed

`‎commands/service_profile_init.go‎`

`‎internal/arduino/sketch/profiles.go‎`

`‎internal/integrationtest/profiles/profiles_test.go‎`

0 commit comments