From 63978e226bc90464cd7b1c2ff3e6df32fa847afe Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 14 Jan 2020 15:42:56 +0900 Subject: [PATCH] Move node files for UI testing to v1.0 directory structures --- .../core/{core => common}/20-inject_page.js | 0 .../21-debug_page.js} | 0 .../10-function_page.js} | 0 .../{logic => function}/15-change_page.js | 0 .../core/{logic => function}/16-range_page.js | 0 .../{core => function}/80-template_page.js | 0 .../{io => network}/10-mqttconfig_page.js | 0 .../core/{io => network}/10-mqttin_page.js | 0 .../core/{io => network}/10-mqttout_page.js | 0 .../core/{io => network}/21-httpin_page.js | 0 .../{io => network}/21-httprequest_page.js | 0 .../{io => network}/21-httpresponse_page.js | 0 .../{50-filein_page.js => 10-filein_page.js} | 0 .../pageobjects/nodes/nodefactory_page.js | 50 +++++++++---------- .../specs/scenario/cookbook_mqtt_uispec.js | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) rename test/editor/pageobjects/nodes/core/{core => common}/20-inject_page.js (100%) rename test/editor/pageobjects/nodes/core/{core/58-debug_page.js => common/21-debug_page.js} (100%) rename test/editor/pageobjects/nodes/core/{core/80-function_page.js => function/10-function_page.js} (100%) rename test/editor/pageobjects/nodes/core/{logic => function}/15-change_page.js (100%) rename test/editor/pageobjects/nodes/core/{logic => function}/16-range_page.js (100%) rename test/editor/pageobjects/nodes/core/{core => function}/80-template_page.js (100%) rename test/editor/pageobjects/nodes/core/{io => network}/10-mqttconfig_page.js (100%) rename test/editor/pageobjects/nodes/core/{io => network}/10-mqttin_page.js (100%) rename test/editor/pageobjects/nodes/core/{io => network}/10-mqttout_page.js (100%) rename test/editor/pageobjects/nodes/core/{io => network}/21-httpin_page.js (100%) rename test/editor/pageobjects/nodes/core/{io => network}/21-httprequest_page.js (100%) rename test/editor/pageobjects/nodes/core/{io => network}/21-httpresponse_page.js (100%) rename test/editor/pageobjects/nodes/core/storage/{50-filein_page.js => 10-filein_page.js} (100%) diff --git a/test/editor/pageobjects/nodes/core/core/20-inject_page.js b/test/editor/pageobjects/nodes/core/common/20-inject_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/core/20-inject_page.js rename to test/editor/pageobjects/nodes/core/common/20-inject_page.js diff --git a/test/editor/pageobjects/nodes/core/core/58-debug_page.js b/test/editor/pageobjects/nodes/core/common/21-debug_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/core/58-debug_page.js rename to test/editor/pageobjects/nodes/core/common/21-debug_page.js diff --git a/test/editor/pageobjects/nodes/core/core/80-function_page.js b/test/editor/pageobjects/nodes/core/function/10-function_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/core/80-function_page.js rename to test/editor/pageobjects/nodes/core/function/10-function_page.js diff --git a/test/editor/pageobjects/nodes/core/logic/15-change_page.js b/test/editor/pageobjects/nodes/core/function/15-change_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/logic/15-change_page.js rename to test/editor/pageobjects/nodes/core/function/15-change_page.js diff --git a/test/editor/pageobjects/nodes/core/logic/16-range_page.js b/test/editor/pageobjects/nodes/core/function/16-range_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/logic/16-range_page.js rename to test/editor/pageobjects/nodes/core/function/16-range_page.js diff --git a/test/editor/pageobjects/nodes/core/core/80-template_page.js b/test/editor/pageobjects/nodes/core/function/80-template_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/core/80-template_page.js rename to test/editor/pageobjects/nodes/core/function/80-template_page.js diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js rename to test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttin_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttin_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/io/10-mqttin_page.js rename to test/editor/pageobjects/nodes/core/network/10-mqttin_page.js diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttout_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttout_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/io/10-mqttout_page.js rename to test/editor/pageobjects/nodes/core/network/10-mqttout_page.js diff --git a/test/editor/pageobjects/nodes/core/io/21-httpin_page.js b/test/editor/pageobjects/nodes/core/network/21-httpin_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/io/21-httpin_page.js rename to test/editor/pageobjects/nodes/core/network/21-httpin_page.js diff --git a/test/editor/pageobjects/nodes/core/io/21-httprequest_page.js b/test/editor/pageobjects/nodes/core/network/21-httprequest_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/io/21-httprequest_page.js rename to test/editor/pageobjects/nodes/core/network/21-httprequest_page.js diff --git a/test/editor/pageobjects/nodes/core/io/21-httpresponse_page.js b/test/editor/pageobjects/nodes/core/network/21-httpresponse_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/io/21-httpresponse_page.js rename to test/editor/pageobjects/nodes/core/network/21-httpresponse_page.js diff --git a/test/editor/pageobjects/nodes/core/storage/50-filein_page.js b/test/editor/pageobjects/nodes/core/storage/10-filein_page.js similarity index 100% rename from test/editor/pageobjects/nodes/core/storage/50-filein_page.js rename to test/editor/pageobjects/nodes/core/storage/10-filein_page.js diff --git a/test/editor/pageobjects/nodes/nodefactory_page.js b/test/editor/pageobjects/nodes/nodefactory_page.js index c518d89ff..744c1570d 100644 --- a/test/editor/pageobjects/nodes/nodefactory_page.js +++ b/test/editor/pageobjects/nodes/nodefactory_page.js @@ -14,46 +14,46 @@ * limitations under the License. **/ -var injectNode = require('./core/core/20-inject_page'); -var debugNode = require('./core/core/58-debug_page'); -var templateNode = require('./core/core/80-template_page'); -var functionNode = require('./core/core/80-function_page'); -var mqttInNode = require('./core/io/10-mqttin_page'); -var mqttOutNode = require('./core/io/10-mqttout_page'); -var httpInNode = require('./core/io/21-httpin_page'); -var httpResponseNode = require('./core/io/21-httpresponse_page'); -var changeNode = require('./core/logic/15-change_page'); -var rangeNode = require('./core/logic/16-range_page'); -var httpRequestNode = require('./core/io/21-httprequest_page'); +var injectNode = require('./core/common/20-inject_page'); +var debugNode = require('./core/common/21-debug_page'); +var functionNode = require('./core/function/10-function_page'); +var changeNode = require('./core/function/15-change_page'); +var rangeNode = require('./core/function/16-range_page'); +var templateNode = require('./core/function/80-template_page'); +var mqttInNode = require('./core/network/10-mqttin_page'); +var mqttOutNode = require('./core/network/10-mqttout_page'); +var httpInNode = require('./core/network/21-httpin_page'); +var httpResponseNode = require('./core/network/21-httpresponse_page'); +var httpRequestNode = require('./core/network/21-httprequest_page'); var htmlNode = require('./core/parsers/70-HTML_page'); var jsonNode = require('./core/parsers/70-JSON_page'); -var fileInNode = require('./core/storage/50-filein_page'); - +var fileInNode = require('./core/storage/10-filein_page'); var nodeCatalog = { - // input + // common "inject": injectNode, - "httpIn": httpInNode, - "mqttIn":mqttInNode, - // output "debug": debugNode, - "httpResponse": httpResponseNode, - "mqttOut": mqttOutNode, // function "function": functionNode, - "template": templateNode, "change": changeNode, "range": rangeNode, + "template": templateNode, + // network + "mqttIn": mqttInNode, + "mqttOut": mqttOutNode, + "httpIn": httpInNode, + "httpResponse": httpResponseNode, "httpRequest": httpRequestNode, + // parser "html": htmlNode, - "json":jsonNode, + "json": jsonNode, // storage - "fileIn": fileInNode, -} + "fileIn": fileInNode +}; function create(type, id) { - var node = nodeCatalog[type]; - return new node(id); + var Node = nodeCatalog[type]; + return new Node(id); } module.exports = { diff --git a/test/editor/specs/scenario/cookbook_mqtt_uispec.js b/test/editor/specs/scenario/cookbook_mqtt_uispec.js index ecfe8da7d..887d9735c 100644 --- a/test/editor/specs/scenario/cookbook_mqtt_uispec.js +++ b/test/editor/specs/scenario/cookbook_mqtt_uispec.js @@ -22,7 +22,7 @@ var helper = require("../../editor_helper"); var debugTab = require('../../pageobjects/editor/debugTab_page'); var workspace = require('../../pageobjects/editor/workspace_page'); var specUtil = require('../../pageobjects/util/spec_util_page'); -var mqttConfig = require('../../pageobjects/nodes/core/io/10-mqttconfig_page.js'); +var mqttConfig = require('../../pageobjects/nodes/core/network/10-mqttconfig_page.js'); var httpNodeRoot = "/api";