github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Java tests runner

Browse Source 
* Print Gradle version used for Java tests during build
* Allow Java tests to be run from any directory
* Simplify Promise wrapping in Java tests runner
* Minor improvements
This commit is contained in:
Raphael von der Grün 2018-06-13 16:09:08 +02:00
parent 83ad646734
commit 032d1fa9cb
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -23,7 +23,7 @@
"unit-tests": "jasmine --config=spec/unit/jasmine.json", "unit-tests": "jasmine --config=spec/unit/jasmine.json",
"cover": "istanbul cover --root bin --print detail jasmine -- --config=spec/unit/jasmine.json", "cover": "istanbul cover --root bin --print detail jasmine -- --config=spec/unit/jasmine.json",
"e2e-tests": "jasmine --config=spec/e2e/jasmine.json", "e2e-tests": "jasmine --config=spec/e2e/jasmine.json",
"java-unit-tests": "cd test && node run_java_unit_tests.js && cd ..", "java-unit-tests": "node test/run_java_unit_tests.js",
"eslint": "eslint bin spec test" "eslint": "eslint bin spec test"
}, },
"author": "Apache Software Foundation", "author": "Apache Software Foundation",

32
test/run_java_unit_tests.js
View File

@ -22,26 +22,16 @@
var Q = require('q'); var Q = require('q');
var path = require('path'); var path = require('path');
var superspawn = require('cordova-common').superspawn; var superspawn = require('cordova-common').superspawn;
// First we make sure the gradlew helper file is built and ready.
var GradleBuilder = require('../bin/templates/cordova/lib/builders/GradleBuilder'); var GradleBuilder = require('../bin/templates/cordova/lib/builders/GradleBuilder');
var builder = new GradleBuilder(__dirname);
var needs_gradlew_built = builder.runGradleWrapper('gradle');
if (!needs_gradlew_built) { Q.resolve()
// Due to interface of gradle builder, if the gradlew file already exists, `runGradleWrapper` returns undefined. .then(_ => console.log('Preparing Gradle wrapper for Java unit tests.'))
// In this case, we will fill the gap and create a resolved promise here now, this way the next bit of code .then(_ => new GradleBuilder(__dirname).runGradleWrapper('gradle'))
// will jump straight to running the tests .then(_ => gradlew('--version'))
// TODO: maybe this should be done in GradleBuilder `runGradleWrapper` method instead?
needs_gradlew_built = Q.fcall(function () { return true; });
}
needs_gradlew_built.then(function () { .then(_ => console.log('Gradle wrapper is ready. Running tests now.'))
console.log('Gradle wrapper is ready. Running tests now.'); .then(_ => gradlew('test'))
return superspawn.spawn(path.join(__dirname, 'gradlew'), ['test'], {stdio: 'inherit'}); .then(_ => console.log('Java unit tests completed successfully.'));
}).then(function () {
console.log('Tests completed successfully.');
});
process.on('unhandledRejection', err => { process.on('unhandledRejection', err => {
// If err has a stderr property, we have seen the message already // If err has a stderr property, we have seen the message already
@ -49,3 +39,11 @@ process.on('unhandledRejection', err => {
console.error('JAVA UNIT TESTS FAILED!'); console.error('JAVA UNIT TESTS FAILED!');
process.exitCode = err.code || 1; process.exitCode = err.code || 1;
}); });
function gradlew () {
const wrapperPath = path.join(__dirname, 'gradlew');
return superspawn.spawn(wrapperPath, Array.from(arguments), {
stdio: 'inherit',
cwd: __dirname
});
}