POLYGENE-255 - Fixed JMX problems in Command Line AppType in Yeoman generator.

niclash · niclash · commit 85a37fdc1c07 · 2017-06-17T09:26:41.000+08:00
Signed-off-by: niclas &lt;niclas@hedhman.org&gt;
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl
@@ -53,6 +53,10 @@ if( polygene.caching !== "None" ) {
 }
     if( polygene.metrics !== "None" ) {
 %>  implementation "org.apache.polygene.extensions:org.apache.polygene.extension.metrics-<%= polygene.metrics.toLowerCase() %>:$polygeneVersion"
+<%
+    }
+if( polygene.hasFeature('jmx' ) ) {
+%>  implementation "org.apache.polygene.libraries:org.apache.polygene.library.jmx:$polygeneVersion"
 <%
     }
 if( polygene.hasFeature('envisage' ) ) {
diff --git a/tools/generator-polygene/test/generator_test.js b/tools/generator-polygene/test/generator_test.js
@@ -22,10 +22,13 @@ var assert = require('yeoman-assert');
 var shell = require('shelljs');
 
 //See http://yeoman.io/authoring/testing.html
+var restApiAppType = "Rest API";
+var commandLineAppType = "Command Line";
+var defaultAppType = restApiAppType;
 
 var appTypes = [
-    "Rest API",
-    'Command Line'
+    restApiAppType,
+    commandLineAppType
 ];
 
 var entityStores = [
@@ -70,17 +73,25 @@ var featuresset = [
     [],
     ['jmx'],
     ['mixin scripting'],
-    ['security'],
     ['jmx', 'mixin scripting'],
-    ['jmx', 'scripting'],
-    ['mixin scripting', 'scripting'],
-    ['jmx', 'mixin scripting', 'scripting']
+    ['security'],
+    ['jmx', 'security'],
+    ['mixin scripting', 'security'],
+    ['jmx', 'mixin scripting', 'security'],
+    ['envisage'],
+    ['jmx', 'envisage'],
+    ['mixin scripting', 'envisage'],
+    ['jmx', 'mixin scripting', 'envisage'],
+    ['security', 'envisage'],
+    ['jmx', 'security', 'envisage'],
+    ['mixin scripting', 'security', 'envisage'],
+    ['jmx', 'mixin scripting', 'security', 'envisage']
 ];
 
 // test with all defaults first.
 test();
 
-if(process.env.TEST_ALL === 'yes') {
+if (process.env.TEST_ALL === 'yes') {
     // All Tests !!!!
     appTypes.forEach(function (appType) {
         entityStores.forEach(function (entitystore) {
@@ -102,23 +113,23 @@ if(process.env.TEST_ALL === 'yes') {
     });
 
     entityStores.forEach(function (entityStore) {
-        test("Rest API", entityStore, "Rdf", "Memcache", "Codahale", "[]");
+        test(defaultAppType, entityStore, "Rdf", "Memcache", "Codahale", "[]");
     });
 
     indexings.forEach(function (indexing) {
-        test("Rest API", "Memory", indexing, "Memcache", "Codahale", "[]");
+        test(defaultAppType, "Memory", indexing, "Memcache", "Codahale", "[]");
     });
 
     cachings.forEach(function (caching) {
-        test("Rest API", "Memory", "Rdf", caching, "Codahale", "[]");
+        test(defaultAppType, "Memory", "Rdf", caching, "Codahale", "[]");
     });
 
     metricses.forEach(function (metrics) {
-        test("Rest API", "Memory", "Rdf", "Memcache", metrics, "[]");
+        test(defaultAppType, "Memory", "Rdf", "Memcache", metrics, "[]");
     });
 
     featuresset.forEach(function (feature) {
-        test("Rest API", "Memory", "Rdf", "Memcache", "Codahale", feature);
+        test(defaultAppType, "Memory", "Rdf", "Memcache", "Codahale", feature);
     });
 }
 
@@ -129,13 +140,13 @@ function test(appType, entityStore, indexing, caching, metrics, features) {
             + indexing + ' Indexing - '
             + caching + ' Caching - '
             + metrics + ' Metrics';
-        if(features && features.length > 0) {
+        if (features && features.length > 0) {
             testName += ' - ' + features.toString().replace(new RegExp(',', 'g'), ' - ');
         }
         var testDirName = testName.replace(new RegExp(' - ', 'g'), '_').replace(new RegExp(' ', 'g'), '_');
         it(testName,
             function () {
-                console.log( "\n\nTest: " + testName );
+                console.log("\n\nTest: " + testName);
                 this.timeout(60000);
                 return helpers.run(path.join(__dirname, '../app'))
                     .inDir(path.join(__dirname, '../build/npm-test/' + testDirName))

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ if( polygene.caching !== "None" ) {`
`53`	`53`	`}`
`54`	`54`	`if( polygene.metrics !== "None" ) {`
`55`	`55`	`%> implementation "org.apache.polygene.extensions:org.apache.polygene.extension.metrics-<%= polygene.metrics.toLowerCase() %>:$polygeneVersion"`
	`56`	`+<%`
	`57`	`+ }`
	`58`	`+if( polygene.hasFeature('jmx' ) ) {`
	`59`	`+%> implementation "org.apache.polygene.libraries:org.apache.polygene.library.jmx:$polygeneVersion"`
`56`	`60`	`<%`
`57`	`61`	`}`
`58`	`62`	`if( polygene.hasFeature('envisage' ) ) {`