suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-11 01:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "altering encoder and decoder tests somewhat"

Browse Source 
This reverts commit e3655130e2.
This commit is contained in:
Daniel Carbone 2022-06-23 22:09:31 -05:00
parent 23be0b004d
commit a9d1b1ab85
No known key found for this signature in database
GPG Key ID: 348D611030B4EACB
3 changed files with 34 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/decoder_test.go
View File

@ -15,8 +15,6 @@ type formatScenario struct {
subdescription string subdescription string
skipDoc bool skipDoc bool
scenarioType string scenarioType string
decoder Decoder
encoder Encoder
} }
func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) string { func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) string {

57
pkg/yqlib/doc/usage/properties.md
View File

@ -17,7 +17,7 @@ Given a sample.yml file of:
```yaml ```yaml
# block comments don't come through # block comments don't come through
person: # neither do comments on maps person: # neither do comments on maps
name: Mike Wazowski # comments on values appear name: Mike # comments on values appear
pets: pets:
- cat # comments on array values appear - cat # comments on array values appear
food: [pizza] # comments on arrays do not food: [pizza] # comments on arrays do not
@ -32,36 +32,7 @@ yq -o=props sample.yml
will output will output
```properties ```properties
# comments on values appear # comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear
person.pets.0 = cat
person.food.0 = pizza
```
## Encode properties: scalar encapsulation
Note that string values with blank characters in them are encapsulated with double quotes
Given a sample.yml file of:
```yaml
# block comments don't come through
person: # neither do comments on maps
name: Mike Wazowski # comments on values appear
pets:
- cat # comments on array values appear
food: [pizza] # comments on arrays do not
emptyArray: []
emptyMap: []
```
then
```bash
yq -o=props sample.yml
```
will output
```properties
# comments on values appear
person.name = "Mike Wazowski"
# comments on array values appear # comments on array values appear
person.pets.0 = cat person.pets.0 = cat
@ -73,7 +44,7 @@ Given a sample.yml file of:
```yaml ```yaml
# block comments don't come through # block comments don't come through
person: # neither do comments on maps person: # neither do comments on maps
name: Mike Wazowski # comments on values appear name: Mike # comments on values appear
pets: pets:
- cat # comments on array values appear - cat # comments on array values appear
food: [pizza] # comments on arrays do not food: [pizza] # comments on arrays do not
@ -87,7 +58,7 @@ yq -o=props '... comments = ""' sample.yml
``` ```
will output will output
```properties ```properties
person.name = Mike Wazowski person.name = Mike
person.pets.0 = cat person.pets.0 = cat
person.food.0 = pizza person.food.0 = pizza
``` ```
@ -99,7 +70,7 @@ Given a sample.yml file of:
```yaml ```yaml
# block comments don't come through # block comments don't come through
person: # neither do comments on maps person: # neither do comments on maps
name: Mike Wazowski # comments on values appear name: Mike # comments on values appear
pets: pets:
- cat # comments on array values appear - cat # comments on array values appear
food: [pizza] # comments on arrays do not food: [pizza] # comments on arrays do not
@ -114,7 +85,7 @@ yq -o=props '(.. | select( (tag == "!!map" or tag =="!!seq") and length == 0)) =
will output will output
```properties ```properties
# comments on values appear # comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear # comments on array values appear
person.pets.0 = cat person.pets.0 = cat
@ -127,7 +98,7 @@ emptyMap =
Given a sample.properties file of: Given a sample.properties file of:
```properties ```properties
# comments on values appear # comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear # comments on array values appear
person.pets.0 = cat person.pets.0 = cat
@ -141,18 +112,18 @@ yq -p=props sample.properties
will output will output
```yaml ```yaml
person: person:
name: Mike Wazowski # comments on values appear name: Mike # comments on values appear
pets: pets:
- cat # comments on array values appear - cat # comments on array values appear
food: food:
- pizza - pizza
``` ```
## Roundtrip ## Roundtrip
Given a sample.properties file of: Given a sample.properties file of:
```properties ```properties
# comments on values appear # comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear # comments on array values appear
person.pets.0 = cat person.pets.0 = cat
@ -166,7 +137,7 @@ yq -p=props -o=props '.person.pets.0 = "dog"' sample.properties
will output will output
```properties ```properties
# comments on values appear # comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear # comments on array values appear
person.pets.0 = dog person.pets.0 = dog

70
pkg/yqlib/properties_test.go
View File

@ -8,9 +8,9 @@ import (
"github.com/mikefarah/yq/v4/test" "github.com/mikefarah/yq/v4/test"
) )
const samplePropertiesYaml = `# block comments don't come through var samplePropertiesYaml = `# block comments don't come through
person: # neither do comments on maps person: # neither do comments on maps
name: Mike Wazowski # comments on values appear name: Mike # comments on values appear
pets: pets:
- cat # comments on array values appear - cat # comments on array values appear
food: [pizza] # comments on arrays do not food: [pizza] # comments on arrays do not
@ -18,45 +18,37 @@ emptyArray: []
emptyMap: [] emptyMap: []
` `
const expectedPropertiesUnwrapped = `# comments on values appear var expectedProperties = `# comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear # comments on array values appear
person.pets.0 = cat person.pets.0 = cat
person.food.0 = pizza person.food.0 = pizza
` `
const expectedPropertiesWrapped = `# comments on values appear var expectedUpdatedProperties = `# comments on values appear
person.name = "Mike Wazowski" person.name = Mike
# comments on array values appear
person.pets.0 = cat
person.food.0 = pizza
`
const expectedUpdatedProperties = `# comments on values appear
person.name = Mike Wazowski
# comments on array values appear # comments on array values appear
person.pets.0 = dog person.pets.0 = dog
person.food.0 = pizza person.food.0 = pizza
` `
const expectedDecodedYaml = `person: var expectedDecodedYaml = `person:
name: Mike Wazowski # comments on values appear name: Mike # comments on values appear
pets: pets:
- cat # comments on array values appear - cat # comments on array values appear
food: food:
- pizza - pizza
` `
const expectedPropertiesNoComments = `person.name = Mike Wazowski var expectedPropertiesNoComments = `person.name = Mike
person.pets.0 = cat person.pets.0 = cat
person.food.0 = pizza person.food.0 = pizza
` `
const expectedPropertiesWithEmptyMapsAndArrays = `# comments on values appear var expectedPropertiesWithEmptyMapsAndArrays = `# comments on values appear
person.name = Mike Wazowski person.name = Mike
# comments on array values appear # comments on array values appear
person.pets.0 = cat person.pets.0 = cat
@ -70,25 +62,13 @@ var propertyScenarios = []formatScenario{
description: "Encode properties", description: "Encode properties",
subdescription: "Note that empty arrays and maps are not encoded by default.", subdescription: "Note that empty arrays and maps are not encoded by default.",
input: samplePropertiesYaml, input: samplePropertiesYaml,
expected: expectedPropertiesUnwrapped, expected: expectedProperties,
encoder: NewPropertiesEncoder(true),
decoder: NewYamlDecoder(),
},
{
description: "Encode properties: scalar encapsulation",
subdescription: "Note that string values with blank characters in them are encapsulated with double quotes",
input: samplePropertiesYaml,
expected: expectedPropertiesWrapped,
decoder: NewYamlDecoder(),
encoder: NewPropertiesEncoder(false),
}, },
{ {
description: "Encode properties: no comments", description: "Encode properties: no comments",
input: samplePropertiesYaml, input: samplePropertiesYaml,
expected: expectedPropertiesNoComments, expected: expectedPropertiesNoComments,
expression: `... comments = ""`, expression: `... comments = ""`,
decoder: NewYamlDecoder(),
encoder: NewPropertiesEncoder(true),
}, },
{ {
description: "Encode properties: include empty maps and arrays", description: "Encode properties: include empty maps and arrays",
@ -96,16 +76,12 @@ var propertyScenarios = []formatScenario{
expression: `(.. | select( (tag == "!!map" or tag =="!!seq") and length == 0)) = ""`, expression: `(.. | select( (tag == "!!map" or tag =="!!seq") and length == 0)) = ""`,
input: samplePropertiesYaml, input: samplePropertiesYaml,
expected: expectedPropertiesWithEmptyMapsAndArrays, expected: expectedPropertiesWithEmptyMapsAndArrays,
decoder: NewYamlDecoder(),
encoder: NewPropertiesEncoder(true),
}, },
{ {
description: "Decode properties", description: "Decode properties",
input: expectedPropertiesUnwrapped, input: expectedProperties,
expected: expectedDecodedYaml, expected: expectedDecodedYaml,
scenarioType: "decode", scenarioType: "decode",
decoder: NewPropertiesDecoder(),
encoder: NewYamlEncoder(2, false, true, true),
}, },
{ {
description: "does not expand automatically", description: "does not expand automatically",
@ -113,17 +89,13 @@ var propertyScenarios = []formatScenario{
input: "mike = ${dontExpand} this", input: "mike = ${dontExpand} this",
expected: "mike: ${dontExpand} this\n", expected: "mike: ${dontExpand} this\n",
scenarioType: "decode", scenarioType: "decode",
decoder: NewPropertiesDecoder(),
encoder: NewYamlEncoder(2, false, true, true),
}, },
{ {
description: "Roundtrip", description: "Roundtrip",
input: expectedPropertiesUnwrapped, input: expectedProperties,
expression: `.person.pets.0 = "dog"`, expression: `.person.pets.0 = "dog"`,
expected: expectedUpdatedProperties, expected: expectedUpdatedProperties,
scenarioType: "roundtrip", scenarioType: "roundtrip",
decoder: NewPropertiesDecoder(),
encoder: NewPropertiesEncoder(true),
}, },
{ {
description: "Empty doc", description: "Empty doc",
@ -131,8 +103,6 @@ var propertyScenarios = []formatScenario{
input: "", input: "",
expected: "", expected: "",
scenarioType: "decode", scenarioType: "decode",
decoder: NewPropertiesDecoder(),
encoder: NewYamlEncoder(2, false, true, true),
}, },
} }
@ -158,7 +128,7 @@ func documentEncodePropertyScenario(w *bufio.Writer, s formatScenario) {
} }
writeOrPanic(w, "will output\n") writeOrPanic(w, "will output\n")
writeOrPanic(w, fmt.Sprintf("```properties\n%v```\n\n", processFormatScenario(s, s.decoder, s.encoder))) writeOrPanic(w, fmt.Sprintf("```properties\n%v```\n\n", processFormatScenario(s, NewYamlDecoder(), NewPropertiesEncoder(true))))
} }
func documentDecodePropertyScenario(w *bufio.Writer, s formatScenario) { func documentDecodePropertyScenario(w *bufio.Writer, s formatScenario) {
@ -183,7 +153,7 @@ func documentDecodePropertyScenario(w *bufio.Writer, s formatScenario) {
writeOrPanic(w, "will output\n") writeOrPanic(w, "will output\n")
writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", processFormatScenario(s, s.decoder, s.encoder))) writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", processFormatScenario(s, NewPropertiesDecoder(), NewYamlEncoder(s.indent, false, true, true))))
} }
func documentRoundTripPropertyScenario(w *bufio.Writer, s formatScenario) { func documentRoundTripPropertyScenario(w *bufio.Writer, s formatScenario) {
@ -208,7 +178,7 @@ func documentRoundTripPropertyScenario(w *bufio.Writer, s formatScenario) {
writeOrPanic(w, "will output\n") writeOrPanic(w, "will output\n")
writeOrPanic(w, fmt.Sprintf("```properties\n%v```\n\n", processFormatScenario(s, s.decoder, s.encoder))) writeOrPanic(w, fmt.Sprintf("```properties\n%v```\n\n", processFormatScenario(s, NewPropertiesDecoder(), NewPropertiesEncoder(true))))
} }
func documentPropertyScenario(t *testing.T, w *bufio.Writer, i interface{}) { func documentPropertyScenario(t *testing.T, w *bufio.Writer, i interface{}) {
@ -229,11 +199,11 @@ func documentPropertyScenario(t *testing.T, w *bufio.Writer, i interface{}) {
func TestPropertyScenarios(t *testing.T) { func TestPropertyScenarios(t *testing.T) {
for _, s := range propertyScenarios { for _, s := range propertyScenarios {
if s.scenarioType == "decode" { if s.scenarioType == "decode" {
test.AssertResultWithContext(t, s.expected, processFormatScenario(s, s.decoder, s.encoder), s.description) test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewPropertiesDecoder(), NewYamlEncoder(2, false, true, true)), s.description)
} else if s.scenarioType == "roundtrip" { } else if s.scenarioType == "roundtrip" {
test.AssertResultWithContext(t, s.expected, processFormatScenario(s, s.decoder, s.encoder), s.description) test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewPropertiesDecoder(), NewPropertiesEncoder(true)), s.description)
} else { } else {
test.AssertResultWithContext(t, s.expected, processFormatScenario(s, s.decoder, s.encoder), s.description) test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewYamlDecoder(), NewPropertiesEncoder(true)), s.description)
} }
} }
genericScenarios := make([]interface{}, len(propertyScenarios)) genericScenarios := make([]interface{}, len(propertyScenarios))