chore(refactor): cleaned up internal/install/discovery package; remov…

…ed unneeded receivers on RecipeInstall
newrelic · Nov 11, 2022 · 1d40669 · 1d40669
1 parent 14469af
commit 1d40669
Show file tree

Hide file tree

Showing 18 changed files with 592 additions and 476 deletions.
diff --git a/internal/install/discovery/manifest_validator_test.go b/internal/install/discovery/manifest_validator_test.go
@@ -4,49 +4,65 @@
 package discovery
 
 import (
+	"context"
 	"fmt"
+	"github.com/newrelic/newrelic-cli/internal/install/discovery/mocks"
+	"github.com/newrelic/newrelic-cli/internal/install/types"
+	"github.com/stretchr/testify/mock"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 func Test_ShouldSucceedManifestOsDarwin(t *testing.T) {
-	discover := NewMockDiscoverer()
-	discover.SetOs("darwin")
-	discover.SetPlatformVersion("10.14")
+	mockDiscoverer := mocks.NewDiscoverer(t)
+	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+		OS:              "darwin",
+		PlatformVersion: "10.14",
+	}, nil)
+	manifest, _ := mockDiscoverer.Discover(context.Background())
 
-	err := NewManifestValidator().Validate(discover.GetManifest())
+	err := NewManifestValidator().Validate(manifest)
 	require.NoError(t, err)
 }
 
 func Test_ShouldFailManifestOsDarwinOldVersion(t *testing.T) {
-	discover := NewMockDiscoverer()
-	discover.SetOs("darwin")
-	discover.SetPlatformVersion("10.13")
+	mockDiscoverer := mocks.NewDiscoverer(t)
+	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+		OS:              "darwin",
+		PlatformVersion: "10.13",
+	}, nil)
+	manifest, _ := mockDiscoverer.Discover(context.Background())
 
-	err := NewManifestValidator().Validate(discover.GetManifest())
+	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) {
-	discover := NewMockDiscoverer()
-	discover.SetOs("windows")
-	discover.SetPlatformVersion("1")
+	mockDiscoverer := mocks.NewDiscoverer(t)
+	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+		OS:              "windows",
+		PlatformVersion: "1",
+	}, nil)
+	manifest, _ := mockDiscoverer.Discover(context.Background())
 
-	result := NewManifestValidator().Validate(discover.GetManifest())
+	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) {
-	discover := NewMockDiscoverer()
-	discover.SetOs("linux")
-	discover.SetPlatform("ubuntu")
-	discover.SetPlatformVersion("12.04")
+	mockDiscoverer := mocks.NewDiscoverer(t)
+	mockDiscoverer.On("Discover", mock.Anything).Return(&types.DiscoveryManifest{
+		OS:              "linux",
+		Platform:        "ubuntu",
+		PlatformVersion: "10.14",
+	}, nil)
+	manifest, _ := mockDiscoverer.Discover(context.Background())
 
-	result := NewManifestValidator().Validate(discover.GetManifest())
+	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/mockProcesses/JavaDaemonTest$1.class b/internal/install/discovery/mockProcesses/JavaDaemonTest$1.class
diff --git a/internal/install/discovery/mockProcesses/JavaDaemonTest.class b/internal/install/discovery/mockProcesses/JavaDaemonTest.class
diff --git a/internal/install/discovery/mockProcesses/JavaDaemonTest.java b/internal/install/discovery/mockProcesses/JavaDaemonTest.java
diff --git a/internal/install/discovery/mock_discoverer.go b/internal/install/discovery/mock_discoverer.go
diff --git a/internal/install/discovery/mock_empty_discoverer.go b/internal/install/discovery/mock_empty_discoverer.go
diff --git a/internal/install/discovery/mock_os_validator.go b/internal/install/discovery/mock_os_validator.go
diff --git a/internal/install/discovery/mocks/Discoverer.go b/internal/install/discovery/mocks/Discoverer.go
diff --git a/internal/install/discovery/mocks/Validator.go b/internal/install/discovery/mocks/Validator.go