From c67043f1ed3eed5d368f583dac71b8a57fc4abc2 Mon Sep 17 00:00:00 2001
From: An Ko <an@cyan.io>
Date: Mon, 3 Nov 2014 15:52:34 +0100
Subject: [PATCH 1/4] Receive xrandr & dpms exts correctly in tests

This makes tests pass that were failing with null reference errors.

`XClient.require` was passing the callback function to `requireExt`,
which called it with parameters `null, ext` on success. The callback
itself seemed to assume it will get only one parameter, which is either
the extension on an error, hence why it tried to call methods on a
`null`.
---
 test-runner.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-runner.js b/test-runner.js
index 13ce5f0..a94b50f 100644
--- a/test-runner.js
+++ b/test-runner.js
@@ -15,8 +15,8 @@ var mocha = new Mocha({
 // 2 - dpms version is 1.1.
 // 3 - to be dpms capable.
 var run_dpms_test = function(X, cb) {
-    X.require('dpms', function(ext) {
-        if (!util.isError(ext)) {
+    X.require('dpms', function(err, ext) {
+        if (!util.isError(err)) {
             dpms = ext;
             dpms.GetVersion(undefined, undefined, function(err, version) {
                 if (!err && version[0] === 1 && version[1] === 1) {
@@ -42,8 +42,8 @@ var run_xtest_test = function(X, cb) {
 };
 
 var run_randr_test = function(X, cb) {
-    X.require('randr', function(ext) {
-        if (!util.isError(ext)) {
+    X.require('randr', function(err, ext) {
+        if (!util.isError(err)) {
             randr = ext;
             randr.QueryVersion(1, 2, function(err, version) {
                 if (err) {

From 6d76962bb2e020c591d943e42a63361d2690b5d5 Mon Sep 17 00:00:00 2001
From: An Ko <an@cyan.io>
Date: Mon, 3 Nov 2014 16:01:05 +0100
Subject: [PATCH 2/4] Correspondingly rename xtest callback param

The first parameter is the error param after all.

The test logic is unchanged.
---
 test-runner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-runner.js b/test-runner.js
index a94b50f..4ada15a 100644
--- a/test-runner.js
+++ b/test-runner.js
@@ -35,8 +35,8 @@ var run_dpms_test = function(X, cb) {
 };
 
 var run_xtest_test = function(X, cb) {
-    X.require('xtest', function(ext) {
-        if (!util.isError(ext)) cb(true);
+    X.require('xtest', function(err) {
+        if (!util.isError(err)) cb(true);
         else cb(false);
     });
 };

From 19b937094b211372601ad9f4a12338ac73ffd527 Mon Sep 17 00:00:00 2001
From: An Ko <an@cyan.io>
Date: Mon, 3 Nov 2014 16:03:58 +0100
Subject: [PATCH 3/4] Assign to local vars instead of globals

These were being assigned to globals for some reason.

The tests return the same results when they're local, so I'll assume
this was a typo.
---
 test-runner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-runner.js b/test-runner.js
index 4ada15a..a8cf9b0 100644
--- a/test-runner.js
+++ b/test-runner.js
@@ -17,7 +17,7 @@ var mocha = new Mocha({
 var run_dpms_test = function(X, cb) {
     X.require('dpms', function(err, ext) {
         if (!util.isError(err)) {
-            dpms = ext;
+            var dpms = ext;
             dpms.GetVersion(undefined, undefined, function(err, version) {
                 if (!err && version[0] === 1 && version[1] === 1) {
                     dpms.Capable(function(err, capable) {
@@ -44,7 +44,7 @@ var run_xtest_test = function(X, cb) {
 var run_randr_test = function(X, cb) {
     X.require('randr', function(err, ext) {
         if (!util.isError(err)) {
-            randr = ext;
+            var randr = ext;
             randr.QueryVersion(1, 2, function(err, version) {
                 if (err) {
                     cb(false);

From 52a8739daf90192390cf88cf15aa0864133baaac Mon Sep 17 00:00:00 2001
From: An Ko <an@cyan.io>
Date: Mon, 3 Nov 2014 16:43:37 +0100
Subject: [PATCH 4/4] Check for errors directly instead of with isError

---
 test-runner.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test-runner.js b/test-runner.js
index a8cf9b0..2b59d62 100644
--- a/test-runner.js
+++ b/test-runner.js
@@ -2,7 +2,6 @@ var x11 = require('./lib');
 var Mocha = require('mocha');
 var fs = require('fs');
 var path = require('path');
-var util = require('util');
 var async = require('async');
 
 var mocha = new Mocha({
@@ -16,7 +15,7 @@ var mocha = new Mocha({
 // 3 - to be dpms capable.
 var run_dpms_test = function(X, cb) {
     X.require('dpms', function(err, ext) {
-        if (!util.isError(err)) {
+        if (!err) {
             var dpms = ext;
             dpms.GetVersion(undefined, undefined, function(err, version) {
                 if (!err && version[0] === 1 && version[1] === 1) {
@@ -36,14 +35,14 @@ var run_dpms_test = function(X, cb) {
 
 var run_xtest_test = function(X, cb) {
     X.require('xtest', function(err) {
-        if (!util.isError(err)) cb(true);
+        if (!err) cb(true);
         else cb(false);
     });
 };
 
 var run_randr_test = function(X, cb) {
     X.require('randr', function(err, ext) {
-        if (!util.isError(err)) {
+        if (!err) {
             var randr = ext;
             randr.QueryVersion(1, 2, function(err, version) {
                 if (err) {