All: Re-enable CI and test runner

The followings will be left in the root of the repo:

.eslintrc.json: Configuration file for eslint, which is responsible for linting all JS scripts
Gruntfile.js: Main configuration file for grunt
infra: Folder containing all supporting scipts
package.json: Test runner definition
tasks: Folder containing grunt integration
.travis.yml: Travis CI integration

Author: Gabriel Schulhof

ocf/test-suite/.eslintrc.json renamed to .eslintrc.json

@@ -20,8 +20,8 @@ var path = require( "path" );
 
 require( "load-grunt-config" )( grunt, {
 	configPath: [
-		path.join( __dirname, "build", "tasks", "options" ),
-		path.join( __dirname, "build", "tasks" )
+		path.join( __dirname, "infra", "build", "tasks", "options" ),
+		path.join( __dirname, "infra", "build", "tasks" )
 	],
 	init: true
 } );

ocf/test-suite/.travis.yml renamed to .travis.yml

@@ -22,9 +22,12 @@ module.exports = {
 		src: [ "Gruntfile.js", "build/**/*.js" ]
 	},
 	lib: {
-		src: [ "index.js", "lib/**/*.js" ]
+		src: [ "infra/**/*.js" ]
 	},
 	tests: {
-		src: [ "tests/**/*.js" ]
+		src: Object.keys( require( "../../../../package.json" ).versions )
+			.map( function( item ) {
+				return require( "path" ).join( item, "tests", "**", "*" );
+			} )
 	}
 };

ocf/test-suite/Gruntfile.js renamed to Gruntfile.js

@@ -162,15 +162,21 @@ var defaultEndpointOptions = {
 	spawn: spawn
 };
 
+if ( !( options.api || options.apiVersion ) ) {
+	throw new Error( "The options must contain both api and apiVersion" );
+}
+
+var testsBasePath = path.join( __dirname, "..", options.api, "tests", options.apiVersion );
+
 var actualOptions = {
 	client: _.extend( {}, defaultEndpointOptions, options.client || {} ),
 	server: _.extend( {}, defaultEndpointOptions, options.server || {} ),
 	single: _.extend( {}, defaultEndpointOptions, options.single || {} ),
 	tests: ( ( options.tests && Array.isArray( options.tests ) ) ?
 		_.map( options.tests, function( item ) {
-			return path.join( __dirname, "tests", item );
+			return path.join( testsBasePath, item );
 		} ) :
-		( glob.sync( path.join( __dirname, "tests", "*" ) ) ) ).map( path.normalize )
+		( glob.sync( path.join( testsBasePath, "*" ) ) ) ).map( path.normalize )
 };
 
 if ( actualOptions.tests.length === 0 ) {

README.md

@@ -1,13 +1,13 @@
 {
   "name": "iot-js-api",
   "description": "OCF JS API specifications and test suites",
-
-  "version": "1.0",
+  "main": "infra/index.js",
+  "version": "1.0.0",
   "versions": {
     "ocf": "oic1.1.0-0",
     "ble": "1.0",
     "board": "1.0",
-    "sensor": "1.0",
+    "sensor": "1.0"
   },
 
   "license": "Apache-2.0",
@@ -21,5 +21,21 @@
     "url": "https://github.com/01org/iot-js-api/issues"
   },
 
-  "homepage": "https://github.com/01org/iot-js-api#readme",
+  "devDependencies": {
+    "eslint-config-jquery": "0.1.2",
+    "grunt": "^0.4.5",
+    "grunt-eslint": "18.1.0",
+    "load-grunt-config": "^0.17.2",
+    "load-grunt-tasks": "^3.2.0"
+  },
+  "dependencies": {
+    "async": "^2.0.0-rc.4",
+    "glob": "^7.0.3",
+    "lodash": "^4.12.0",
+    "qunitjs": "^2.0.0-rc1",
+    "tmp": "0.0.28",
+    "uuid": "^2.0.2"
+  },
+
+  "homepage": "https://github.com/01org/iot-js-api#readme"
 }

ocf/test-suite/build/tasks/alias.js renamed to infra/build/tasks/alias.js

@@ -14,11 +14,11 @@
 
 module.exports = function( grunt ) {
 
-var _ = require( "lodash" ),
-	testSuite = require( "../index" );
-	path = require( "path" );
+var _ = require( "lodash" );
+var path = require( "path" );
+var testSuite = require( "../infra/index" );
 
-grunt.task.registerMultiTask( "iot-js-api-ocf", "Run the OCF test suite", function() {
+grunt.task.registerMultiTask( "iot-js-api", "Run a test suite", function() {
 	var done = this.async();
 
 	testSuite.defaultCallbacks.done = ( function( originalDone ) {