chore(refactor): testing around license key fetching

newrelic · Nov 15, 2022 · acf6b98 · acf6b98
1 parent 5014f42
commit acf6b98
Show file tree

Hide file tree

Showing 10 changed files with 189 additions and 201 deletions.
diff --git a/internal/install/discovery/manifest_validator_test.go b/internal/install/discovery/manifest_validator_test.go
@@ -4,68 +4,59 @@
 package discovery
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
-	"github.com/newrelic/newrelic-cli/internal/install/discovery/mocks"
-
-	"github.com/stretchr/testify/mock"
-
 	"github.com/newrelic/newrelic-cli/internal/install/types"
 
 	"github.com/stretchr/testify/require"
 )
 
 func Test_ShouldSucceedManifestOsDarwin(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS:              "darwin",
 		PlatformVersion: "10.14",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	err := NewManifestValidator().Validate(manifest)
+
 	require.NoError(t, err)
 }
 
 func Test_ShouldFailManifestOsDarwinOldVersion(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS:              "darwin",
 		PlatformVersion: "10.13",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	err := NewManifestValidator().Validate(manifest)
+
 	require.Error(t, err)
 	require.Contains(t, err.Error(), errorPrefix)
 	require.Contains(t, err.Error(), "darwin")
 }
 
 func Test_ShouldFailManifestWindowsVersion(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS:              "windows",
 		PlatformVersion: "1",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	result := NewManifestValidator().Validate(manifest)
+
 	require.Contains(t, result.Error(), errorPrefix)
 	require.Contains(t, result.Error(), fmt.Sprintf(versionNoLongerSupported, "windows"))
 }
 
 func Test_ShouldFailManifestUbuntuVersion(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS:              "linux",
 		Platform:        "ubuntu",
 		PlatformVersion: "10.14",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	result := NewManifestValidator().Validate(manifest)
+
 	require.Contains(t, result.Error(), errorPrefix)
 	require.Contains(t, result.Error(), fmt.Sprintf(versionNoLongerSupported, "linux/ubuntu"))
 }
diff --git a/internal/install/discovery/os_validator_test.go b/internal/install/discovery/os_validator_test.go
@@ -4,59 +4,47 @@
 package discovery
 
 import (
-	"context"
 	"testing"
 
-	"github.com/newrelic/newrelic-cli/internal/install/discovery/mocks"
-
-	"github.com/stretchr/testify/mock"
-
 	"github.com/newrelic/newrelic-cli/internal/install/types"
 
 	"github.com/stretchr/testify/require"
 )
 
 func Test_FailsOnInvalidOs(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS: "freebsd",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	err := NewOsValidator().Validate(manifest)
+
 	require.Error(t, err)
 	require.Contains(t, err.Error(), operatingSystemNotSupportedPrefix)
 	require.Contains(t, err.Error(), "freebsd")
 }
 
 func Test_FailsOnNoOs(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS: "",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	result := NewOsValidator().Validate(manifest)
 	require.Equal(t, noOperatingSystemDetected, result.Error())
 }
 
 func Test_DoesntFailForWindowsOs(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS: "windows",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	result := NewOsValidator().Validate(manifest)
 	require.NoError(t, result)
 }
 
 func Test_DoesntFailForLinuxOs(t *testing.T) {
-	mockDiscoverer := mocks.NewDiscoverer(t)
-	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+	manifest := &types.DiscoveryManifest{
 		OS: "linux",
-	}, nil)
-	manifest, _ := mockDiscoverer.Discover(context.Background())
+	}
 
 	result := NewOsValidator().Validate(manifest)
 	require.NoError(t, result)