Rewrite unit tests in internal/kubebuilder/filesystem

operator-framework · Dec 4, 2020 · f1f5926 · f1f5926
1 parent 5a5c4fc
commit f1f5926
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 97 deletions.
diff --git a/go.sum b/go.sum
diff --git a/internal/kubebuilder/filesystem/errors_test.go b/internal/kubebuilder/filesystem/errors_test.go
@@ -19,18 +19,12 @@ package filesystem
 import (
 	"errors"
 	"path/filepath"
-	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 )
 
-func TestErrors(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Error suite")
-}
-
 var _ = Describe("Errors", func() {
 	var (
 		path               = filepath.Join("path", "to", "file")

diff --git a/internal/kubebuilder/filesystem/filesystem_suite_test.go b/internal/kubebuilder/filesystem/filesystem_suite_test.go
@@ -0,0 +1,27 @@
+/*
+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 filesystem
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestScaffold(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Filesystem Suite")
+}
diff --git a/internal/kubebuilder/filesystem/filesystem_test.go b/internal/kubebuilder/filesystem/filesystem_test.go
@@ -18,17 +18,11 @@ package filesystem
 
 import (
 	"os"
-	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-func TestFileSystem(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "FileSystem suite")
-}
-
 var _ = Describe("FileSystem", func() {
 	Describe("New", func() {
 		const (

diff --git a/internal/kubebuilder/filesystem/mock_test.go b/internal/kubebuilder/filesystem/mock_test.go
@@ -20,17 +20,11 @@ import (
 	"bytes"
 	"errors"
 	"path/filepath"
-	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-func TestMockFileSystem(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "MockFileSystem suite")
-}
-
 //nolint:dupl
 var _ = Describe("MockFileSystem", func() {
 	var (

diff --git a/internal/kubebuilder/machinery/machinery_suite_test.go b/internal/kubebuilder/machinery/machinery_suite_test.go
@@ -2,7 +2,9 @@
 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.