xultestrunner 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/xpcomcore/app/application.ini

@@ -1,7 +1,7 @@
 [App]
 Name=XULTestRunner
-Version=0.3.0
-BuildID=aac9a8db-3c4c-43a3-84a8-cb1979f87657
+Version=0.4.0
+BuildID=7724d840-1a29-4939-a796-ad00546a110e
 ID=XULTestRunner@conflagrationjs.org
 Vendor=Conflagration JS
 

data/xpcomcore/app/chrome/chrome.manifest

@@ -1 +1 @@
-content xultestrunner file:content/
+content xultestrunner content/

data/xpcomcore/app/chrome/content/scripts/xul_test_runner.js

@@ -0,0 +1,110 @@
+XPCOMCore({scope: this});
+
+function XULTestRunner(argv, outputWindow) {
+  this.options = {};
+  this.argv = argv.concat([]);
+  this.outputWindow = outputWindow;
+  // FIXME - CurWorkD is busted because we get called from LaunchServices on a Mac, I guess.
+  // so use whatever ENV['PWD'] happens to be instead.
+  this.curDir = new XPCBuiltins.nsILocalFile($ENV.get('PWD'));
+}
+
+// TODO - add real at exit hooks into XPCOMCore
+XULTestRunner.atExit = function() {};
+
+// TODO - add some kind of optionparser class to
+// XPCOMCore and also figure out why I'm getting
+// -foreground in argv.
+// TODO - when XPCOMCore gets a Shell object, just
+// use glob and allow for specifying a test pattern
+// rather than a test file or a test dir
+// TODO - also this falls all over itself when handling
+// absolute vs. relative paths. wee.
+XULTestRunner.prototype = {
+  testFileMatcher: /_test\.js$/,
+  
+  run: function() {
+    this._parseArgv();
+    this._loadTests();
+  },
+  
+  _loadTests: function() {
+    this._checkOptions();
+    this._addLibs();
+    this._requireTests();
+  },
+  
+  _addLibs: function() {
+    if (!this.options.testLibs) { return true; }
+    var libDir = this.curDir.clone();
+    libDir.QueryInterface($Ci.nsILocalFile);
+    libDir.appendRelativePath(this.options.testLibs);
+    $LOAD_PATH.push(libDir.path);
+  },
+
+  _requireTests: function() {
+    var testFiles = this._collectTestFiles();
+    puts("Requiring tests: " + testFiles);
+    testFiles.forEach(function(filePath) {
+      load(filePath);
+    });
+    XULTestRunner.atExit();
+  },
+  
+  _collectTestFiles: function() {
+    if (this.options.testFile) {
+      var testFile = this.curDir.clone();
+      testFile.QueryInterface($Ci.nsILocalFile);
+      testFile.appendRelativePath(this.options.testFile);
+      return [testFile];
+    } else {
+      var rootDir = this.curDir.clone();
+      rootDir.QueryInterface($Ci.nsILocalFile);
+      rootDir.appendRelativePath(this.options.testDir);
+      return this._findTestsFromDir(rootDir);
+    }
+  },
+  
+  _findTestsFromDir: function(rootDir) {
+    var testFiles = [];
+    var entries = rootDir.directoryEntries;
+    while (entries.hasMoreElements()) {
+      var entry = entries.getNext().QueryInterface($Ci.nsIFile);
+      if (entry.isDirectory()) {
+        testFiles = testFiles.concat(this._findTestsFromDir(entry));
+      } else if (this.testFileMatcher.test(entry.path)) {
+        testFiles.push(entry.path);
+      }
+    }
+    return testFiles;
+  },
+  
+  _checkOptions: function() {
+    if (this.options.testDir && this.options.testFile) {
+      throw("Only one of -testDir or -testFile may be specified.");
+    } else if (!this.options.testDir && !this.options.testFile) {
+      throw("-testDir or -testFile must be specified.");
+    } 
+  },
+  
+  // TODO - refactor this shitty while/switch loop
+  _parseArgv: function() {
+    var arg = null;
+    while (arg = this.argv.shift()) {
+      switch (arg) 
+      {
+      case "-testDir":
+        this.options.testDir = this.argv.shift();
+        break;
+      case "-testFile":
+        this.options.testFile = this.argv.shift();
+        break;
+      case "-testLibs":
+        this.options.testLibs = this.argv.shift();
+        break;
+      default:
+        puts("Got unknown argument: " + arg);
+      }
+    } // while
+  }
+}

data/xpcomcore/app/chrome/content/xul/main_window.xul

@@ -1,6 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<window id="main" title="My App" width="300" height="300" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <caption label="Hello World from Xultestrunner"/>
+<window id="main" title="XUL Test Runner" width="800" height="600" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="text/javascript" src="../scripts/xul_test_runner.js" />
+  <script type="text/javascript">
+    try {
+      var testRunner = new XULTestRunner($ARGV, this);
+      testRunner.run();
+    } catch (e) {
+      puts("Got an exception while running tests: " + e);
+    }
+    
+    // TODO - move some of this into XPCOMCore
+    var appStartup = $Cc["@mozilla.org/toolkit/app-startup;1"].getService($Ci.nsIAppStartup);
+    appStartup.quit($Ci.nsIAppStartup.eForceQuit);
+  </script>
 </window>

data/xpcomcore/app/defaults/preferences/prefs.js

@@ -1,5 +1,5 @@
 pref("toolkit.defaultChromeURI", "chrome://xultestrunner/content/xul/main_window.xul");
-pref("toolkit.defaultChromeFeatures", "chrome,menubar,resizable");
+pref("toolkit.defaultChromeFeatures", "chrome,menubar,status,resizable");
 pref("javascript.options.showInConsole", true);
 // TODO - only disable caching in development mode.
 pref("nglayout.debug.disable_xul_cache", true);

data/xpcomcore/stub_runners/XULTestRunner.app/Contents/Info.plist

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>stub_runner</string>
+	<key>CFBundleGetInfoString</key>
+	<string>XULTestRunner 0.4.0 © 2009 Conflagration JS</string>
+	<key>CFBundleIconFile</key>
+	<string>xultestrunner</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.conflagrationjs.xultestrunner</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>XULTestRunner</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.4.0</string>
+	<key>CFBundleSignature</key>
+	<string>XPCC</string>
+	<key>CFBundleVersion</key>
+	<string>0.4.0</string>
+	<key>CGDisableCoalescedUpdates</key>
+	<true/>
+	<key>NSAppleScriptEnabled</key>
+	<true/>
+</dict>
+</plist>

data/xpcomcore/stub_runners/XULTestRunner.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

data/xultestrunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xultestrunner}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabriel Gironda"]
-  s.date = %q{2009-10-11}
+  s.date = %q{2009-10-18}
   s.default_executable = %q{xultest}
   s.description = %q{XUL based test runner for running your JS unit tests.}
   s.email = %q{contact@gironda.org}
@@ -31,9 +31,16 @@ Gem::Specification.new do |s|
      "test/xultestrunner_test.rb",
      "xpcomcore/app/application.ini",
      "xpcomcore/app/chrome/chrome.manifest",
+     "xpcomcore/app/chrome/content/scripts/xul_test_runner.js",
      "xpcomcore/app/chrome/content/xul/main_window.xul",
+     "xpcomcore/app/chrome/icons/default/default.png",
      "xpcomcore/app/components/bootstrapper.js",
      "xpcomcore/app/defaults/preferences/prefs.js",
+     "xpcomcore/stub_runners/XULTestRunner.app/Contents/Info.plist",
+     "xpcomcore/stub_runners/XULTestRunner.app/Contents/MacOS/stub_runner",
+     "xpcomcore/stub_runners/XULTestRunner.app/Contents/PkgInfo",
+     "xpcomcore/stub_runners/XULTestRunner.app/Contents/Resources/.gitignore",
+     "xpcomcore/stub_runners/XULTestRunner.app/Contents/Resources/xultestrunner.icns",
      "xultestrunner.gemspec"
   ]
   s.homepage = %q{http://github.com/gabrielg/xultestrunner}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xultestrunner
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gabriel Gironda
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -05:00
+date: 2009-10-18 00:00:00 -05:00
 default_executable: xultest
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,9 +44,16 @@ files:
 - test/xultestrunner_test.rb
 - xpcomcore/app/application.ini
 - xpcomcore/app/chrome/chrome.manifest
+- xpcomcore/app/chrome/content/scripts/xul_test_runner.js
 - xpcomcore/app/chrome/content/xul/main_window.xul
+- xpcomcore/app/chrome/icons/default/default.png
 - xpcomcore/app/components/bootstrapper.js
 - xpcomcore/app/defaults/preferences/prefs.js
+- xpcomcore/stub_runners/XULTestRunner.app/Contents/Info.plist
+- xpcomcore/stub_runners/XULTestRunner.app/Contents/MacOS/stub_runner
+- xpcomcore/stub_runners/XULTestRunner.app/Contents/PkgInfo
+- xpcomcore/stub_runners/XULTestRunner.app/Contents/Resources/.gitignore
+- xpcomcore/stub_runners/XULTestRunner.app/Contents/Resources/xultestrunner.icns
 - xultestrunner.gemspec
 has_rdoc: true
 homepage: http://github.com/gabrielg/xultestrunner