re-organize service-test-x testing services

mesg-foundation · Aug 24, 2018 · d464355 · d464355
1 parent df406f2
commit d464355
Show file tree

Hide file tree

Showing 29 changed files with 28 additions and 109 deletions.
diff --git a/api/deploy_test.go b/api/deploy_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestDeployService(t *testing.T) {
-	path := "./service-test"
+	path := "../service-test/task"
 
 	a, dt := newAPIAndDockerTest(t)
 	dt.ProvideImageBuild(ioutil.NopCloser(strings.NewReader(`{"stream":"sha256:x"}`)), nil)
@@ -67,7 +67,7 @@ func TestDeployService(t *testing.T) {
 }
 
 func TestDeployInvalidService(t *testing.T) {
-	path := "./service-test-invalid"
+	path := "../service-test/invalid"
 
 	a, dt := newAPIAndDockerTest(t)
 	dt.ProvideImageBuild(ioutil.NopCloser(strings.NewReader(`{"stream":"sha256:x"}`)), nil)

diff --git a/api/service-test/Dockerfile b/api/service-test/Dockerfile
diff --git a/api/service-test/mesg.yml b/api/service-test/mesg.yml
diff --git a/interface/grpc/core/delete_test.go b/interface/grpc/core/delete_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestDeleteService(t *testing.T) {
 	var (
-		path   = "./service-test-task"
+		path   = "../../service-test/task"
 		server = newServer(t)
 	)
 

diff --git a/interface/grpc/core/execute_test.go b/interface/grpc/core/execute_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestExecute(t *testing.T) {
 	var (
-		path    = "./service-test-task"
+		path    = "../../service-test/task"
 		taskKey = "call"
 		data    = `{"url": "https://mesg.tech", "data": {}, "headers": {}}`
 		server  = newServer(t)
@@ -36,7 +36,7 @@ func TestExecute(t *testing.T) {
 
 func TestExecuteWithInvalidJSON(t *testing.T) {
 	var (
-		path   = "./service-test-task"
+		path   = "../../service-test/task"
 		server = newServer(t)
 	)
 
@@ -56,7 +56,7 @@ func TestExecuteWithInvalidJSON(t *testing.T) {
 
 func TestExecuteWithInvalidTask(t *testing.T) {
 	var (
-		path   = "./service-test-task"
+		path   = "../../service-test/task"
 		server = newServer(t)
 	)
 
@@ -79,7 +79,7 @@ func TestExecuteWithInvalidTask(t *testing.T) {
 
 func TestExecuteWithNonRunningService(t *testing.T) {
 	var (
-		path   = "./service-test-task"
+		path   = "../../service-test/task"
 		server = newServer(t)
 	)
 

diff --git a/interface/grpc/core/get_service_test.go b/interface/grpc/core/get_service_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestGetService(t *testing.T) {
 	var (
-		path   = "./service-test-task"
+		path   = "../../service-test/task"
 		server = newServer(t)
 	)
 

diff --git a/interface/grpc/core/service-test-event/index.js b/interface/grpc/core/service-test-event/index.js
diff --git a/interface/grpc/core/service-test-task/index.js b/interface/grpc/core/service-test-task/index.js
diff --git a/interface/grpc/core/start_test.go b/interface/grpc/core/start_test.go
@@ -13,7 +13,7 @@ func TestStartService(t *testing.T) {
 		// we use a test service without tasks definition here otherwise we need to
 		// spin up the gRPC server in order to prevent service exit with a failure
 		// because it'll try to listen for tasks.
-		path   = "./service-test-event"
+		path   = "../../service-test/event"
 		server = newServer(t)
 	)
 

diff --git a/interface/grpc/core/stop_test.go b/interface/grpc/core/stop_test.go
@@ -13,7 +13,7 @@ func TestStopService(t *testing.T) {
 		// we use a test service without tasks definition here otherwise we need to
 		// spin up the gRPC server in order to prevent service exit with a failure
 		// because it'll try to listen for tasks.
-		path   = "./service-test-event"
+		path   = "../../service-test/event"
 		server = newServer(t)
 	)
 

diff --git a/interface/grpc/service/emit_event_test.go b/interface/grpc/service/emit_event_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestEmit(t *testing.T) {
 	var (
-		path      = "./service-test-event"
+		path      = "../../service-test/event"
 		eventKey  = "request"
 		eventData = `{"data":{}}`
 		server    = newServer(t)
@@ -45,7 +45,7 @@ func TestEmit(t *testing.T) {
 
 func TestEmitNoData(t *testing.T) {
 	var (
-		path     = "./service-test-event"
+		path     = "../../service-test/event"
 		eventKey = "request"
 		server   = newServer(t)
 	)
@@ -64,7 +64,7 @@ func TestEmitNoData(t *testing.T) {
 
 func TestEmitWrongData(t *testing.T) {
 	var (
-		path     = "./service-test-event"
+		path     = "../../service-test/event"
 		eventKey = "request"
 		server   = newServer(t)
 	)
@@ -84,7 +84,7 @@ func TestEmitWrongData(t *testing.T) {
 
 func TestEmitWrongEvent(t *testing.T) {
 	var (
-		path     = "./service-test-event"
+		path     = "../../service-test/event"
 		eventKey = "test"
 		server   = newServer(t)
 	)

diff --git a/interface/grpc/service/service-test-event/Dockerfile b/interface/grpc/service/service-test-event/Dockerfile
diff --git a/interface/grpc/service/service-test-event/index.js b/interface/grpc/service/service-test-event/index.js
diff --git a/interface/grpc/service/service-test-event/mesg.yml b/interface/grpc/service/service-test-event/mesg.yml
diff --git a/interface/grpc/service/service-test-event/package.json b/interface/grpc/service/service-test-event/package.json
diff --git a/interface/grpc/service/service-test-task/Dockerfile b/interface/grpc/service/service-test-task/Dockerfile
diff --git a/interface/grpc/service/service-test-task/index.js b/interface/grpc/service/service-test-task/index.js
diff --git a/interface/grpc/service/service-test-task/mesg.yml b/interface/grpc/service/service-test-task/mesg.yml
diff --git a/interface/grpc/service/service-test-task/package.json b/interface/grpc/service/service-test-task/package.json
diff --git a/interface/grpc/service/submit_result_test.go b/interface/grpc/service/submit_result_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestSubmit(t *testing.T) {
 	var (
-		path     = "./service-test-task"
+		path     = "../../service-test/task"
 		taskKey  = "call"
 		taskData = map[string]interface{}{
 			"url":     "https://mesg.tech",
@@ -57,7 +57,7 @@ func TestSubmit(t *testing.T) {
 
 func TestSubmitWithInvalidJSON(t *testing.T) {
 	var (
-		path     = "./service-test-task"
+		path     = "../../service-test/task"
 		taskKey  = "call"
 		taskData = map[string]interface{}{
 			"url":     "https://mesg.tech",

diff --git a/...e/grpc/core/service-test-event/Dockerfile → service-test/event/Dockerfile b/...e/grpc/core/service-test-event/Dockerfile → service-test/event/Dockerfile
diff --git a/service-test/event/index.js b/service-test/event/index.js
@@ -0,0 +1,6 @@
+const MESG = require("mesg-js").service();
+const app = require("express")();
+
+app.listen(3000, () => {
+    console.log("Example app listening on port 3000!");
+});
diff --git a/...ace/grpc/core/service-test-event/mesg.yml → service-test/event/mesg.yml b/...ace/grpc/core/service-test-event/mesg.yml → service-test/event/mesg.yml
diff --git a/...grpc/core/service-test-event/package.json → service-test/event/package.json b/...grpc/core/service-test-event/package.json → service-test/event/package.json
diff --git a/api/service-test-invalid/empty → service-test/invalid/empty b/api/service-test-invalid/empty → service-test/invalid/empty
diff --git a/...ce/grpc/core/service-test-task/Dockerfile → service-test/task/Dockerfile b/...ce/grpc/core/service-test-task/Dockerfile → service-test/task/Dockerfile
diff --git a/service-test/task/index.js b/service-test/task/index.js
@@ -0,0 +1,6 @@
+const MESG = require("mesg-js").service();
+const app = require("express")();
+
+app.listen(3000, () => {
+    console.log("Example app listening on port 3000!");
+});
diff --git a/...face/grpc/core/service-test-task/mesg.yml → service-test/task/mesg.yml b/...face/grpc/core/service-test-task/mesg.yml → service-test/task/mesg.yml
diff --git a/.../grpc/core/service-test-task/package.json → service-test/task/package.json b/.../grpc/core/service-test-task/package.json → service-test/task/package.json