fix tests

Signed-off-by: Pravin Pushkar <[email protected]>

Author: pravinpushkar

pkg/standalone/common.go

@@ -68,11 +68,11 @@ func DefaultConfigFilePath() string {
 	return path_filepath.Join(defaultDaprDirPath(), defaultConfigFileName)
 }
 
-// emptyAndCopyFiles copies files from src to dest. It deletes the existing files in dest before copying from src.
+// copyFilesAndCreateSymlink copies files from src to dest. It deletes the existing files in dest before copying from src.
 // this method also deletes the components dir and makes it as a symlink to resources directory.
 // please see this comment for more details:https://github.com/dapr/cli/pull/1149#issuecomment-1364424345
 // TODO: Remove this function when `--components-path` flag is removed.
-func emptyAndCopyFiles(src, dest string) error {
+func copyFilesAndCreateSymlink(src, dest string) error {
 	if _, err := os.Stat(src); err != nil {
 		// if the src directory does not exist, create symlink and return nil, because there is nothing to copy from.
 		if os.IsNotExist(err) {

pkg/standalone/common_test.go

@@ -0,0 +1,119 @@
+/*
+Copyright 2022 The Dapr 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 standalone
+
+import (
+	"os"
+	path_filepath "path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateSymLink(t *testing.T) {
+	// create a temp dir to hold the symlink and actual directory.
+	tempDir := createTempDir(t, "dapr-test", "")
+	defer cleanupTempDir(t, tempDir)
+	rsrcDir := createTempDir(t, "resources", tempDir)
+	existingSymLinkDir := createTempDir(t, "components_exist", tempDir)
+	tests := []struct {
+		name          string
+		actualDirName string
+		symLinkName   string
+		expectedError bool
+	}{
+		{
+			name:          "create symlink for resources directory",
+			actualDirName: rsrcDir,
+			symLinkName:   path_filepath.Join(tempDir, "components"),
+			expectedError: false,
+		},
+		{
+			name:          "create symlink when resources directory does not exist",
+			actualDirName: "invalid-dir",
+			symLinkName:   "components",
+			expectedError: true,
+		},
+		{
+			name:          "create symlink when symlink named directory already exists",
+			actualDirName: rsrcDir,
+			symLinkName:   existingSymLinkDir,
+			expectedError: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := createSymLink(tt.actualDirName, tt.symLinkName)
+			assert.Equal(t, tt.expectedError, err != nil)
+		})
+	}
+}
+
+func TestCopyFilesAndCreateSymlink(t *testing.T) {
+	// create a temp dir to hold the symlink and actual directory.
+	tempDir := createTempDir(t, "dapr-test", "")
+	defer cleanupTempDir(t, tempDir)
+	rsrcDir := createTempDir(t, "resources", tempDir)
+	cmptDir := createTempDir(t, "components", tempDir)
+	cmptFile := createTempFile(t, cmptDir, "pubsub.yaml")
+	rsrcFile := createTempFile(t, cmptDir, "pubsub-rsrc.yaml")
+	tests := []struct {
+		name            string
+		actualDirName   string
+		symLinkName     string
+		expectedError   bool
+		presentFileName string
+	}{
+		{
+			name:            "copy files and create symlink for resources directory when components dir exists",
+			actualDirName:   rsrcDir,
+			symLinkName:     cmptDir,
+			expectedError:   false,
+			presentFileName: cmptFile,
+		},
+		{
+			name:            "copy files and create symlink for resources directory when components dir does not exists",
+			actualDirName:   rsrcDir,
+			symLinkName:     path_filepath.Join(tempDir, "components-not-exist"),
+			expectedError:   false,
+			presentFileName: rsrcFile,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := copyFilesAndCreateSymlink(tt.symLinkName, tt.actualDirName)
+			assert.Equal(t, tt.expectedError, err != nil)
+			// check if the files are copied.
+			assert.FileExists(t, path_filepath.Join(tt.symLinkName, path_filepath.Base(tt.presentFileName)))
+		})
+	}
+}
+
+func createTempDir(t *testing.T, tempDirName, containerDir string) string {
+	dirName, err := os.MkdirTemp(containerDir, tempDirName)
+	assert.NoError(t, err)
+	return dirName
+}
+
+func createTempFile(t *testing.T, tempDirName, fileName string) string {
+	file, err := os.CreateTemp(tempDirName, fileName)
+	assert.NoError(t, err)
+	defer file.Close()
+	return file.Name()
+}
+
+func cleanupTempDir(t *testing.T, dirName string) {
+	err := os.RemoveAll(dirName)
+	assert.NoError(t, err)
+}

pkg/standalone/standalone.go

@@ -309,7 +309,7 @@ func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMod
 		print.InfoStatusEvent(os.Stdout, "Use `%s ps` to check running containers.", runtimeCmd)
 	}
 	// TODO: remove below method when usages of components-path flag and components directory removed completely.
-	err = emptyAndCopyFiles(DefaultComponentsDirPath(), DefaultResourcesDirPath())
+	err = copyFilesAndCreateSymlink(DefaultComponentsDirPath(), DefaultResourcesDirPath())
 	if err != nil {
 		return err
 	}

tests/e2e/standalone/upgrade_test.go

@@ -19,13 +19,10 @@ limitations under the License.
 package standalone_test
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"github.com/dapr/cli/tests/e2e/common"
-	"github.com/dapr/cli/tests/e2e/spawn"
 	"github.com/dapr/cli/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -46,28 +43,23 @@ func TestCompToResrcDirMig(t *testing.T) {
 	// Ensure a clean environment.
 	must(t, cmdUninstall, "failed to uninstall Dapr")
 
-	// install dapr.
+	// install dapr -> installs dapr, creates resources dir and symlink components dir.
 	ensureDaprInstallation(t)
 
-	// rename resources to components dir.
-	renameResourcesDir(t)
-
-	// dapr run should work with only components dir.
-	// 2nd parameter is true to indicate that only components dir is present.
-	checkDaprRunPrecedenceTest(t, true)
-
-	// dapr uninstall without --all flag should work.
-	uninstallWithoutAllFlag(t)
-
-	// dapr init should duplicate files from components dir to resources dir.
-	initTest(t)
+	// check dapr run -> should not load in-memory component.
+	checkDaprRunPrecedenceTest(t, false)
 
 	// copy a in memomy state store component to resources dir.
 	copyInMemStateStore(t)
 
-	// check dapr run precedence order, resources dir 1st then components dir.
-	// 2nd parameter is false to indicate that both components and resources dir are present.
-	checkDaprRunPrecedenceTest(t, false)
+	// check dapr run -> should load in-memory component.
+	checkDaprRunPrecedenceTest(t, true)
+
+	// dapr run with --components-path flag -> should load in-memory component.
+	checkDaprRunPrecedenceTest(t, true, "--components-path", defaultComponentsDirPath)
+
+	// dapr run with --resources-path flag -> should load in-memory component.
+	checkDaprRunPrecedenceTest(t, true, "--resources-path", defaultResourcesDirPath)
 }
 
 func copyInMemStateStore(t *testing.T) {
@@ -78,59 +70,20 @@ func copyInMemStateStore(t *testing.T) {
 	assert.NoError(t, err, "cannot write testdata/resources/test-statestore.yaml file to resources directory")
 }
 
-func initTest(t *testing.T) {
-	daprRuntimeVersion, _ := common.GetVersionsFromEnv(t, false)
-
-	output, err := cmdInit(daprRuntimeVersion)
-	t.Log(output)
-	require.NoError(t, err, "init failed")
-	assert.Contains(t, output, "Success! Dapr is up and running.")
-
-	homeDir, err := os.UserHomeDir()
-	require.NoError(t, err, "failed to get user home directory")
-
-	daprPath := filepath.Join(homeDir, ".dapr")
-	require.DirExists(t, daprPath, "Directory %s does not exist", daprPath)
-	require.DirExists(t, defaultComponentsDirPath, "Components dir does not exist")
-	require.DirExists(t, defaultResourcesDirPath, "Resources dir does not exist")
-}
-
-func checkDaprRunPrecedenceTest(t *testing.T, onlyCompDirPresent bool) {
+func checkDaprRunPrecedenceTest(t *testing.T, inMemoryCompPresent bool, flags ...string) {
 	args := []string{
 		"--app-id", "testapp",
 		"--", "bash", "-c", "echo 'test'",
 	}
+	args = append(args, flags...)
 	output, err := cmdRun("", args...)
 	t.Log(output)
 	require.NoError(t, err, "run failed")
-	if onlyCompDirPresent {
-		assert.NotContains(t, output, "component loaded. name: test-statestore, type: state.in-memory/v1")
-	} else {
+	if inMemoryCompPresent {
 		assert.Contains(t, output, "component loaded. name: test-statestore, type: state.in-memory/v1")
+	} else {
+		assert.NotContains(t, output, "component loaded. name: test-statestore, type: state.in-memory/v1")
 	}
 	assert.Contains(t, output, "Exited App successfully")
 	assert.Contains(t, output, "Exited Dapr successfully")
 }
-
-func uninstallWithoutAllFlag(t *testing.T) {
-	uninstallArgs := []string{"uninstall"}
-	daprContainerRuntime := containerRuntime()
-
-	// Add --container-runtime flag only if daprContainerRuntime is not empty, or overridden via args.
-	// This is only valid for non-slim mode.
-	if !isSlimMode() && daprContainerRuntime != "" {
-		uninstallArgs = append(uninstallArgs, "--container-runtime", daprContainerRuntime)
-	}
-	_, error := spawn.Command(common.GetDaprPath(), uninstallArgs...)
-	if error != nil {
-		assert.NoError(t, error, "failed to uninstall Dapr")
-	}
-}
-
-func renameResourcesDir(t *testing.T) {
-	err := os.Rename(defaultResourcesDirPath, defaultComponentsDirPath)
-	if err != nil {
-		mesg := fmt.Sprintf("pre-req to TestCompToResrcDirMig failed. error renaming components dir to resources dir: %s", err)
-		assert.NoError(t, err, mesg)
-	}
-}