Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move tests from java code to js karma based. add to travis checks #11

Merged
merged 1 commit into from
Apr 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions log4js/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,14 @@ grunt.initConfig({
livereload: true
}
}
}
},
karma: {
unit: {
configFile: 'src/test/karma.conf.js',
// browsers: ['Chrome'],
singleRun: true
}
}
});

grunt.loadNpmTasks('grunt-contrib-watch');
Expand All @@ -130,12 +137,14 @@ grunt.initConfig({
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-clean');

grunt.loadTasks('tasks');

/**
* Build task
* Run `grunt build` on the command line
* This will generate ZIP-Archive with all required artifacts.
*/
grunt.registerTask('build', ['copy:build', 'uglify', 'compress']
grunt.registerTask('build', ['copy:build', 'uglify', 'compress', 'karma']
);
/**
* Default task
Expand Down
1 change: 1 addition & 0 deletions log4js/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ tools.junit.version=4.3
tools.log4j.version=1.2.13
tools.rhino.version=1.6R5
tools.servlet-api.version=2.4
tools.dir=../tools/
version=1.0
82 changes: 44 additions & 38 deletions log4js/package.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
{
"name": "log4js",
"title": "Log4js - The Logging API for JavaScript",
"description": "Log4js - The Logging Framework for JavaScript",
"version": "1.0.0",
"main": "log4js/src/main/js/log4js.js",
"authors": [
"stritti (https://github.com/stritti)"
],
"repository": {
"type": "git",
"url": "https://github.com/stritti/log4js.git"
},
"keywords": [
"log",
"logging",
"log4js",
"log4j"
],
"license": "Apache License, Version 2.0",
"homepage": "http://stritti.github.io/log4js/",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-watch": "~0.5.3",
"grunt-contrib-compress": "^0.7.0",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-cssmin": "^0.9.0"
}
}
"name": "log4js",
"title": "Log4js - The Logging API for JavaScript",
"description": "Log4js - The Logging Framework for JavaScript",
"version": "1.0.0",
"main": "log4js/src/main/js/log4js.js",
"authors": [
"stritti (https://github.com/stritti)"
],
"repository": {
"type": "git",
"url": "https://github.com/stritti/log4js.git"
},
"keywords": [
"log",
"logging",
"log4js",
"log4j"
],
"license": "Apache License, Version 2.0",
"homepage": "http://stritti.github.io/log4js/",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"devDependencies": {
"chai": "^2.2.0",
"grunt": "~0.4.1",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-compress": "^0.7.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-cssmin": "^0.9.0",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-watch": "~0.5.3",
"karma": "^0.12.31",
"karma-firefox-launcher": "^0.1.4",
"karma-mocha": "^0.1.10",
"karma-spec-reporter": "0.0.18",
"mocha": "^2.2.1"
}
}

This file was deleted.

42 changes: 0 additions & 42 deletions log4js/src/test/java/de/berlios/log4js/js/AjaxAppenderTest.java

This file was deleted.

35 changes: 0 additions & 35 deletions log4js/src/test/java/de/berlios/log4js/js/AllTests.java

This file was deleted.

40 changes: 0 additions & 40 deletions log4js/src/test/java/de/berlios/log4js/js/BasicLayoutTest.java

This file was deleted.

47 changes: 0 additions & 47 deletions log4js/src/test/java/de/berlios/log4js/js/ConsoleAppenderTest.java

This file was deleted.

Loading