Merge pull request #11 from dimalev/js-tests

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

log4js/Gruntfile.js

@@ -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');
@@ -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

log4js/build.properties

@@ -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

log4js/package.json

@@ -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"
+  }
+}