Skip to content

Commit

Permalink
fix and split tests
Browse files Browse the repository at this point in the history
  • Loading branch information
qwerty287 committed Feb 18, 2024
1 parent ef93b8f commit 50ad97f
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 121 deletions.
121 changes: 0 additions & 121 deletions pipeline/frontend/yaml/types/base/base_types_test.go

This file was deleted.

44 changes: 44 additions & 0 deletions pipeline/frontend/yaml/types/base/int_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Copyright 2024 Woodpecker Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package base

import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
)

type StructStringOrInt struct {
Foo StringOrInt
}

func TestStringOrIntYaml(t *testing.T) {
for _, str := range []string{`{foo: 10}`, `{foo: "10"}`} {
s := StructStringOrInt{}
assert.NoError(t, yaml.Unmarshal([]byte(str), &s))

assert.Equal(t, StringOrInt(10), s.Foo)

d, err := yaml.Marshal(&s)
assert.NoError(t, err)

s2 := StructStringOrInt{}
assert.NoError(t, yaml.Unmarshal(d, &s2))

assert.Equal(t, StringOrInt(10), s2.Foo)
}
}

58 changes: 58 additions & 0 deletions pipeline/frontend/yaml/types/base/map_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Copyright 2024 Woodpecker Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package base

import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
)

type StructSliceOrMap struct {
Foos SliceOrMap `yaml:"foos,omitempty"`
Bars []string `yaml:"bars"`
}

func TestSliceOrMapYaml(t *testing.T) {
str := `{foos: [bar=baz, far=faz]}`

s := StructSliceOrMap{}
assert.NoError(t, yaml.Unmarshal([]byte(str), &s))

assert.Equal(t, SliceOrMap{"bar": "baz", "far": "faz"}, s.Foos)

d, err := yaml.Marshal(&s)
assert.NoError(t, err)

s2 := StructSliceOrMap{}
assert.NoError(t, yaml.Unmarshal(d, &s2))

assert.Equal(t, SliceOrMap{"bar": "baz", "far": "faz"}, s2.Foos)
}

func TestStr2SliceOrMapPtrMap(t *testing.T) {
s := map[string]*StructSliceOrMap{"udav": {
Foos: SliceOrMap{"io.rancher.os.bar": "baz", "io.rancher.os.far": "true"},
Bars: []string{},
}}
d, err := yaml.Marshal(&s)
assert.NoError(t, err)

s2 := map[string]*StructSliceOrMap{}
assert.NoError(t, yaml.Unmarshal(d, &s2))

assert.Equal(t, s, s2)
}
50 changes: 50 additions & 0 deletions pipeline/frontend/yaml/types/base/slice_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// Copyright 2024 Woodpecker Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package base

import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
)

type StructStringOrSlice struct {
Foo StringOrSlice
}

func TestStringOrSliceYaml(t *testing.T) {
str := `{foo: [bar, "baz"]}`
s := StructStringOrSlice{}
assert.NoError(t, yaml.Unmarshal([]byte(str), &s))
assert.Equal(t, StringOrSlice{"bar", "baz"}, s.Foo)

d, err := yaml.Marshal(&s)
assert.NoError(t, err)

s = StructStringOrSlice{}
assert.NoError(t, yaml.Unmarshal(d, &s))
assert.Equal(t, StringOrSlice{"bar", "baz"}, s.Foo)

str = `{foo: []}`
s = StructStringOrSlice{}
assert.NoError(t, yaml.Unmarshal([]byte(str), &s))
assert.Equal(t, StringOrSlice{}, s.Foo)

str = `{}`
s = StructStringOrSlice{}
assert.NoError(t, yaml.Unmarshal([]byte(str), &s))
assert.Nil(t, s.Foo)
}

0 comments on commit 50ad97f

Please sign in to comment.