Add tests

Signed-off-by: Yuri Shkuro <[email protected]>

cmd/query/app/fixture/ui-config-malformed.json

@@ -0,0 +1 @@
+{"x" == "y"}

cmd/query/app/fixture/ui-config.json

@@ -0,0 +1 @@
+{"x": "y"}

cmd/query/app/fixture/ui-config.toml

@@ -0,0 +1,4 @@
+x: abcd
+z:
+  - a
+  - b

cmd/query/app/fixture/ui-config.yaml

@@ -0,0 +1,4 @@
+x: abcd
+z:
+  - a
+  - b

cmd/query/app/fixture/ui-config.yml

@@ -0,0 +1,4 @@
+x: abcd
+z:
+  - a
+  - b

cmd/query/app/static_handler.go

@@ -79,22 +79,20 @@ func loadUIConfig(uiConfig string) (map[string]interface{}, error) {
 	}
 
 	var c map[string]interface{}
+	var unmarshall func([]byte, interface{}) error
 
 	switch strings.ToLower(ext) {
 	case ".yaml", ".yml":
-		if err := yaml.Unmarshal(bytes, &c); err != nil {
-			return nil, errors.Wrapf(err, "Cannot parse UI config file %v as YAML", uiConfig)
-		}
-
+		unmarshall = yaml.Unmarshal
 	case ".json":
-		if err := json.Unmarshal(bytes, &c); err != nil {
-			return nil, errors.Wrapf(err, "Cannot parse UI config file %v as JSON", uiConfig)
-		}
-
+		unmarshall = json.Unmarshal
 	default:
 		return nil, fmt.Errorf("Unrecognized UI config file format %v", uiConfig)
 	}
 
+	if err := unmarshall(bytes, &c); err != nil {
+		return nil, errors.Wrapf(err, "Cannot parse UI config file %v", uiConfig)
+	}
 	return c, nil
 }
 

cmd/query/app/static_handler_test.go

@@ -74,3 +74,55 @@ func TestRegisterRoutesHandler(t *testing.T) {
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 	assert.Equal(t, expectedRespString, respString)
 }
+
+func TestLoadUIConfig(t *testing.T) {
+	type testCase struct {
+		configFile    string
+		expected      map[string]interface{}
+		expectedError string
+	}
+
+	run := func(description string, testCase testCase) {
+		t.Run(description, func(t *testing.T) {
+			config, err := loadUIConfig(testCase.configFile)
+			if testCase.expectedError != "" {
+				assert.EqualError(t, err, testCase.expectedError)
+			} else {
+				assert.NoError(t, err)
+			}
+			assert.EqualValues(t, testCase.expected, config)
+		})
+	}
+
+	run("no config", testCase{})
+	run("invalid config", testCase{
+		configFile:    "invalid",
+		expectedError: "Cannot read UI config file invalid: open invalid: no such file or directory",
+	})
+	run("unsupported type", testCase{
+		configFile:    "fixture/ui-config.toml",
+		expectedError: "Unrecognized UI config file format fixture/ui-config.toml",
+	})
+	run("malformed", testCase{
+		configFile:    "fixture/ui-config-malformed.json",
+		expectedError: "Cannot parse UI config file fixture/ui-config-malformed.json: invalid character '=' after object key",
+	})
+	run("yaml", testCase{
+		configFile: "fixture/ui-config.yaml",
+		expected: map[string]interface{}{
+			"x": "abcd",
+			"z": []interface{}{"a", "b"},
+		},
+	})
+	run("yml", testCase{
+		configFile: "fixture/ui-config.yml",
+		expected: map[string]interface{}{
+			"x": "abcd",
+			"z": []interface{}{"a", "b"},
+		},
+	})
+	run("json", testCase{
+		configFile: "fixture/ui-config.json",
+		expected:   map[string]interface{}{"x": "y"},
+	})
+}