From 32d803e271fcdca0ad3fd9c247ae7e62b33eacdd Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 2 Oct 2021 18:37:42 -0700 Subject: [PATCH] Fix structure --- packages/mindplot/lib/mindplot.js | 2 +- packages/mindplot/test/javascript/lib/bootstrap.js | 1 - packages/mindplot/test/javascript/lib/core.js | 1 - packages/mindplot/test/javascript/lib/jquery.js | 1 - .../mindplot/test/javascript/lib/web2d.svg-min.js | 1 - .../{javascript/static => playground}/index.html | 3 +-- .../{javascript/static => playground}/layout.html | 0 .../test => playground/lib}/BalancedTestSuite.js | 2 +- .../static/test => playground/lib}/FreeTestSuite.js | 2 +- .../test => playground/lib}/SymmetricTestSuite.js | 2 +- .../static/test => playground/lib}/TestSuite.js | 2 +- .../static/test => playground/lib}/raphael-min.js | 0 .../test => playground/lib}/raphael-plugins.js | 0 .../static/test => playground/lib}/testLayout.js | 2 +- .../static/test => playground/lib}/testPalette.js | 2 +- .../{javascript/static => playground}/palette.html | 0 .../{javascript/static => playground}/sample.xml | 0 .../test/{javascript/static => playground}/utils.js | 0 packages/mindplot/webpack.playground.js | 13 ++++--------- 19 files changed, 12 insertions(+), 22 deletions(-) delete mode 120000 packages/mindplot/test/javascript/lib/bootstrap.js delete mode 120000 packages/mindplot/test/javascript/lib/core.js delete mode 120000 packages/mindplot/test/javascript/lib/jquery.js delete mode 120000 packages/mindplot/test/javascript/lib/web2d.svg-min.js rename packages/mindplot/test/{javascript/static => playground}/index.html (80%) rename packages/mindplot/test/{javascript/static => playground}/layout.html (100%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/BalancedTestSuite.js (99%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/FreeTestSuite.js (99%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/SymmetricTestSuite.js (99%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/TestSuite.js (99%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/raphael-min.js (100%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/raphael-plugins.js (100%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/testLayout.js (90%) rename packages/mindplot/test/{javascript/static/test => playground/lib}/testPalette.js (87%) rename packages/mindplot/test/{javascript/static => playground}/palette.html (100%) rename packages/mindplot/test/{javascript/static => playground}/sample.xml (100%) rename packages/mindplot/test/{javascript/static => playground}/utils.js (100%) diff --git a/packages/mindplot/lib/mindplot.js b/packages/mindplot/lib/mindplot.js index 8f590380..99cc9071 100644 --- a/packages/mindplot/lib/mindplot.js +++ b/packages/mindplot/lib/mindplot.js @@ -18,7 +18,7 @@ function mindplot() { define(['raphael'], (Raphael) => { global.Raphael = Raphael; }); - require('../test/javascript/static/test/raphael-plugins'); + require('../test/playground/lib/raphael-plugins'); // Bootsrap for styles require('./components/libraries/bootstrap/js/bootstrap.min'); diff --git a/packages/mindplot/test/javascript/lib/bootstrap.js b/packages/mindplot/test/javascript/lib/bootstrap.js deleted file mode 120000 index 2e289510..00000000 --- a/packages/mindplot/test/javascript/lib/bootstrap.js +++ /dev/null @@ -1 +0,0 @@ -../../../../../wise-editor/src/main/webapp/bootstrap/js/bootstrap.js \ No newline at end of file diff --git a/packages/mindplot/test/javascript/lib/core.js b/packages/mindplot/test/javascript/lib/core.js deleted file mode 120000 index b52f4cba..00000000 --- a/packages/mindplot/test/javascript/lib/core.js +++ /dev/null @@ -1 +0,0 @@ -../../../../../core-js/target/classes/core.js \ No newline at end of file diff --git a/packages/mindplot/test/javascript/lib/jquery.js b/packages/mindplot/test/javascript/lib/jquery.js deleted file mode 120000 index e2459f2d..00000000 --- a/packages/mindplot/test/javascript/lib/jquery.js +++ /dev/null @@ -1 +0,0 @@ -../../../../../wise-editor/src/main/webapp/js/jquery.js \ No newline at end of file diff --git a/packages/mindplot/test/javascript/lib/web2d.svg-min.js b/packages/mindplot/test/javascript/lib/web2d.svg-min.js deleted file mode 120000 index 33e91534..00000000 --- a/packages/mindplot/test/javascript/lib/web2d.svg-min.js +++ /dev/null @@ -1 +0,0 @@ -../../../../../web2d/target/classes/web2d.svg-min.js \ No newline at end of file diff --git a/packages/mindplot/test/javascript/static/index.html b/packages/mindplot/test/playground/index.html similarity index 80% rename from packages/mindplot/test/javascript/static/index.html rename to packages/mindplot/test/playground/index.html index 9102a66b..ec4feeba 100644 --- a/packages/mindplot/test/javascript/static/index.html +++ b/packages/mindplot/test/playground/index.html @@ -7,10 +7,9 @@
-

Testing

+

Mindplot Playground

diff --git a/packages/mindplot/test/javascript/static/layout.html b/packages/mindplot/test/playground/layout.html similarity index 100% rename from packages/mindplot/test/javascript/static/layout.html rename to packages/mindplot/test/playground/layout.html diff --git a/packages/mindplot/test/javascript/static/test/BalancedTestSuite.js b/packages/mindplot/test/playground/lib/BalancedTestSuite.js similarity index 99% rename from packages/mindplot/test/javascript/static/test/BalancedTestSuite.js rename to packages/mindplot/test/playground/lib/BalancedTestSuite.js index 3bad15c1..fa3d8ac9 100644 --- a/packages/mindplot/test/javascript/static/test/BalancedTestSuite.js +++ b/packages/mindplot/test/playground/lib/BalancedTestSuite.js @@ -17,7 +17,7 @@ */ const TestSuite = require('./TestSuite').default; -const Mindplot = require('../../../../lib/mindplot'); +const Mindplot = require('../../../lib/mindplot'); const mindplot = Mindplot(); const BalancedTestSuite = new Class({ diff --git a/packages/mindplot/test/javascript/static/test/FreeTestSuite.js b/packages/mindplot/test/playground/lib/FreeTestSuite.js similarity index 99% rename from packages/mindplot/test/javascript/static/test/FreeTestSuite.js rename to packages/mindplot/test/playground/lib/FreeTestSuite.js index 3756e36e..983b58d0 100644 --- a/packages/mindplot/test/javascript/static/test/FreeTestSuite.js +++ b/packages/mindplot/test/playground/lib/FreeTestSuite.js @@ -16,7 +16,7 @@ * limitations under the License. */ const TestSuite = require('./TestSuite').default; -const Mindplot = require('../../../../lib/mindplot'); +const Mindplot = require('../../../lib/mindplot'); const mindplot = Mindplot(); const FreeTestSuite = new Class({ diff --git a/packages/mindplot/test/javascript/static/test/SymmetricTestSuite.js b/packages/mindplot/test/playground/lib/SymmetricTestSuite.js similarity index 99% rename from packages/mindplot/test/javascript/static/test/SymmetricTestSuite.js rename to packages/mindplot/test/playground/lib/SymmetricTestSuite.js index 7783140d..b47bc693 100644 --- a/packages/mindplot/test/javascript/static/test/SymmetricTestSuite.js +++ b/packages/mindplot/test/playground/lib/SymmetricTestSuite.js @@ -16,7 +16,7 @@ * limitations under the License. */ const TestSuite = require('./TestSuite').default; -const Mindplot = require('../../../../lib/mindplot'); +const Mindplot = require('../../../lib/mindplot'); const mindplot = Mindplot(); const SymmetricTestSuite = new Class({ diff --git a/packages/mindplot/test/javascript/static/test/TestSuite.js b/packages/mindplot/test/playground/lib/TestSuite.js similarity index 99% rename from packages/mindplot/test/javascript/static/test/TestSuite.js rename to packages/mindplot/test/playground/lib/TestSuite.js index 82bf78ce..0732a966 100644 --- a/packages/mindplot/test/javascript/static/test/TestSuite.js +++ b/packages/mindplot/test/playground/lib/TestSuite.js @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -const Mindplot = require('../../../../lib/mindplot'); +const Mindplot = require('../../../lib/mindplot'); const mindplot = Mindplot(); const TestSuite = new Class({ diff --git a/packages/mindplot/test/javascript/static/test/raphael-min.js b/packages/mindplot/test/playground/lib/raphael-min.js similarity index 100% rename from packages/mindplot/test/javascript/static/test/raphael-min.js rename to packages/mindplot/test/playground/lib/raphael-min.js diff --git a/packages/mindplot/test/javascript/static/test/raphael-plugins.js b/packages/mindplot/test/playground/lib/raphael-plugins.js similarity index 100% rename from packages/mindplot/test/javascript/static/test/raphael-plugins.js rename to packages/mindplot/test/playground/lib/raphael-plugins.js diff --git a/packages/mindplot/test/javascript/static/test/testLayout.js b/packages/mindplot/test/playground/lib/testLayout.js similarity index 90% rename from packages/mindplot/test/javascript/static/test/testLayout.js rename to packages/mindplot/test/playground/lib/testLayout.js index e30f516f..3232f844 100644 --- a/packages/mindplot/test/javascript/static/test/testLayout.js +++ b/packages/mindplot/test/playground/lib/testLayout.js @@ -1,4 +1,4 @@ -const Mindplot = require('../../../../lib/mindplot'); +const Mindplot = require('../../../lib/mindplot'); global.mindplot = Mindplot(); const TestSuite = require('./TestSuite').default; diff --git a/packages/mindplot/test/javascript/static/test/testPalette.js b/packages/mindplot/test/playground/lib/testPalette.js similarity index 87% rename from packages/mindplot/test/javascript/static/test/testPalette.js rename to packages/mindplot/test/playground/lib/testPalette.js index 67608c8f..3bb70c99 100644 --- a/packages/mindplot/test/javascript/static/test/testPalette.js +++ b/packages/mindplot/test/playground/lib/testPalette.js @@ -1,4 +1,4 @@ -const Mindplot = require('../../../../lib/mindplot'); +const Mindplot = require('../../../lib/mindplot'); const mindplot = Mindplot(); window.addEventListener('load', function (e) { diff --git a/packages/mindplot/test/javascript/static/palette.html b/packages/mindplot/test/playground/palette.html similarity index 100% rename from packages/mindplot/test/javascript/static/palette.html rename to packages/mindplot/test/playground/palette.html diff --git a/packages/mindplot/test/javascript/static/sample.xml b/packages/mindplot/test/playground/sample.xml similarity index 100% rename from packages/mindplot/test/javascript/static/sample.xml rename to packages/mindplot/test/playground/sample.xml diff --git a/packages/mindplot/test/javascript/static/utils.js b/packages/mindplot/test/playground/utils.js similarity index 100% rename from packages/mindplot/test/javascript/static/utils.js rename to packages/mindplot/test/playground/utils.js diff --git a/packages/mindplot/webpack.playground.js b/packages/mindplot/webpack.playground.js index 00c1dd74..c8c9f694 100644 --- a/packages/mindplot/webpack.playground.js +++ b/packages/mindplot/webpack.playground.js @@ -5,8 +5,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); /** @type {import('webpack').Configuration} */ module.exports = { entry: { - palette: path.resolve(__dirname, './test/javascript/static/test/testPalette'), - layout: path.resolve(__dirname, './test/javascript/static/test/testLayout'), + palette: path.resolve(__dirname, './test/playground/lib/testPalette'), + layout: path.resolve(__dirname, './test/playground/lib/testLayout'), }, output: { path: path.resolve(__dirname, 'dist', 'test'), @@ -40,17 +40,12 @@ module.exports = { plugins: [ new CleanWebpackPlugin(), new HtmlWebpackPlugin({ - template: 'test/javascript/static/index.html', - }), - new HtmlWebpackPlugin({ - chunks: ['palette'], - filename: 'palette', - template: 'test/javascript/static/palette.html', + template: 'test/playground/index.html', }), new HtmlWebpackPlugin({ chunks: ['layout'], filename: 'layout', - template: 'test/javascript/static/layout.html', + template: 'test/playground/layout.html', }), ], };