Browse Source

Merge pull request #4467 from Snuffleupagus/test-braces

Fix coding style in /test
Tim van der Meij 11 years ago
parent
commit
c7fe33a081
  1. 24
      test/driver.js
  2. 3
      test/unit/crypto_spec.js
  3. 15
      test/unit/font_spec.js
  4. 12
      test/unit/function_spec.js
  5. 2
      test/unit/parser_spec.js
  6. 6
      test/unit/stream_spec.js
  7. 12
      test/unit/testreporter.js

24
test/driver.js

@ -87,15 +87,17 @@ function cleanup() {
// Clear out all the stylesheets since a new one is created for each font. // Clear out all the stylesheets since a new one is created for each font.
while (document.styleSheets.length > 0) { while (document.styleSheets.length > 0) {
var styleSheet = document.styleSheets[0]; var styleSheet = document.styleSheets[0];
while (styleSheet.cssRules.length > 0) while (styleSheet.cssRules.length > 0) {
styleSheet.deleteRule(0); styleSheet.deleteRule(0);
}
var ownerNode = styleSheet.ownerNode; var ownerNode = styleSheet.ownerNode;
ownerNode.parentNode.removeChild(ownerNode); ownerNode.parentNode.removeChild(ownerNode);
} }
var guard = document.getElementById('content-end'); var guard = document.getElementById('content-end');
var body = document.body; var body = document.body;
while (body.lastChild !== guard) while (body.lastChild !== guard) {
body.removeChild(body.lastChild); body.removeChild(body.lastChild);
}
// Wipe out the link to the pdfdoc so it can be GC'ed. // Wipe out the link to the pdfdoc so it can be GC'ed.
for (var i = 0; i < manifest.length; i++) { for (var i = 0; i < manifest.length; i++) {
@ -107,10 +109,12 @@ function cleanup() {
} }
function exceptionToString(e) { function exceptionToString(e) {
if (typeof e !== 'object') if (typeof e !== 'object') {
return String(e); return String(e);
if (!('message' in e)) }
if (!('message' in e)) {
return JSON.stringify(e); return JSON.stringify(e);
}
return e.message + ('stack' in e ? ' at ' + e.stack.split('\n')[0] : ''); return e.message + ('stack' in e ? ' at ' + e.stack.split('\n')[0] : '');
} }
@ -198,8 +202,8 @@ SimpleTextLayerBuilder.prototype = {
var ctx = this.ctx, viewport = this.viewport; var ctx = this.ctx, viewport = this.viewport;
// vScale and hScale already contain the scaling to pixel units // vScale and hScale already contain the scaling to pixel units
var fontHeight = geom.fontSize * Math.abs(geom.vScale); var fontHeight = geom.fontSize * Math.abs(geom.vScale);
var fontAscent = geom.ascent ? geom.ascent * fontHeight : var fontAscent = (geom.ascent ? geom.ascent * fontHeight :
geom.descent ? (1 + geom.descent) * fontHeight : fontHeight; (geom.descent ? (1 + geom.descent) * fontHeight : fontHeight));
ctx.save(); ctx.save();
ctx.beginPath(); ctx.beginPath();
ctx.strokeStyle = 'red'; ctx.strokeStyle = 'red';
@ -429,13 +433,15 @@ function checkScrolling() {
} }
function log(str) { function log(str) {
if (stdout.insertAdjacentHTML) if (stdout.insertAdjacentHTML) {
stdout.insertAdjacentHTML('BeforeEnd', str); stdout.insertAdjacentHTML('BeforeEnd', str);
else } else {
stdout.innerHTML += str; stdout.innerHTML += str;
}
if (str.lastIndexOf('\n') >= 0) if (str.lastIndexOf('\n') >= 0) {
checkScrolling(); checkScrolling();
} }
}
})(); // DriverClosure })(); // DriverClosure

3
test/unit/crypto_spec.js

@ -9,8 +9,9 @@ describe('crypto', function() {
function string2binary(s) { function string2binary(s) {
var n = s.length, i; var n = s.length, i;
var result = new Uint8Array(n); var result = new Uint8Array(n);
for (i = 0; i < n; ++i) for (i = 0; i < n; ++i) {
result[i] = s.charCodeAt(i) % 0xFF; result[i] = s.charCodeAt(i) % 0xFF;
}
return result; return result;
} }

15
test/unit/font_spec.js

@ -10,8 +10,9 @@ describe('font', function() {
var line = ''; var line = '';
for (var i = 0, ii = bytes.length; i < ii; ++i) { for (var i = 0, ii = bytes.length; i < ii; ++i) {
var b = bytes[i].toString(16); var b = bytes[i].toString(16);
if (b.length < 2) if (b.length < 2) {
b = '0' + b; b = '0' + b;
}
line += b.toString(16); line += b.toString(16);
} }
return line; return line;
@ -34,12 +35,17 @@ describe('font', function() {
fontData.push(parseInt(hex, 16)); fontData.push(parseInt(hex, 16));
} }
var bytes = new Uint8Array(fontData); var bytes = new Uint8Array(fontData);
fontData = {getBytes: function() { return bytes; }}; fontData = {
getBytes: function() {
return bytes;
}
};
function bytesToString(bytesArray) { function bytesToString(bytesArray) {
var str = ''; var str = '';
for (var i = 0, ii = bytesArray.length; i < ii; i++) for (var i = 0, ii = bytesArray.length; i < ii; i++) {
str += String.fromCharCode(bytesArray[i]); str += String.fromCharCode(bytesArray[i]);
}
return str; return str;
} }
@ -70,8 +76,9 @@ describe('font', function() {
index = new CFFIndex(); index = new CFFIndex();
var longName = []; var longName = [];
for (var i = 0; i < 129; i++) for (var i = 0; i < 129; i++) {
longName.push(0); longName.push(0);
}
index.add(longName); index.add(longName);
names = parser.parseNameIndex(index); names = parser.parseNameIndex(index);
expect(names[0].length).toEqual(127); expect(names[0].length).toEqual(127);

12
test/unit/function_spec.js

@ -10,23 +10,27 @@ describe('function', function() {
this.addMatchers({ this.addMatchers({
toMatchArray: function(expected) { toMatchArray: function(expected) {
var actual = this.actual; var actual = this.actual;
if (actual.length != expected.length) if (actual.length != expected.length) {
return false; return false;
}
for (var i = 0; i < expected.length; i++) { for (var i = 0; i < expected.length; i++) {
var a = actual[i], b = expected[i]; var a = actual[i], b = expected[i];
if (isArray(b)) { if (isArray(b)) {
if (a.length != b.length) if (a.length != b.length) {
return false; return false;
}
for (var j = 0; j < a.length; j++) { for (var j = 0; j < a.length; j++) {
var suba = a[j], subb = b[j]; var suba = a[j], subb = b[j];
if (suba !== subb) if (suba !== subb) {
return false; return false;
} }
}
} else { } else {
if (a !== b) if (a !== b) {
return false; return false;
} }
} }
}
return true; return true;
} }
}); });

2
test/unit/parser_spec.js

@ -43,7 +43,7 @@ describe('parser', function() {
input.getByte = function(super_getByte) { input.getByte = function(super_getByte) {
// simulating end of file using null (see issue 2766) // simulating end of file using null (see issue 2766)
var ch = super_getByte.call(input); var ch = super_getByte.call(input);
return ch === 0x24 /* '$' */ ? -1 : ch; return (ch === 0x24 /* '$' */ ? -1 : ch);
}.bind(input, input.getByte); }.bind(input, input.getByte);
var lexer = new Lexer(input); var lexer = new Lexer(input);
var result = lexer.getString(); var result = lexer.getString();

6
test/unit/stream_spec.js

@ -9,13 +9,15 @@ describe('stream', function() {
this.addMatchers({ this.addMatchers({
toMatchTypedArray: function(expected) { toMatchTypedArray: function(expected) {
var actual = this.actual; var actual = this.actual;
if (actual.length != expected.length) if (actual.length != expected.length) {
return false; return false;
}
for (var i = 0, ii = expected.length; i < ii; i++) { for (var i = 0, ii = expected.length; i < ii; i++) {
var a = actual[i], b = expected[i]; var a = actual[i], b = expected[i];
if (a !== b) if (a !== b) {
return false; return false;
} }
}
return true; return true;
} }
}); });

12
test/unit/testreporter.js

@ -13,9 +13,10 @@ var TestReporter = function(browser, appPath) {
r.onreadystatechange = function sendTaskResultOnreadystatechange(e) { r.onreadystatechange = function sendTaskResultOnreadystatechange(e) {
if (r.readyState == 4) { if (r.readyState == 4) {
// Retry until successful // Retry until successful
if (r.status !== 200) if (r.status !== 200) {
send(action, json); send(action, json);
} }
}
}; };
json['browser'] = browser; json['browser'] = browser;
r.send(JSON.stringify(json)); r.send(JSON.stringify(json));
@ -30,8 +31,9 @@ var TestReporter = function(browser, appPath) {
status: status, status: status,
description: description description: description
}; };
if (typeof error !== 'undefined') if (typeof error !== 'undefined') {
message['error'] = error; message['error'] = error;
}
send('/submit_task_results', message); send('/submit_task_results', message);
} }
@ -59,9 +61,11 @@ var TestReporter = function(browser, appPath) {
} else { } else {
var failedMessages = ''; var failedMessages = '';
var items = results.getItems(); var items = results.getItems();
for (var i = 0, ii = items.length; i < ii; i++) for (var i = 0, ii = items.length; i < ii; i++) {
if (!items[i].passed()) if (!items[i].passed()) {
failedMessages += items[i].message + ' '; failedMessages += items[i].message + ' ';
}
}
sendResult('TEST-UNEXPECTED-FAIL', results.description, failedMessages); sendResult('TEST-UNEXPECTED-FAIL', results.description, failedMessages);
} }
}; };

Loading…
Cancel
Save