You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/04/29 13:04:44 UTC
svn commit: r1741609 [31/31] - in /qpid/java/trunk:
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/
bdbstore/src/main/java/resources/js/qpid/management/virtual...
Modified: qpid/java/trunk/perftests/src/main/java/json2.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/json2.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/json2.js (original)
+++ qpid/java/trunk/perftests/src/main/java/json2.js Fri Apr 29 11:04:40 2016
@@ -1,215 +1,209 @@
/*
- http://www.JSON.org/json2.js
- 2011-10-19
+ http://www.JSON.org/json2.js
+ 2011-10-19
- Public Domain.
+ Public Domain.
- NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+ NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
- See http://www.JSON.org/js.html
+ See http://www.JSON.org/js.html
- This code should be minified before deployment.
- See http://javascript.crockford.com/jsmin.html
-
- USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
- NOT CONTROL.
-
-
- This file creates a global JSON object containing two methods: stringify
- and parse.
-
- JSON.stringify(value, replacer, space)
- value any JavaScript value, usually an object or array.
-
- replacer an optional parameter that determines how object
- values are stringified for objects. It can be a
- function or an array of strings.
-
- space an optional parameter that specifies the indentation
- of nested structures. If it is omitted, the text will
- be packed without extra whitespace. If it is a number,
- it will specify the number of spaces to indent at each
- level. If it is a string (such as '\t' or ' '),
- it contains the characters used to indent at each level.
-
- This method produces a JSON text from a JavaScript value.
-
- When an object value is found, if the object contains a toJSON
- method, its toJSON method will be called and the result will be
- stringified. A toJSON method does not serialize: it returns the
- value represented by the name/value pair that should be serialized,
- or undefined if nothing should be serialized. The toJSON method
- will be passed the key associated with the value, and this will be
- bound to the value
-
- For example, this would serialize Dates as ISO strings.
-
- Date.prototype.toJSON = function (key) {
- function f(n) {
- // Format integers to have at least two digits.
- return n < 10 ? '0' + n : n;
- }
-
- return this.getUTCFullYear() + '-' +
- f(this.getUTCMonth() + 1) + '-' +
- f(this.getUTCDate()) + 'T' +
- f(this.getUTCHours()) + ':' +
- f(this.getUTCMinutes()) + ':' +
- f(this.getUTCSeconds()) + 'Z';
- };
-
- You can provide an optional replacer method. It will be passed the
- key and value of each member, with this bound to the containing
- object. The value that is returned from your method will be
- serialized. If your method returns undefined, then the member will
- be excluded from the serialization.
-
- If the replacer parameter is an array of strings, then it will be
- used to select the members to be serialized. It filters the results
- such that only members with keys listed in the replacer array are
- stringified.
-
- Values that do not have JSON representations, such as undefined or
- functions, will not be serialized. Such values in objects will be
- dropped; in arrays they will be replaced with null. You can use
- a replacer function to replace those with JSON values.
- JSON.stringify(undefined) returns undefined.
-
- The optional space parameter produces a stringification of the
- value that is filled with line breaks and indentation to make it
- easier to read.
-
- If the space parameter is a non-empty string, then that string will
- be used for indentation. If the space parameter is a number, then
- the indentation will be that many spaces.
-
- Example:
-
- text = JSON.stringify(['e', {pluribus: 'unum'}]);
- // text is '["e",{"pluribus":"unum"}]'
-
-
- text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
- // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
- text = JSON.stringify([new Date()], function (key, value) {
- return this[key] instanceof Date ?
- 'Date(' + this[key] + ')' : value;
- });
- // text is '["Date(---current time---)"]'
-
-
- JSON.parse(text, reviver)
- This method parses a JSON text to produce an object or array.
- It can throw a SyntaxError exception.
-
- The optional reviver parameter is a function that can filter and
- transform the results. It receives each of the keys and values,
- and its return value is used instead of the original value.
- If it returns what it received, then the structure is not modified.
- If it returns undefined then the member is deleted.
-
- Example:
-
- // Parse the text. Values that look like ISO date strings will
- // be converted to Date objects.
-
- myData = JSON.parse(text, function (key, value) {
- var a;
- if (typeof value === 'string') {
- a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
- if (a) {
- return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
- +a[5], +a[6]));
- }
- }
- return value;
- });
-
- myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
- var d;
- if (typeof value === 'string' &&
- value.slice(0, 5) === 'Date(' &&
- value.slice(-1) === ')') {
- d = new Date(value.slice(5, -1));
- if (d) {
- return d;
- }
- }
- return value;
- });
-
-
- This is a reference implementation. You are free to copy, modify, or
- redistribute.
-*/
+ This code should be minified before deployment.
+ See http://javascript.crockford.com/jsmin.html
+
+ USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+ NOT CONTROL.
+
+
+ This file creates a global JSON object containing two methods: stringify
+ and parse.
+
+ JSON.stringify(value, replacer, space)
+ value any JavaScript value, usually an object or array.
+
+ replacer an optional parameter that determines how object
+ values are stringified for objects. It can be a
+ function or an array of strings.
+
+ space an optional parameter that specifies the indentation
+ of nested structures. If it is omitted, the text will
+ be packed without extra whitespace. If it is a number,
+ it will specify the number of spaces to indent at each
+ level. If it is a string (such as '\t' or ' '),
+ it contains the characters used to indent at each level.
+
+ This method produces a JSON text from a JavaScript value.
+
+ When an object value is found, if the object contains a toJSON
+ method, its toJSON method will be called and the result will be
+ stringified. A toJSON method does not serialize: it returns the
+ value represented by the name/value pair that should be serialized,
+ or undefined if nothing should be serialized. The toJSON method
+ will be passed the key associated with the value, and this will be
+ bound to the value
+
+ For example, this would serialize Dates as ISO strings.
+
+ Date.prototype.toJSON = function (key) {
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ return this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z';
+ };
+
+ You can provide an optional replacer method. It will be passed the
+ key and value of each member, with this bound to the containing
+ object. The value that is returned from your method will be
+ serialized. If your method returns undefined, then the member will
+ be excluded from the serialization.
+
+ If the replacer parameter is an array of strings, then it will be
+ used to select the members to be serialized. It filters the results
+ such that only members with keys listed in the replacer array are
+ stringified.
+
+ Values that do not have JSON representations, such as undefined or
+ functions, will not be serialized. Such values in objects will be
+ dropped; in arrays they will be replaced with null. You can use
+ a replacer function to replace those with JSON values.
+ JSON.stringify(undefined) returns undefined.
+
+ The optional space parameter produces a stringification of the
+ value that is filled with line breaks and indentation to make it
+ easier to read.
+
+ If the space parameter is a non-empty string, then that string will
+ be used for indentation. If the space parameter is a number, then
+ the indentation will be that many spaces.
+
+ Example:
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}]);
+ // text is '["e",{"pluribus":"unum"}]'
+
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+ // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+ text = JSON.stringify([new Date()], function (key, value) {
+ return this[key] instanceof Date ?
+ 'Date(' + this[key] + ')' : value;
+ });
+ // text is '["Date(---current time---)"]'
+
+
+ JSON.parse(text, reviver)
+ This method parses a JSON text to produce an object or array.
+ It can throw a SyntaxError exception.
+
+ The optional reviver parameter is a function that can filter and
+ transform the results. It receives each of the keys and values,
+ and its return value is used instead of the original value.
+ If it returns what it received, then the structure is not modified.
+ If it returns undefined then the member is deleted.
+
+ Example:
+
+ // Parse the text. Values that look like ISO date strings will
+ // be converted to Date objects.
+
+ myData = JSON.parse(text, function (key, value) {
+ var a;
+ if (typeof value === 'string') {
+ a =
+ /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+ if (a) {
+ return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+ +a[5], +a[6]));
+ }
+ }
+ return value;
+ });
+
+ myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+ var d;
+ if (typeof value === 'string' &&
+ value.slice(0, 5) === 'Date(' &&
+ value.slice(-1) === ')') {
+ d = new Date(value.slice(5, -1));
+ if (d) {
+ return d;
+ }
+ }
+ return value;
+ });
+
+
+ This is a reference implementation. You are free to copy, modify, or
+ redistribute.
+ */
/*jslint evil: true, regexp: true */
/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
- call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
- getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
- lastIndex, length, parse, prototype, push, replace, slice, stringify,
- test, toJSON, toString, valueOf
-*/
+ call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+ getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+ lastIndex, length, parse, prototype, push, replace, slice, stringify,
+ test, toJSON, toString, valueOf
+ */
// Create a JSON object only if one does not already exist. We create the
// methods in a closure to avoid creating global variables.
var JSON;
-if (!JSON) {
+if (!JSON)
+{
JSON = {};
}
-(function () {
+(function ()
+{
'use strict';
- function f(n) {
+ function f(n)
+ {
// Format integers to have at least two digits.
return n < 10 ? '0' + n : n;
}
- if (typeof Date.prototype.toJSON !== 'function') {
+ if (typeof Date.prototype.toJSON !== 'function')
+ {
- Date.prototype.toJSON = function (key) {
+ Date.prototype.toJSON = function (key)
+ {
- return isFinite(this.valueOf())
- ? this.getUTCFullYear() + '-' +
- f(this.getUTCMonth() + 1) + '-' +
- f(this.getUTCDate()) + 'T' +
- f(this.getUTCHours()) + ':' +
- f(this.getUTCMinutes()) + ':' +
- f(this.getUTCSeconds()) + 'Z'
- : null;
+ return isFinite(this.valueOf()) ? this.getUTCFullYear() + '-' + f(this.getUTCMonth() + 1) + '-'
+ + f(this.getUTCDate()) + 'T' + f(this.getUTCHours()) + ':'
+ + f(this.getUTCMinutes()) + ':' + f(this.getUTCSeconds()) + 'Z' : null;
};
- String.prototype.toJSON =
- Number.prototype.toJSON =
- Boolean.prototype.toJSON = function (key) {
- return this.valueOf();
- };
+ String.prototype.toJSON = Number.prototype.toJSON = Boolean.prototype.toJSON = function (key)
+ {
+ return this.valueOf();
+ };
}
- var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
- escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
- gap,
- indent,
- meta = { // table of character substitutions
- '\b': '\\b',
- '\t': '\\t',
- '\n': '\\n',
- '\f': '\\f',
- '\r': '\\r',
- '"' : '\\"',
- '\\': '\\\\'
- },
- rep;
+ var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, gap, indent, meta = { // table of character substitutions
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"': '\\"',
+ '\\': '\\\\'
+ }, rep;
-
- function quote(string) {
+ function quote(string)
+ {
// If the string contains no control characters, no quote characters, and no
// backslash characters, then we can safely slap some quotes around it.
@@ -217,147 +211,159 @@ if (!JSON) {
// sequences.
escapable.lastIndex = 0;
- return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+ return escapable.test(string) ? '"' + string.replace(escapable, function (a)
+ {
var c = meta[a];
- return typeof c === 'string'
- ? c
- : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ return typeof c === 'string' ? c : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
}) + '"' : '"' + string + '"';
}
-
- function str(key, holder) {
+ function str(key, holder)
+ {
// Produce a string from holder[key].
var i, // The loop counter.
k, // The member key.
v, // The member value.
- length,
- mind = gap,
- partial,
- value = holder[key];
+ length, mind = gap, partial, value = holder[key];
// If the value has a toJSON method, call it to obtain a replacement value.
- if (value && typeof value === 'object' &&
- typeof value.toJSON === 'function') {
+ if (value && typeof value === 'object' && typeof value.toJSON === 'function')
+ {
value = value.toJSON(key);
}
// If we were called with a replacer function, then call the replacer to
// obtain a replacement value.
- if (typeof rep === 'function') {
+ if (typeof rep === 'function')
+ {
value = rep.call(holder, key, value);
}
// What happens next depends on the value's type.
- switch (typeof value) {
- case 'string':
- return quote(value);
+ switch (typeof value)
+ {
+ case 'string':
+ return quote(value);
- case 'number':
+ case 'number':
// JSON numbers must be finite. Encode non-finite numbers as null.
- return isFinite(value) ? String(value) : 'null';
+ return isFinite(value) ? String(value) : 'null';
- case 'boolean':
- case 'null':
+ case 'boolean':
+ case 'null':
// If the value is a boolean or null, convert it to a string. Note:
// typeof null does not produce 'null'. The case is included here in
// the remote chance that this gets fixed someday.
- return String(value);
+ return String(value);
// If the type is 'object', we might be dealing with an object or an array or
// null.
- case 'object':
+ case 'object':
// Due to a specification blunder in ECMAScript, typeof null is 'object',
// so watch out for that case.
- if (!value) {
- return 'null';
- }
+ if (!value)
+ {
+ return 'null';
+ }
// Make an array to hold the partial results of stringifying this object value.
- gap += indent;
- partial = [];
+ gap += indent;
+ partial = [];
// Is the value an array?
- if (Object.prototype.toString.apply(value) === '[object Array]') {
+ if (Object.prototype.toString.apply(value) === '[object Array]')
+ {
// The value is an array. Stringify every element. Use null as a placeholder
// for non-JSON values.
- length = value.length;
- for (i = 0; i < length; i += 1) {
- partial[i] = str(i, value) || 'null';
- }
+ length = value.length;
+ for (i = 0; i < length; i += 1)
+ {
+ partial[i] = str(i, value) || 'null';
+ }
// Join all of the elements together, separated with commas, and wrap them in
// brackets.
- v = partial.length === 0
- ? '[]'
- : gap
- ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
- : '[' + partial.join(',') + ']';
- gap = mind;
- return v;
- }
+ v = partial.length === 0
+ ? '[]'
+ : gap
+ ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+ : '[' + partial.join(',') + ']';
+ gap = mind;
+ return v;
+ }
// If the replacer is an array, use it to select the members to be stringified.
- if (rep && typeof rep === 'object') {
- length = rep.length;
- for (i = 0; i < length; i += 1) {
- if (typeof rep[i] === 'string') {
- k = rep[i];
- v = str(k, value);
- if (v) {
- partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ if (rep && typeof rep === 'object')
+ {
+ length = rep.length;
+ for (i = 0; i < length; i += 1)
+ {
+ if (typeof rep[i] === 'string')
+ {
+ k = rep[i];
+ v = str(k, value);
+ if (v)
+ {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
}
}
}
- } else {
+ else
+ {
// Otherwise, iterate through all of the keys in the object.
- for (k in value) {
- if (Object.prototype.hasOwnProperty.call(value, k)) {
- v = str(k, value);
- if (v) {
- partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ for (k in value)
+ {
+ if (Object.prototype.hasOwnProperty.call(value, k))
+ {
+ v = str(k, value);
+ if (v)
+ {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
}
}
}
- }
// Join all of the member texts together, separated with commas,
// and wrap them in braces.
- v = partial.length === 0
- ? '{}'
- : gap
- ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
- : '{' + partial.join(',') + '}';
- gap = mind;
- return v;
+ v = partial.length === 0
+ ? '{}'
+ : gap
+ ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+ : '{' + partial.join(',') + '}';
+ gap = mind;
+ return v;
}
}
// If the JSON object does not yet have a stringify method, give it one.
- if (typeof JSON.stringify !== 'function') {
- JSON.stringify = function (value, replacer, space) {
+ if (typeof JSON.stringify !== 'function')
+ {
+ JSON.stringify = function (value, replacer, space)
+ {
// The stringify method takes a value and an optional replacer, and an optional
// space parameter, and returns a JSON text. The replacer can be a function
@@ -372,14 +378,18 @@ if (!JSON) {
// If the space parameter is a number, make an indent string containing that
// many spaces.
- if (typeof space === 'number') {
- for (i = 0; i < space; i += 1) {
+ if (typeof space === 'number')
+ {
+ for (i = 0; i < space; i += 1)
+ {
indent += ' ';
}
// If the space parameter is a string, it will be used as the indent string.
- } else if (typeof space === 'string') {
+ }
+ else if (typeof space === 'string')
+ {
indent = space;
}
@@ -387,9 +397,9 @@ if (!JSON) {
// Otherwise, throw an error.
rep = replacer;
- if (replacer && typeof replacer !== 'function' &&
- (typeof replacer !== 'object' ||
- typeof replacer.length !== 'number')) {
+ if (replacer && typeof replacer !== 'function' && (typeof replacer !== 'object' || typeof replacer.length
+ !== 'number'))
+ {
throw new Error('JSON.stringify');
}
@@ -400,30 +410,38 @@ if (!JSON) {
};
}
-
// If the JSON object does not yet have a parse method, give it one.
- if (typeof JSON.parse !== 'function') {
- JSON.parse = function (text, reviver) {
+ if (typeof JSON.parse !== 'function')
+ {
+ JSON.parse = function (text, reviver)
+ {
// The parse method takes a text and an optional reviver function, and returns
// a JavaScript value if the text is a valid JSON text.
var j;
- function walk(holder, key) {
+ function walk(holder, key)
+ {
// The walk method is used to recursively walk the resulting structure so
// that modifications can be made.
var k, v, value = holder[key];
- if (value && typeof value === 'object') {
- for (k in value) {
- if (Object.prototype.hasOwnProperty.call(value, k)) {
+ if (value && typeof value === 'object')
+ {
+ for (k in value)
+ {
+ if (Object.prototype.hasOwnProperty.call(value, k))
+ {
v = walk(value, k);
- if (v !== undefined) {
+ if (v !== undefined)
+ {
value[k] = v;
- } else {
+ }
+ else
+ {
delete value[k];
}
}
@@ -432,17 +450,17 @@ if (!JSON) {
return reviver.call(holder, key, value);
}
-
// Parsing happens in four stages. In the first stage, we replace certain
// Unicode characters with escape sequences. JavaScript handles many characters
// incorrectly, either silently deleting them, or treating them as line endings.
text = String(text);
cx.lastIndex = 0;
- if (cx.test(text)) {
- text = text.replace(cx, function (a) {
- return '\\u' +
- ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ if (cx.test(text))
+ {
+ text = text.replace(cx, function (a)
+ {
+ return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
});
}
@@ -461,8 +479,9 @@ if (!JSON) {
if (/^[\],:{}\s]*$/
.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
- .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
- .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+ .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+ .replace(/(?:^|:|,)(?:\s*\[)+/g, '')))
+ {
// In the third stage we use the eval function to compile the text into a
// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
@@ -474,9 +493,7 @@ if (!JSON) {
// In the optional fourth stage, we recursively walk the new structure, passing
// each name/value pair to a reviver function for possible transformation.
- return typeof reviver === 'function'
- ? walk({'': j}, '')
- : j;
+ return typeof reviver === 'function' ? walk({'': j}, '') : j;
}
// If the text is not JSON parseable, then a SyntaxError is thrown.
Modified: qpid/java/trunk/perftests/src/main/java/test-utils.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/test-utils.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/test-utils.js (original)
+++ qpid/java/trunk/perftests/src/main/java/test-utils.js Fri Apr 29 11:04:40 2016
@@ -19,13 +19,16 @@
*
*/
var QPID;
-if (!QPID) {
+if (!QPID)
+{
QPID = {};
}
-(function () {
+(function ()
+{
'use strict';
- if (typeof QPID.times !== 'function') {
+ if (typeof QPID.times !== 'function')
+ {
QPID.times = function (multiplicity, template, timeIndexName)
{
var retVal = new Array();
@@ -40,7 +43,7 @@ if (!QPID) {
var expandedObject = JSON.parse(teamplateAsString);
if (!(timeIndexName))
{
- expandedObject._name = templateName + "_" + i;
+ expandedObject._name = templateName + "_" + i;
}
retVal[i] = expandedObject;
}
@@ -48,7 +51,8 @@ if (!QPID) {
}
}
- if (typeof QPID.iterations !== 'function') {
+ if (typeof QPID.iterations !== 'function')
+ {
QPID.iterations = function (values, template)
{
var retVal = new Array()
@@ -74,19 +78,20 @@ if (!QPID) {
}
}
- if (typeof QPID.transform !== 'function') {
+ if (typeof QPID.transform !== 'function')
+ {
/**
- * Function to transform JSON using specified transformation function.
- * Any number of transformation function could be passed after the template argument.
- * Each function should return a transformed JSON object.
- * Example
- * var json = transform({"name": "Test1"}, function(json){json.name="Test"; return json;});
- */
+ * Function to transform JSON using specified transformation function.
+ * Any number of transformation function could be passed after the template argument.
+ * Each function should return a transformed JSON object.
+ * Example
+ * var json = transform({"name": "Test1"}, function(json){json.name="Test"; return json;});
+ */
QPID.transform = function (template)
{
var json = template;
- for (var i=1, len=arguments.length; i<len; i++)
+ for (var i = 1, len = arguments.length; i < len; i++)
{
json = arguments[i](json);
}
@@ -94,10 +99,11 @@ if (!QPID) {
}
}
- if (typeof QPID.cloneJSON !== 'function') {
+ if (typeof QPID.cloneJSON !== 'function')
+ {
QPID.cloneJSON = function (json)
{
- return JSON.parse( JSON.stringify( json ));
+ return JSON.parse(JSON.stringify(json));
}
}
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js Fri Apr 29 11:04:40 2016
@@ -19,36 +19,25 @@
*
*/
jsonObject = {
- "_tests":
- QPID.iterations( { "__ACK_MODE": [ 0, 1 ] },
- {
- // this is a comment - it wouldn't be allowed if this were pure JSON
+ "_tests": QPID.iterations({"__ACK_MODE": [0, 1]}, {
+ // this is a comment - it wouldn't be allowed if this were pure JSON
- "_name": "Test 1",
- "_queues": [
- {
- "_name": "Json-Queue-Name"
- }
- ],
+ "_name": "Test 1",
+ "_queues": [{
+ "_name": "Json-Queue-Name"
+ }],
- "_clients": QPID.times(2,
- {
- "_name": "repeatingClient__CLIENT_INDEX",
- "_connections": [
- {
- "_name": "connection1",
- "_sessions": [
- {
- "_sessionName": "session1",
- "_acknowledgeMode": "__ACK_MODE",
- "_consumers": []
- }
- ]
- }
- ]
- },
- "__CLIENT_INDEX"
- )
+ "_clients": QPID.times(2, {
+ "_name": "repeatingClient__CLIENT_INDEX",
+ "_connections": [{
+ "_name": "connection1",
+ "_sessions": [{
+ "_sessionName": "session1",
+ "_acknowledgeMode": "__ACK_MODE",
+ "_consumers": []
+ }]
+ }]
+ }, "__CLIENT_INDEX")
})
}
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js Fri Apr 29 11:04:40 2016
@@ -19,25 +19,18 @@
*
*/
jsonObject = {
- "_countries":
- QPID.iterations( { "__ITERATING_VALUE": [ 0, 1 ] },
- {
- // this is a comment - it wouldn't be allowed if this were pure JSON
+ "_countries": QPID.iterations({"__ITERATING_VALUE": [0, 1]}, {
+ // this is a comment - it wouldn't be allowed if this were pure JSON
- "_name": "Country",
- "_regions": QPID.times(2,
- {
- "_name": "repeatingRegion__REGION_INDEX",
- "_towns": [
- {
- "_name": "town1",
- "_iteratingAttribute": "__ITERATING_VALUE",
- "_consumers": []
- }
- ]
- },
- "__REGION_INDEX"
- )
+ "_name": "Country",
+ "_regions": QPID.times(2, {
+ "_name": "repeatingRegion__REGION_INDEX",
+ "_towns": [{
+ "_name": "town1",
+ "_iteratingAttribute": "__ITERATING_VALUE",
+ "_consumers": []
+ }]
+ }, "__REGION_INDEX")
})
}
Modified: qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js (original)
+++ qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js Fri Apr 29 11:04:40 2016
@@ -19,7 +19,6 @@
*
*/
-
var duration = 1000;
var acknowledgeMode = 0;
var deliveryMode = 2;
@@ -28,64 +27,47 @@ var queueName = "testQueueHillClimbing";
var destination = "BURL:direct://amq.direct//".concat(queueName).concat("?durable='true'");
var test = {
- "_name": "HillClimbing",
- "_queues":[
- {
- "_name": queueName,
- "_durable": true
- }
- ],
- "_clients":[
- {
- "_name": "producingClient",
- "_connections":[
- {
- "_name": "connection1",
- "_factory": "connectionfactory",
- "_sessions": [
- {
- "_sessionName": "session1",
- "_acknowledgeMode": acknowledgeMode,
- "_producers": [
- {
- "_name": "Producer1",
- "_destinationName": destination,
- "_deliveryMode": deliveryMode,
- "_maximumDuration": duration
- }
- ]
- }
- ]
- }
- ]
- },
- {
- "_name": "consumingClient",
- "_connections":[
- {
- "_name": "connection1",
- "_factory": "connectionfactory",
- "_sessions": [
- {
- "_sessionName": "session1",
- "_acknowledgeMode": acknowledgeMode,
- "_consumers": [
- {
- "_name": "Consumer1",
- "_destinationName": destination,
- "_maximumDuration": duration
- }
- ]
- }
- ]
- }
- ]
- }
- ]
+ "_name": "HillClimbing",
+ "_queues": [{
+ "_name": queueName,
+ "_durable": true
+ }],
+ "_clients": [{
+ "_name": "producingClient",
+ "_connections": [{
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [{
+ "_sessionName": "session1",
+ "_acknowledgeMode": acknowledgeMode,
+ "_producers": [{
+ "_name": "Producer1",
+ "_destinationName": destination,
+ "_deliveryMode": deliveryMode,
+ "_maximumDuration": duration
+ }]
+ }]
+ }]
+ }, {
+ "_name": "consumingClient",
+ "_connections": [{
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [{
+ "_sessionName": "session1",
+ "_acknowledgeMode": acknowledgeMode,
+ "_consumers": [{
+ "_name": "Consumer1",
+ "_destinationName": destination,
+ "_maximumDuration": duration
+ }]
+ }]
+ }]
+ }]
};
var jsonObject = {
- _tests:[test]
+ _tests: [test]
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org