Moved YAML matcher, out of extensions into the core matchers dir
Signed-off-by: Jatin Naik <jnaik@pivotal.io>
diff --git a/matchers/extensions/yaml/matchers_suite_test.go b/matchers/extensions/yaml/matchers_suite_test.go
deleted file mode 100644
index 8e1226a..0000000
--- a/matchers/extensions/yaml/matchers_suite_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package yaml_test
-
-import (
- . "github.com/onsi/ginkgo"
- . "github.com/onsi/gomega"
-
- "testing"
-)
-
-func TestMatchers(t *testing.T) {
- RegisterFailHandler(Fail)
- RunSpecs(t, "YAML Matcher Suite")
-}
diff --git a/matchers/extensions/yaml/match_yaml_matcher.go b/matchers/match_yaml_matcher.go
similarity index 88%
rename from matchers/extensions/yaml/match_yaml_matcher.go
rename to matchers/match_yaml_matcher.go
index a10c558..f8d881a 100644
--- a/matchers/extensions/yaml/match_yaml_matcher.go
+++ b/matchers/match_yaml_matcher.go
@@ -1,4 +1,4 @@
-package yaml
+package matchers
import (
"fmt"
@@ -78,22 +78,3 @@
return actualString, expectedString, nil
}
-
-func toString(a interface{}) (string, bool) {
- aString, isString := a.(string)
- if isString {
- return aString, true
- }
-
- aBytes, isBytes := a.([]byte)
- if isBytes {
- return string(aBytes), true
- }
-
- aStringer, isStringer := a.(fmt.Stringer)
- if isStringer {
- return aStringer.String(), true
- }
-
- return "", false
-}
diff --git a/matchers/extensions/yaml/match_yaml_matcher_test.go b/matchers/match_yaml_matcher_test.go
similarity index 97%
rename from matchers/extensions/yaml/match_yaml_matcher_test.go
rename to matchers/match_yaml_matcher_test.go
index a378932..8e63de1 100644
--- a/matchers/extensions/yaml/match_yaml_matcher_test.go
+++ b/matchers/match_yaml_matcher_test.go
@@ -1,10 +1,10 @@
-package yaml_test
+package matchers_test
import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- . "github.com/onsi/gomega/matchers/extensions/yaml"
+ . "github.com/onsi/gomega/matchers"
)
var _ = Describe("MatchYAMLMatcher", func() {
