add args test to datasetIngestor

cmd/commands/args_test.go

@@ -0,0 +1,67 @@
+package cmd
+
+import (
+	"testing"
+
+	"github.com/paulscherrerinstitute/scicat/datasetUtils"
+)
+
+func TestArgs(t *testing.T) {
+	// test cases
+	tests := []struct {
+		name         string
+		expectedArgs []interface{}
+		args         []string
+	}{
+		// datasetIngestor
+		{
+			name: "datasetIngestor test with 1 param",
+			expectedArgs: []interface{}{
+				"some/place/metadata.json",
+				"",
+				"",
+			},
+			args: []string{"datasetIngestor", "some/place/metadata.json"},
+		},
+		{
+			name: "datasetIngestor test with 2 params - folderlisting.txt",
+			expectedArgs: []interface{}{
+				"some/place/metadata.json",
+				"",
+				"folderlisting.txt",
+			},
+			args: []string{"datasetIngestor", "some/place/metadata.json", "folderlisting.txt"},
+		},
+		{
+			name: "datasetIngestor test with 2 params - filelisting",
+			expectedArgs: []interface{}{
+				"some/place/metadata.json",
+				"/some/path/",
+				"",
+			},
+			args: []string{"datasetIngestor", "some/place/metadata.json", "/some/path/"},
+		},
+	}
+
+	// running test cases
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			//flag.CommandLine = flag.NewFlagSet(test.name, flag.ExitOnError)
+			datasetUtils.TestArgs = func(args []interface{}) {
+				passing := true
+				for i, _ := range test.expectedArgs {
+					if test.expectedArgs[i] != args[i] {
+						t.Logf("'%v' is not correct, expected: '%s'", args[i], test.expectedArgs[i])
+						passing = false
+					}
+				}
+				if !passing {
+					t.Fail()
+				}
+			}
+
+			rootCmd.SetArgs(test.args)
+			Execute()
+		})
+	}
+}

cmd/commands/datasetIngestor.go

@@ -100,6 +100,29 @@ For Windows you need instead to specify -user username:password on the command l
 			return
 		}
 
+		if len(args) <= 0 || len(args) >= 3 {
+			log.Fatal("invalid number of args")
+		}
+
+		metadatafile := args[0]
+		filelistingPath := ""
+		folderlistingPath := ""
+		absFileListing := ""
+		if len(args) == 2 {
+			if args[1] == "folderlisting.txt" {
+				folderlistingPath = args[1]
+			} else {
+				// NOTE filelistingPath is some kind of path to which the sourceFolder path should be relative
+				filelistingPath = args[1]
+				absFileListing, _ = filepath.Abs(filelistingPath)
+			}
+		}
+
+		if datasetUtils.TestArgs != nil {
+			datasetUtils.TestArgs([]interface{}{metadatafile, filelistingPath, folderlistingPath})
+			return
+		}
+
 		// functions use this flag in a way where "nil -> unset"
 		var allowExistingSourceFolderPtr *bool = &allowExistingSourceFolder
 		if !noninteractiveFlag && !cmd.Flags().Lookup("allowexistingsource").Changed {
@@ -141,26 +164,6 @@ For Windows you need instead to specify -user username:password on the command l
 		log.Printf("You are about to add a dataset to the === %s === data catalog environment...", env)
 		color.Unset()
 
-		metadatafile := ""
-		filelistingPath := ""
-		folderlistingPath := ""
-		absFileListing := ""
-
-		if len(args) <= 0 || len(args) >= 3 {
-			log.Fatal("invalid number of args")
-		}
-
-		metadatafile = args[0]
-		if len(args) == 2 {
-			if args[1] == "folderlisting.txt" {
-				folderlistingPath = args[1]
-			} else {
-				// NOTE filelistingPath is some kind of path to which the sourceFolder path should be relative
-				filelistingPath = args[1]
-				absFileListing, _ = filepath.Abs(filelistingPath)
-			}
-		}
-
 		// TODO: change pointer parameter types to values as they shouldn't be modified by the function
 		auth := &datasetUtils.RealAuthenticator{}
 		user, accessGroups := datasetUtils.Authenticate(auth, client, APIServer, &token, &userpass)

datasetUtils/testfunc.go

@@ -1,3 +1,4 @@
 package datasetUtils
 
 var TestFlags func(flags map[string]interface{}) = nil
+var TestArgs func(args []interface{}) = nil