You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2017/09/20 17:09:49 UTC
[incubator-openwhisk-wskdeploy] branch master updated: Refactor
yamlpaster_test.go (#520)
This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new 218e77e Refactor yamlpaster_test.go (#520)
218e77e is described below
commit 218e77e29fa40d827a014e36849e54e3fe230e84
Author: Ying Chun Guo <gu...@cn.ibm.com>
AuthorDate: Thu Sep 21 01:09:47 2017 +0800
Refactor yamlpaster_test.go (#520)
---
parsers/deploy_parser_test.go | 60 +++++++++++
parsers/manifest_parser_test.go | 153 +++++++++++++++++++++++++++++
parsers/yamlparser_test.go | 213 ----------------------------------------
3 files changed, 213 insertions(+), 213 deletions(-)
diff --git a/parsers/deploy_parser_test.go b/parsers/deploy_parser_test.go
index 9e83b85..9bd986b 100644
--- a/parsers/deploy_parser_test.go
+++ b/parsers/deploy_parser_test.go
@@ -93,3 +93,63 @@ func TestMissingRootNodeDeploymentYaml(t *testing.T) {
// go-yaml/yaml prints the wrong line number for mapping values. It should be 3.
assert.Contains(t, err.Error(), "field name not found in struct parsers.DeploymentYAML: Line 1, its neighbour lines, or the lines on the same level")
}
+
+func TestParseDeploymentYAML_Application(t *testing.T) {
+ //var deployment utils.DeploymentYAML
+ mm := NewYAMLParser()
+ deployment, _ := mm.ParseDeployment("../tests/dat/deployment_data_application.yaml")
+
+ //get and verify application name
+ assert.Equal(t, "wskdeploy-samples", deployment.Application.Name, "Get application name failed.")
+ assert.Equal(t, "/wskdeploy/samples/", deployment.Application.Namespace, "Get application namespace failed.")
+ assert.Equal(t, "user-credential", deployment.Application.Credential, "Get application credential failed.")
+ assert.Equal(t, "172.17.0.1", deployment.Application.ApiHost, "Get application api host failed.")
+}
+
+func TestParseDeploymentYAML_Package(t *testing.T) {
+ //var deployment utils.DeploymentYAML
+ mm := NewYAMLParser()
+ deployment, _ := mm.ParseDeployment("../tests/dat/deployment_data_application_package.yaml")
+
+ assert.Equal(t, 1, len(deployment.Application.Packages), "Get package list failed.")
+ for pkg_name := range deployment.Application.Packages {
+ assert.Equal(t, "test_package", pkg_name, "Get package name failed.")
+ var pkg = deployment.Application.Packages[pkg_name]
+ assert.Equal(t, "http://abc.com/bbb", pkg.Function, "Get package function failed.")
+ assert.Equal(t, "/wskdeploy/samples/test", pkg.Namespace, "Get package namespace failed.")
+ assert.Equal(t, "12345678ABCDEF", pkg.Credential, "Get package credential failed.")
+ assert.Equal(t, 1, len(pkg.Inputs), "Get package input list failed.")
+ //get and verify inputs
+ for param_name, param := range pkg.Inputs {
+ assert.Equal(t, "value", param.Value, "Get input value failed.")
+ assert.Equal(t, "param", param_name, "Get input param name failed.")
+ }
+ }
+}
+
+func TestParseDeploymentYAML_Action(t *testing.T) {
+ mm := NewYAMLParser()
+ deployment, _ := mm.ParseDeployment("../tests/dat/deployment_data_application_package.yaml")
+
+ for pkg_name := range deployment.Application.Packages {
+
+ var pkg = deployment.Application.Packages[pkg_name]
+ for action_name := range pkg.Actions {
+ assert.Equal(t, "hello", action_name, "Get action name failed.")
+ var action = pkg.Actions[action_name]
+ assert.Equal(t, "/wskdeploy/samples/test/hello", action.Namespace, "Get action namespace failed.")
+ assert.Equal(t, "12345678ABCDEF", action.Credential, "Get action credential failed.")
+ assert.Equal(t, 1, len(action.Inputs), "Get package input list failed.")
+ //get and verify inputs
+ for param_name, param := range action.Inputs {
+ switch param.Value.(type) {
+ case string:
+ assert.Equal(t, "name", param_name, "Get input param name failed.")
+ assert.Equal(t, "Bernie", param.Value, "Get input value failed.")
+ default:
+ t.Error("Get input value type failed.")
+ }
+ }
+ }
+ }
+}
diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go
index a2532b5..e9e9d8b 100644
--- a/parsers/manifest_parser_test.go
+++ b/parsers/manifest_parser_test.go
@@ -1367,3 +1367,156 @@ packages:
}
}
}
+
+func TestParseManifestYAML_trigger(t *testing.T) {
+ data, err := ioutil.ReadFile("../tests/dat/manifest3.yaml")
+ if err != nil {
+ panic(err)
+ }
+
+ var manifest ManifestYAML
+ err = NewYAMLParser().Unmarshal(data, &manifest)
+ if err != nil {
+ panic(err)
+ }
+
+ assert.Equal(t, 2, len(manifest.Package.Triggers), "Get trigger list failed.")
+ for trigger_name := range manifest.Package.Triggers {
+ var trigger = manifest.Package.Triggers[trigger_name]
+ switch trigger_name {
+ case "trigger1":
+ case "trigger2":
+ assert.Equal(t, "myfeed", trigger.Feed, "Get trigger feed name failed.")
+ default:
+ t.Error("Get trigger name failed")
+ }
+ }
+}
+
+func TestParseManifestYAML_rule(t *testing.T) {
+ data, err := ioutil.ReadFile("../tests/dat/manifest4.yaml")
+ if err != nil {
+ panic(err)
+ }
+
+ var manifest ManifestYAML
+ err = NewYAMLParser().Unmarshal(data, &manifest)
+ if err != nil {
+ panic(err)
+ }
+
+ assert.Equal(t, 1, len(manifest.Package.Rules), "Get trigger list failed.")
+ for rule_name := range manifest.Package.Rules {
+ var rule = manifest.Package.Rules[rule_name]
+ switch rule_name {
+ case "rule1":
+ assert.Equal(t, "trigger1", rule.Trigger, "Get trigger name failed.")
+ assert.Equal(t, "hellpworld", rule.Action, "Get action name failed.")
+ assert.Equal(t, "true", rule.Rule, "Get rule expression failed.")
+ default:
+ t.Error("Get rule name failed")
+ }
+ }
+}
+
+func TestParseManifestYAML_feed(t *testing.T) {
+ data, err := ioutil.ReadFile("../tests/dat/manifest5.yaml")
+ if err != nil {
+ panic(err)
+ }
+
+ var manifest ManifestYAML
+ err = NewYAMLParser().Unmarshal(data, &manifest)
+ if err != nil {
+ panic(err)
+ }
+
+ assert.Equal(t, 1, len(manifest.Package.Feeds), "Get feed list failed.")
+ for feed_name := range manifest.Package.Feeds {
+ var feed = manifest.Package.Feeds[feed_name]
+ switch feed_name {
+ case "feed1":
+ assert.Equal(t, "https://my.company.com/services/eventHub", feed.Location, "Get feed location failed.")
+ assert.Equal(t, "my_credential", feed.Credential, "Get feed credential failed.")
+ assert.Equal(t, 2, len(feed.Operations), "Get operations number failed.")
+ for operation_name := range feed.Operations {
+ switch operation_name {
+ case "operation1":
+ case "operation2":
+ default:
+ t.Error("Get feed operation name failed")
+ }
+ }
+ default:
+ t.Error("Get feed name failed")
+ }
+ }
+}
+
+func TestParseManifestYAML_param(t *testing.T) {
+ data, err := ioutil.ReadFile("../tests/dat/manifest6.yaml")
+ if err != nil {
+ panic(err)
+ }
+
+ var manifest ManifestYAML
+ err = NewYAMLParser().Unmarshal(data, &manifest)
+ if err != nil {
+ panic(err)
+ }
+
+ assert.Equal(t, 1, len(manifest.Package.Actions), "Get action list failed.")
+ for action_name := range manifest.Package.Actions {
+ var action = manifest.Package.Actions[action_name]
+ switch action_name {
+ case "action1":
+ for param_name := range action.Inputs {
+ var param = action.Inputs[param_name]
+ switch param_name {
+ case "inline1":
+ assert.Equal(t, "{ \"key\": true }", param.Value, "Get param value failed.")
+ case "inline2":
+ assert.Equal(t, "Just a string", param.Value, "Get param value failed.")
+ case "inline3":
+ assert.Equal(t, nil, param.Value, "Get param value failed.")
+ case "inline4":
+ assert.Equal(t, true, param.Value, "Get param value failed.")
+ case "inline5":
+ assert.Equal(t, 42, param.Value, "Get param value failed.")
+ case "inline6":
+ assert.Equal(t, -531, param.Value, "Get param value failed.")
+ case "inline7":
+ assert.Equal(t, 432.432E-43, param.Value, "Get param value failed.")
+ case "inline8":
+ assert.Equal(t, "[ true, null, \"boo\", { \"key\": 0 }]", param.Value, "Get param value failed.")
+ case "inline9":
+ assert.Equal(t, false, param.Value, "Get param value failed.")
+ case "inline0":
+ assert.Equal(t, 456.423, param.Value, "Get param value failed.")
+ case "inlin10":
+ assert.Equal(t, nil, param.Value, "Get param value failed.")
+ case "inlin11":
+ assert.Equal(t, true, param.Value, "Get param value failed.")
+ case "expand1":
+ assert.Equal(t, nil, param.Value, "Get param value failed.")
+ case "expand2":
+ assert.Equal(t, true, param.Value, "Get param value failed.")
+ case "expand3":
+ assert.Equal(t, false, param.Value, "Get param value failed.")
+ case "expand4":
+ assert.Equal(t, 15646, param.Value, "Get param value failed.")
+ case "expand5":
+ assert.Equal(t, "{ \"key\": true }", param.Value, "Get param value failed.")
+ case "expand6":
+ assert.Equal(t, "[ true, null, \"boo\", { \"key\": 0 }]", param.Value, "Get param value failed.")
+ case "expand7":
+ assert.Equal(t, nil, param.Value, "Get param value failed.")
+ default:
+ t.Error("Get param name failed")
+ }
+ }
+ default:
+ t.Error("Get action name failed")
+ }
+ }
+}
diff --git a/parsers/yamlparser_test.go b/parsers/yamlparser_test.go
index e18ee36..21bfc12 100644
--- a/parsers/yamlparser_test.go
+++ b/parsers/yamlparser_test.go
@@ -21,7 +21,6 @@ package parsers
import (
"github.com/stretchr/testify/assert"
- "io/ioutil"
"testing"
)
@@ -36,218 +35,6 @@ var deploymentfile_data_app_pkg = "../tests/dat/deployment_data_application_pack
var testfile3 = "../tests/dat/deploy3.yaml"
var testfile4 = "../tests/dat/deploy4.yaml"
-func TestParseManifestYAML_trigger(t *testing.T) {
- data, err := ioutil.ReadFile(manifestfile3)
- if err != nil {
- panic(err)
- }
-
- var manifest ManifestYAML
- err = NewYAMLParser().Unmarshal(data, &manifest)
- if err != nil {
- panic(err)
- }
-
- assert.Equal(t, 2, len(manifest.Package.Triggers), "Get trigger list failed.")
- for trigger_name := range manifest.Package.Triggers {
- var trigger = manifest.Package.Triggers[trigger_name]
- switch trigger_name {
- case "trigger1":
- case "trigger2":
- assert.Equal(t, "myfeed", trigger.Feed, "Get trigger feed name failed.")
- default:
- t.Error("Get trigger name failed")
- }
- }
-}
-
-func TestParseManifestYAML_rule(t *testing.T) {
- data, err := ioutil.ReadFile(manifestfile4)
- if err != nil {
- panic(err)
- }
-
- var manifest ManifestYAML
- err = NewYAMLParser().Unmarshal(data, &manifest)
- if err != nil {
- panic(err)
- }
-
- assert.Equal(t, 1, len(manifest.Package.Rules), "Get trigger list failed.")
- for rule_name := range manifest.Package.Rules {
- var rule = manifest.Package.Rules[rule_name]
- switch rule_name {
- case "rule1":
- assert.Equal(t, "trigger1", rule.Trigger, "Get trigger name failed.")
- assert.Equal(t, "hellpworld", rule.Action, "Get action name failed.")
- assert.Equal(t, "true", rule.Rule, "Get rule expression failed.")
- default:
- t.Error("Get rule name failed")
- }
- }
-}
-
-func TestParseManifestYAML_feed(t *testing.T) {
- data, err := ioutil.ReadFile(manifestfile5)
- if err != nil {
- panic(err)
- }
-
- var manifest ManifestYAML
- err = NewYAMLParser().Unmarshal(data, &manifest)
- if err != nil {
- panic(err)
- }
-
- assert.Equal(t, 1, len(manifest.Package.Feeds), "Get feed list failed.")
- for feed_name := range manifest.Package.Feeds {
- var feed = manifest.Package.Feeds[feed_name]
- switch feed_name {
- case "feed1":
- assert.Equal(t, "https://my.company.com/services/eventHub", feed.Location, "Get feed location failed.")
- assert.Equal(t, "my_credential", feed.Credential, "Get feed credential failed.")
- assert.Equal(t, 2, len(feed.Operations), "Get operations number failed.")
- for operation_name := range feed.Operations {
- switch operation_name {
- case "operation1":
- case "operation2":
- default:
- t.Error("Get feed operation name failed")
- }
- }
- default:
- t.Error("Get feed name failed")
- }
- }
-}
-
-func TestParseManifestYAML_param(t *testing.T) {
- data, err := ioutil.ReadFile(manifestfile6)
- if err != nil {
- panic(err)
- }
-
- var manifest ManifestYAML
- err = NewYAMLParser().Unmarshal(data, &manifest)
- if err != nil {
- panic(err)
- }
-
- assert.Equal(t, 1, len(manifest.Package.Actions), "Get action list failed.")
- for action_name := range manifest.Package.Actions {
- var action = manifest.Package.Actions[action_name]
- switch action_name {
- case "action1":
- for param_name := range action.Inputs {
- var param = action.Inputs[param_name]
- switch param_name {
- case "inline1":
- assert.Equal(t, "{ \"key\": true }", param.Value, "Get param value failed.")
- case "inline2":
- assert.Equal(t, "Just a string", param.Value, "Get param value failed.")
- case "inline3":
- assert.Equal(t, nil, param.Value, "Get param value failed.")
- case "inline4":
- assert.Equal(t, true, param.Value, "Get param value failed.")
- case "inline5":
- assert.Equal(t, 42, param.Value, "Get param value failed.")
- case "inline6":
- assert.Equal(t, -531, param.Value, "Get param value failed.")
- case "inline7":
- assert.Equal(t, 432.432E-43, param.Value, "Get param value failed.")
- case "inline8":
- assert.Equal(t, "[ true, null, \"boo\", { \"key\": 0 }]", param.Value, "Get param value failed.")
- case "inline9":
- assert.Equal(t, false, param.Value, "Get param value failed.")
- case "inline0":
- assert.Equal(t, 456.423, param.Value, "Get param value failed.")
- case "inlin10":
- assert.Equal(t, nil, param.Value, "Get param value failed.")
- case "inlin11":
- assert.Equal(t, true, param.Value, "Get param value failed.")
- case "expand1":
- assert.Equal(t, nil, param.Value, "Get param value failed.")
- case "expand2":
- assert.Equal(t, true, param.Value, "Get param value failed.")
- case "expand3":
- assert.Equal(t, false, param.Value, "Get param value failed.")
- case "expand4":
- assert.Equal(t, 15646, param.Value, "Get param value failed.")
- case "expand5":
- assert.Equal(t, "{ \"key\": true }", param.Value, "Get param value failed.")
- case "expand6":
- assert.Equal(t, "[ true, null, \"boo\", { \"key\": 0 }]", param.Value, "Get param value failed.")
- case "expand7":
- assert.Equal(t, nil, param.Value, "Get param value failed.")
- default:
- t.Error("Get param name failed")
- }
- }
- default:
- t.Error("Get action name failed")
- }
- }
-}
-
-func TestParseDeploymentYAML_Application(t *testing.T) {
- //var deployment utils.DeploymentYAML
- mm := NewYAMLParser()
- deployment, _ := mm.ParseDeployment(deploymentfile_data_app)
-
- //get and verify application name
- assert.Equal(t, "wskdeploy-samples", deployment.Application.Name, "Get application name failed.")
- assert.Equal(t, "/wskdeploy/samples/", deployment.Application.Namespace, "Get application namespace failed.")
- assert.Equal(t, "user-credential", deployment.Application.Credential, "Get application credential failed.")
- assert.Equal(t, "172.17.0.1", deployment.Application.ApiHost, "Get application api host failed.")
-}
-
-func TestParseDeploymentYAML_Package(t *testing.T) {
- //var deployment utils.DeploymentYAML
- mm := NewYAMLParser()
- deployment, _ := mm.ParseDeployment(deploymentfile_data_app_pkg)
-
- assert.Equal(t, 1, len(deployment.Application.Packages), "Get package list failed.")
- for pkg_name := range deployment.Application.Packages {
- assert.Equal(t, "test_package", pkg_name, "Get package name failed.")
- var pkg = deployment.Application.Packages[pkg_name]
- assert.Equal(t, "http://abc.com/bbb", pkg.Function, "Get package function failed.")
- assert.Equal(t, "/wskdeploy/samples/test", pkg.Namespace, "Get package namespace failed.")
- assert.Equal(t, "12345678ABCDEF", pkg.Credential, "Get package credential failed.")
- assert.Equal(t, 1, len(pkg.Inputs), "Get package input list failed.")
- //get and verify inputs
- for param_name, param := range pkg.Inputs {
- assert.Equal(t, "value", param.Value, "Get input value failed.")
- assert.Equal(t, "param", param_name, "Get input param name failed.")
- }
- }
-}
-
-func TestParseDeploymentYAML_Action(t *testing.T) {
- mm := NewYAMLParser()
- deployment, _ := mm.ParseDeployment(deploymentfile_data_app_pkg)
-
- for pkg_name := range deployment.Application.Packages {
-
- var pkg = deployment.Application.Packages[pkg_name]
- for action_name := range pkg.Actions {
- assert.Equal(t, "hello", action_name, "Get action name failed.")
- var action = pkg.Actions[action_name]
- assert.Equal(t, "/wskdeploy/samples/test/hello", action.Namespace, "Get action namespace failed.")
- assert.Equal(t, "12345678ABCDEF", action.Credential, "Get action credential failed.")
- assert.Equal(t, 1, len(action.Inputs), "Get package input list failed.")
- //get and verify inputs
- for param_name, param := range action.Inputs {
- switch param.Value.(type) {
- case string:
- assert.Equal(t, "name", param_name, "Get input param name failed.")
- assert.Equal(t, "Bernie", param.Value, "Get input value failed.")
- default:
- t.Error("Get input value type failed.")
- }
- }
- }
- }
-}
func TestComposeWskPackage(t *testing.T) {
mm := NewYAMLParser()
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].