Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-07-01 11:36:26 +02:00
parent 9469513170 bbffe71cfd
commit 9f51f9a5dd
15 changed files with 105 additions and 9971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arangod/VocBase/replication-dump.cpp
View File

@ -35,6 +35,7 @@
#include "BasicsC/logging.h" #include "BasicsC/logging.h"
#include "BasicsC/tri-strings.h" #include "BasicsC/tri-strings.h"
#include "Utils/CollectionNameResolver.h"
#include "VocBase/collection.h" #include "VocBase/collection.h"
#include "VocBase/datafile.h" #include "VocBase/datafile.h"
#include "VocBase/document-collection.h" #include "VocBase/document-collection.h"
@ -110,7 +111,7 @@ df_entry_t;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief translate a collection id into a collection name /// @brief translate a (local) collection id into a collection name
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
char const* NameFromCid (TRI_replication_dump_t* dump, char const* NameFromCid (TRI_replication_dump_t* dump,
@ -143,16 +144,14 @@ char const* NameFromCid (TRI_replication_dump_t* dump,
static bool AppendCollection (TRI_replication_dump_t* dump, static bool AppendCollection (TRI_replication_dump_t* dump,
TRI_voc_cid_t cid, TRI_voc_cid_t cid,
bool translateCollectionIds) { bool translateCollectionIds,
triagens::arango::CollectionNameResolver* resolver) {
if (translateCollectionIds) { if (translateCollectionIds) {
if (cid > 0) { if (cid > 0) {
char const* name = NameFromCid(dump, cid); std::string name = resolver->getCollectionName(cid);
APPEND_STRING(dump->_buffer, name.c_str());
if (name != nullptr) {
APPEND_STRING(dump->_buffer, name);
return true; return true;
} }
}
APPEND_STRING(dump->_buffer, "_unknown"); APPEND_STRING(dump->_buffer, "_unknown");
} }
@ -272,7 +271,8 @@ static bool StringifyMarkerDump (TRI_replication_dump_t* dump,
TRI_document_collection_t* document, TRI_document_collection_t* document,
TRI_df_marker_t const* marker, TRI_df_marker_t const* marker,
bool withTicks, bool withTicks,
bool translateCollectionIds) { bool translateCollectionIds,
triagens::arango::CollectionNameResolver* resolver) {
// This covers two cases: // This covers two cases:
// 1. document is not nullptr and marker points into a data file // 1. document is not nullptr and marker points into a data file
// 2. document is a nullptr and marker points into a WAL file // 2. document is a nullptr and marker points into a WAL file
@ -401,13 +401,13 @@ static bool StringifyMarkerDump (TRI_replication_dump_t* dump,
} }
APPEND_STRING(buffer, ",\"" TRI_VOC_ATTRIBUTE_FROM "\":\""); APPEND_STRING(buffer, ",\"" TRI_VOC_ATTRIBUTE_FROM "\":\"");
if (! AppendCollection(dump, fromCid, translateCollectionIds)) { if (! AppendCollection(dump, fromCid, translateCollectionIds, resolver)) {
return false; return false;
} }
APPEND_STRING(buffer, "\\/"); APPEND_STRING(buffer, "\\/");
APPEND_STRING(buffer, fromKey); APPEND_STRING(buffer, fromKey);
APPEND_STRING(buffer, "\",\"" TRI_VOC_ATTRIBUTE_TO "\":\""); APPEND_STRING(buffer, "\",\"" TRI_VOC_ATTRIBUTE_TO "\":\"");
if (! AppendCollection(dump, toCid, translateCollectionIds)) { if (! AppendCollection(dump, toCid, translateCollectionIds, resolver)) {
return false; return false;
} }
APPEND_STRING(buffer, "\\/"); APPEND_STRING(buffer, "\\/");
@ -962,7 +962,8 @@ static int DumpCollection (TRI_replication_dump_t* dump,
TRI_voc_tick_t dataMin, TRI_voc_tick_t dataMin,
TRI_voc_tick_t dataMax, TRI_voc_tick_t dataMax,
bool withTicks, bool withTicks,
bool translateCollectionIds) { bool translateCollectionIds,
triagens::arango::CollectionNameResolver* resolver) {
TRI_vector_t datafiles; TRI_vector_t datafiles;
TRI_string_buffer_t* buffer; TRI_string_buffer_t* buffer;
TRI_voc_tick_t lastFoundTick; TRI_voc_tick_t lastFoundTick;
@ -1109,7 +1110,7 @@ static int DumpCollection (TRI_replication_dump_t* dump,
} }
if (! StringifyMarkerDump(dump, document, marker, withTicks, translateCollectionIds)) { if (! StringifyMarkerDump(dump, document, marker, withTicks, translateCollectionIds, resolver)) {
res = TRI_ERROR_INTERNAL; res = TRI_ERROR_INTERNAL;
goto NEXT_DF; goto NEXT_DF;
@ -1178,6 +1179,7 @@ int TRI_DumpCollectionReplication (TRI_replication_dump_t* dump,
TRI_ASSERT(col != nullptr); TRI_ASSERT(col != nullptr);
TRI_ASSERT(col->_collection != nullptr); TRI_ASSERT(col->_collection != nullptr);
triagens::arango::CollectionNameResolver resolver(col->_vocbase);
TRI_document_collection_t* document = col->_collection; TRI_document_collection_t* document = col->_collection;
// create a barrier so the underlying collection is not unloaded // create a barrier so the underlying collection is not unloaded
@ -1190,7 +1192,8 @@ int TRI_DumpCollectionReplication (TRI_replication_dump_t* dump,
// block compaction // block compaction
TRI_ReadLockReadWriteLock(&document->_compactionLock); TRI_ReadLockReadWriteLock(&document->_compactionLock);
int res = DumpCollection(dump, document, dataMin, dataMax, withTicks, translateCollectionIds); int res = DumpCollection(dump, document, dataMin, dataMax, withTicks,
translateCollectionIds, &resolver);
TRI_ReadUnlockReadWriteLock(&document->_compactionLock); TRI_ReadUnlockReadWriteLock(&document->_compactionLock);

2
js/Makefile.files
View File

@ -66,6 +66,8 @@ JAVASCRIPT_JSLINT = \
`find @srcdir@/js/apps/system/aardvark/frontend/js/routers -name "*.js"` \ `find @srcdir@/js/apps/system/aardvark/frontend/js/routers -name "*.js"` \
`find @srcdir@/js/apps/system/aardvark/frontend/js/arango -name "*.js"` \ `find @srcdir@/js/apps/system/aardvark/frontend/js/arango -name "*.js"` \
`find @srcdir@/js/apps/system/aardvark/frontend/js/shell -name "*.js"` \ `find @srcdir@/js/apps/system/aardvark/frontend/js/shell -name "*.js"` \
`find @srcdir@/js/apps/system/aardvark/test/specs -name "*.js"` \
`find @srcdir@/js/apps/system/aardvark/test/clusterSpecs -name "*.js"` \
\ \
@srcdir@/js/client/client.js \ @srcdir@/js/client/client.js \
@srcdir@/js/server/server.js \ @srcdir@/js/server/server.js \

11
js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
View File

@ -3875,11 +3875,16 @@ var changeEdgeDefinitionsForGraph = function(graph, edgeDefinition, newCollectio
var graphCollections = []; var graphCollections = [];
var graphObj = _graph(graph._key); var graphObj = _graph(graph._key);
var eDs = graph.edgeDefinitions; var eDs = graph.edgeDefinitions;
var gotAHit = false;
require("internal").print("Graph: " + graph._key);
//replace edgeDefintion //replace edgeDefintion
eDs.forEach( eDs.forEach(
function(eD, id) { function(eD, id) {
if(eD.collection === edgeDefinition.collection) { if(eD.collection === edgeDefinition.collection) {
require("internal").print("eD.collection");
require("internal").print(eD.collection);
gotAHit = true;
oldCollections = _.union(oldCollections, eD.from); oldCollections = _.union(oldCollections, eD.from);
oldCollections = _.union(oldCollections, eD.to); oldCollections = _.union(oldCollections, eD.to);
eDs[id].from = edgeDefinition.from; eDs[id].from = edgeDefinition.from;
@ -3916,7 +3921,11 @@ var changeEdgeDefinitionsForGraph = function(graph, edgeDefinition, newCollectio
//move unused collections to orphanage //move unused collections to orphanage
possibleOrphans.forEach( possibleOrphans.forEach(
function(po) { function(po) {
if (graphCollections.indexOf(po) === -1) { require("internal").print(po);
require("internal").print(graphCollections.indexOf(po));
require("internal").print(gotAHit);
if (graphCollections.indexOf(po) === -1 && gotAHit) {
require("internal").print("B I N D R I N ! ! !");
delete graphObj.__vertexCollections[po]; delete graphObj.__vertexCollections[po];
graphObj._addVertexCollection(po); graphObj._addVertexCollection(po);
} }

3
js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph-common.js
View File

@ -389,11 +389,8 @@ Edge.prototype.getOutVertex = function () {
/// @EXAMPLE_ARANGOSH_OUTPUT{edgeGetPeerVertex} /// @EXAMPLE_ARANGOSH_OUTPUT{edgeGetPeerVertex}
/// ~ db._create("example"); /// ~ db._create("example");
/// v1 = example.addVertex("1"); /// v1 = example.addVertex("1");
///
/// v2 = g.addVertex("2"); /// v2 = g.addVertex("2");
///
/// e = g.addEdge(v1, v2, "1->2", "knows"); /// e = g.addEdge(v1, v2, "1->2", "knows");
///
/// e.getPeerVertex(v1); /// e.getPeerVertex(v1);
/// ~ db._drop("example"); /// ~ db._drop("example");
/// @END_EXAMPLE_ARANGOSH_OUTPUT /// @END_EXAMPLE_ARANGOSH_OUTPUT

9
js/apps/system/aardvark/test/specs/arango/arangoSpec.js
View File

@ -67,6 +67,15 @@ describe("Arango Helper", function () {
expect(window.scrollBy).toHaveBeenCalledWith(0, 180); expect(window.scrollBy).toHaveBeenCalledWith(0, 180);
}); });
it("check showHotkeysModal function", function() {
window.modalView = new window.ModalView();
spyOn(window.modalView, "show");
window.arangoHelper.allHotkeys = [1];
arangoHelper.hotkeysFunctions.showHotkeysModal();
expect(window.modalView.show).toHaveBeenCalledWith(
"modalHotkeys.ejs", "Keyboard Shortcuts", [], [1]);
});
it("check enabling keyboard hotkeys scrollUp function", function() { it("check enabling keyboard hotkeys scrollUp function", function() {
spyOn(window, "scrollBy"); spyOn(window, "scrollBy");
arangoHelper.hotkeysFunctions.scrollUp(); arangoHelper.hotkeysFunctions.scrollUp();

20
js/apps/system/aardvark/test/specs/graphViewer/lib/jasmine-1.3.1/MIT.LICENSE
View File

@ -1,20 +0,0 @@
Copyright (c) 2008-2011 Pivotal Labs
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

681
js/apps/system/aardvark/test/specs/graphViewer/lib/jasmine-1.3.1/jasmine-html.js
View File

@ -1,681 +0,0 @@
jasmine.HtmlReporterHelpers = {};
jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
var el = document.createElement(type);
for (var i = 2; i < arguments.length; i++) {
var child = arguments[i];
if (typeof child === 'string') {
el.appendChild(document.createTextNode(child));
} else {
if (child) {
el.appendChild(child);
}
}
}
for (var attr in attrs) {
if (attr == "className") {
el[attr] = attrs[attr];
} else {
el.setAttribute(attr, attrs[attr]);
}
}
return el;
};
jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
var results = child.results();
var status = results.passed() ? 'passed' : 'failed';
if (results.skipped) {
status = 'skipped';
}
return status;
};
jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
var parentDiv = this.dom.summary;
var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
var parent = child[parentSuite];
if (parent) {
if (typeof this.views.suites[parent.id] == 'undefined') {
this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
}
parentDiv = this.views.suites[parent.id].element;
}
parentDiv.appendChild(childElement);
};
jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
for(var fn in jasmine.HtmlReporterHelpers) {
ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
}
};
jasmine.HtmlReporter = function(_doc) {
var self = this;
var doc = _doc || window.document;
var reporterView;
var dom = {};
// Jasmine Reporter Public Interface
self.logRunningSpecs = false;
self.reportRunnerStarting = function(runner) {
var specs = runner.specs() || [];
if (specs.length == 0) {
return;
}
createReporterDom(runner.env.versionString());
doc.body.appendChild(dom.reporter);
setExceptionHandling();
reporterView = new jasmine.HtmlReporter.ReporterView(dom);
reporterView.addSpecs(specs, self.specFilter);
};
self.reportRunnerResults = function(runner) {
reporterView && reporterView.complete();
};
self.reportSuiteResults = function(suite) {
reporterView.suiteComplete(suite);
};
self.reportSpecStarting = function(spec) {
if (self.logRunningSpecs) {
self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
}
};
self.reportSpecResults = function(spec) {
reporterView.specComplete(spec);
};
self.log = function() {
var console = jasmine.getGlobal().console;
if (console && console.log) {
if (console.log.apply) {
console.log.apply(console, arguments);
} else {
console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
}
}
};
self.specFilter = function(spec) {
if (!focusedSpecName()) {
return true;
}
return spec.getFullName().indexOf(focusedSpecName()) === 0;
};
return self;
function focusedSpecName() {
var specName;
(function memoizeFocusedSpec() {
if (specName) {
return;
}
var paramMap = [];
var params = jasmine.HtmlReporter.parameters(doc);
for (var i = 0; i < params.length; i++) {
var p = params[i].split('=');
paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
}
specName = paramMap.spec;
})();
return specName;
}
function createReporterDom(version) {
dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' },
dom.banner = self.createDom('div', { className: 'banner' },
self.createDom('span', { className: 'title' }, "Jasmine "),
self.createDom('span', { className: 'version' }, version)),
dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}),
dom.alert = self.createDom('div', {className: 'alert'},
self.createDom('span', { className: 'exceptions' },
self.createDom('label', { className: 'label', 'for': 'no_try_catch' }, 'No try/catch'),
self.createDom('input', { id: 'no_try_catch', type: 'checkbox' }))),
dom.results = self.createDom('div', {className: 'results'},
dom.summary = self.createDom('div', { className: 'summary' }),
dom.details = self.createDom('div', { id: 'details' }))
);
}
function noTryCatch() {
return window.location.search.match(/catch=false/);
}
function searchWithCatch() {
var params = jasmine.HtmlReporter.parameters(window.document);
var removed = false;
var i = 0;
while (!removed && i < params.length) {
if (params[i].match(/catch=/)) {
params.splice(i, 1);
removed = true;
}
i++;
}
if (jasmine.CATCH_EXCEPTIONS) {
params.push("catch=false");
}
return params.join("&");
}
function setExceptionHandling() {
var chxCatch = document.getElementById('no_try_catch');
if (noTryCatch()) {
chxCatch.setAttribute('checked', true);
jasmine.CATCH_EXCEPTIONS = false;
}
chxCatch.onclick = function() {
window.location.search = searchWithCatch();
};
}
};
jasmine.HtmlReporter.parameters = function(doc) {
var paramStr = doc.location.search.substring(1);
var params = [];
if (paramStr.length > 0) {
params = paramStr.split('&');
}
return params;
}
jasmine.HtmlReporter.sectionLink = function(sectionName) {
var link = '?';
var params = [];
if (sectionName) {
params.push('spec=' + encodeURIComponent(sectionName));
}
if (!jasmine.CATCH_EXCEPTIONS) {
params.push("catch=false");
}
if (params.length > 0) {
link += params.join("&");
}
return link;
};
jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);
jasmine.HtmlReporter.ReporterView = function(dom) {
this.startedAt = new Date();
this.runningSpecCount = 0;
this.completeSpecCount = 0;
this.passedCount = 0;
this.failedCount = 0;
this.skippedCount = 0;
this.createResultsMenu = function() {
this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'},
this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'),
' | ',
this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing'));
this.summaryMenuItem.onclick = function() {
dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, '');
};
this.detailsMenuItem.onclick = function() {
showDetails();
};
};
this.addSpecs = function(specs, specFilter) {
this.totalSpecCount = specs.length;
this.views = {
specs: {},
suites: {}
};
for (var i = 0; i < specs.length; i++) {
var spec = specs[i];
this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views);
if (specFilter(spec)) {
this.runningSpecCount++;
}
}
};
this.specComplete = function(spec) {
this.completeSpecCount++;
if (isUndefined(this.views.specs[spec.id])) {
this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom);
}
var specView = this.views.specs[spec.id];
switch (specView.status()) {
case 'passed':
this.passedCount++;
break;
case 'failed':
this.failedCount++;
break;
case 'skipped':
this.skippedCount++;
break;
}
specView.refresh();
this.refresh();
};
this.suiteComplete = function(suite) {
var suiteView = this.views.suites[suite.id];
if (isUndefined(suiteView)) {
return;
}
suiteView.refresh();
};
this.refresh = function() {
if (isUndefined(this.resultsMenu)) {
this.createResultsMenu();
}
// currently running UI
if (isUndefined(this.runningAlert)) {
this.runningAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "runningAlert bar" });
dom.alert.appendChild(this.runningAlert);
}
this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount);
// skipped specs UI
if (isUndefined(this.skippedAlert)) {
this.skippedAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "skippedAlert bar" });
}
this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
if (this.skippedCount === 1 && isDefined(dom.alert)) {
dom.alert.appendChild(this.skippedAlert);
}
// passing specs UI
if (isUndefined(this.passedAlert)) {
this.passedAlert = this.createDom('span', { href: jasmine.HtmlReporter.sectionLink(), className: "passingAlert bar" });
}
this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount);
// failing specs UI
if (isUndefined(this.failedAlert)) {
this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"});
}
this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount);
if (this.failedCount === 1 && isDefined(dom.alert)) {
dom.alert.appendChild(this.failedAlert);
dom.alert.appendChild(this.resultsMenu);
}
// summary info
this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";
};
this.complete = function() {
dom.alert.removeChild(this.runningAlert);
this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
if (this.failedCount === 0) {
dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount)));
} else {
showDetails();
}
dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"));
};
return this;
function showDetails() {
if (dom.reporter.className.search(/showDetails/) === -1) {
dom.reporter.className += " showDetails";
}
}
function isUndefined(obj) {
return typeof obj === 'undefined';
}
function isDefined(obj) {
return !isUndefined(obj);
}
function specPluralizedFor(count) {
var str = count + " spec";
if (count > 1) {
str += "s"
}
return str;
}
};
jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView);
jasmine.HtmlReporter.SpecView = function(spec, dom, views) {
this.spec = spec;
this.dom = dom;
this.views = views;
this.symbol = this.createDom('li', { className: 'pending' });
this.dom.symbolSummary.appendChild(this.symbol);
this.summary = this.createDom('div', { className: 'specSummary' },
this.createDom('a', {
className: 'description',
href: jasmine.HtmlReporter.sectionLink(this.spec.getFullName()),
title: this.spec.getFullName()
}, this.spec.description)
);
this.detail = this.createDom('div', { className: 'specDetail' },
this.createDom('a', {
className: 'description',
href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
title: this.spec.getFullName()
}, this.spec.getFullName())
);
};
jasmine.HtmlReporter.SpecView.prototype.status = function() {
return this.getSpecStatus(this.spec);
};
jasmine.HtmlReporter.SpecView.prototype.refresh = function() {
this.symbol.className = this.status();
switch (this.status()) {
case 'skipped':
break;
case 'passed':
this.appendSummaryToSuiteDiv();
break;
case 'failed':
this.appendSummaryToSuiteDiv();
this.appendFailureDetail();
break;
}
};
jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() {
this.summary.className += ' ' + this.status();
this.appendToSummary(this.spec, this.summary);
};
jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() {
this.detail.className += ' ' + this.status();
var resultItems = this.spec.results().getItems();
var messagesDiv = this.createDom('div', { className: 'messages' });
for (var i = 0; i < resultItems.length; i++) {
var result = resultItems[i];
if (result.type == 'log') {
messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
} else if (result.type == 'expect' && result.passed && !result.passed()) {
messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
if (result.trace.stack) {
messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
}
}
}
if (messagesDiv.childNodes.length > 0) {
this.detail.appendChild(messagesDiv);
this.dom.details.appendChild(this.detail);
}
};
jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) {
this.suite = suite;
this.dom = dom;
this.views = views;
this.element = this.createDom('div', { className: 'suite' },
this.createDom('a', { className: 'description', href: jasmine.HtmlReporter.sectionLink(this.suite.getFullName()) }, this.suite.description)
);
this.appendToSummary(this.suite, this.element);
};
jasmine.HtmlReporter.SuiteView.prototype.status = function() {
return this.getSpecStatus(this.suite);
};
jasmine.HtmlReporter.SuiteView.prototype.refresh = function() {
this.element.className += " " + this.status();
};
jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView);
/* @deprecated Use jasmine.HtmlReporter instead
*/
jasmine.TrivialReporter = function(doc) {
this.document = doc || document;
this.suiteDivs = {};
this.logRunningSpecs = false;
};
jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
var el = document.createElement(type);
for (var i = 2; i < arguments.length; i++) {
var child = arguments[i];
if (typeof child === 'string') {
el.appendChild(document.createTextNode(child));
} else {
if (child) { el.appendChild(child); }
}
}
for (var attr in attrs) {
if (attr == "className") {
el[attr] = attrs[attr];
} else {
el.setAttribute(attr, attrs[attr]);
}
}
return el;
};
jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
var showPassed, showSkipped;
this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' },
this.createDom('div', { className: 'banner' },
this.createDom('div', { className: 'logo' },
this.createDom('span', { className: 'title' }, "Jasmine"),
this.createDom('span', { className: 'version' }, runner.env.versionString())),
this.createDom('div', { className: 'options' },
"Show ",
showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
)
),
this.runnerDiv = this.createDom('div', { className: 'runner running' },
this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
);
this.document.body.appendChild(this.outerDiv);
var suites = runner.suites();
for (var i = 0; i < suites.length; i++) {
var suite = suites[i];
var suiteDiv = this.createDom('div', { className: 'suite' },
this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
this.suiteDivs[suite.id] = suiteDiv;
var parentDiv = this.outerDiv;
if (suite.parentSuite) {
parentDiv = this.suiteDivs[suite.parentSuite.id];
}
parentDiv.appendChild(suiteDiv);
}
this.startedAt = new Date();
var self = this;
showPassed.onclick = function(evt) {
if (showPassed.checked) {
self.outerDiv.className += ' show-passed';
} else {
self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
}
};
showSkipped.onclick = function(evt) {
if (showSkipped.checked) {
self.outerDiv.className += ' show-skipped';
} else {
self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
}
};
};
jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
var results = runner.results();
var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
this.runnerDiv.setAttribute("class", className);
//do it twice for IE
this.runnerDiv.setAttribute("className", className);
var specs = runner.specs();
var specCount = 0;
for (var i = 0; i < specs.length; i++) {
if (this.specFilter(specs[i])) {
specCount++;
}
}
var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
};
jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
var results = suite.results();
var status = results.passed() ? 'passed' : 'failed';
if (results.totalCount === 0) { // todo: change this to check results.skipped
status = 'skipped';
}
this.suiteDivs[suite.id].className += " " + status;
};
jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
if (this.logRunningSpecs) {
this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
}
};
jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
var results = spec.results();
var status = results.passed() ? 'passed' : 'failed';
if (results.skipped) {
status = 'skipped';
}
var specDiv = this.createDom('div', { className: 'spec ' + status },
this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
this.createDom('a', {
className: 'description',
href: '?spec=' + encodeURIComponent(spec.getFullName()),
title: spec.getFullName()
}, spec.description));
var resultItems = results.getItems();
var messagesDiv = this.createDom('div', { className: 'messages' });
for (var i = 0; i < resultItems.length; i++) {
var result = resultItems[i];
if (result.type == 'log') {
messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
} else if (result.type == 'expect' && result.passed && !result.passed()) {
messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
if (result.trace.stack) {
messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
}
}
}
if (messagesDiv.childNodes.length > 0) {
specDiv.appendChild(messagesDiv);
}
this.suiteDivs[spec.suite.id].appendChild(specDiv);
};
jasmine.TrivialReporter.prototype.log = function() {
var console = jasmine.getGlobal().console;
if (console && console.log) {
if (console.log.apply) {
console.log.apply(console, arguments);
} else {
console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
}
}
};
jasmine.TrivialReporter.prototype.getLocation = function() {
return this.document.location;
};
jasmine.TrivialReporter.prototype.specFilter = function(spec) {
var paramMap = {};
var params = this.getLocation().search.substring(1).split('&');
for (var i = 0; i < params.length; i++) {
var p = params[i].split('=');
paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
}
if (!paramMap.spec) {
return true;
}
return spec.getFullName().indexOf(paramMap.spec) === 0;
};

82
js/apps/system/aardvark/test/specs/graphViewer/lib/jasmine-1.3.1/jasmine.css
View File

@ -1,82 +0,0 @@
body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
#HTMLReporter a { text-decoration: none; }
#HTMLReporter a:hover { text-decoration: underline; }
#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
#HTMLReporter .version { color: #aaaaaa; }
#HTMLReporter .banner { margin-top: 14px; }
#HTMLReporter .duration { color: #aaaaaa; float: right; }
#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
#HTMLReporter .runningAlert { background-color: #666666; }
#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
#HTMLReporter .passingAlert { background-color: #a6b779; }
#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
#HTMLReporter .failingAlert { background-color: #cf867e; }
#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
#HTMLReporter .results { margin-top: 14px; }
#HTMLReporter #details { display: none; }
#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
#HTMLReporter.showDetails .summary { display: none; }
#HTMLReporter.showDetails #details { display: block; }
#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
#HTMLReporter .summary { margin-top: 14px; }
#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
#HTMLReporter .description + .suite { margin-top: 0; }
#HTMLReporter .suite { margin-top: 14px; }
#HTMLReporter .suite a { color: #333333; }
#HTMLReporter #details .specDetail { margin-bottom: 28px; }
#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; }
#HTMLReporter .resultMessage span.result { display: block; }
#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
#TrivialReporter .runner.running { background-color: yellow; }
#TrivialReporter .options { text-align: right; font-size: .8em; }
#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
#TrivialReporter .suite .suite { margin: 5px; }
#TrivialReporter .suite.passed { background-color: #dfd; }
#TrivialReporter .suite.failed { background-color: #fdd; }
#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
#TrivialReporter .spec.skipped { background-color: #bbb; }
#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
#TrivialReporter .passed { background-color: #cfc; display: none; }
#TrivialReporter .failed { background-color: #fbb; }
#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
#TrivialReporter .resultMessage .mismatch { color: black; }
#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }

2600
js/apps/system/aardvark/test/specs/graphViewer/lib/jasmine-1.3.1/jasmine.js
View File

File diff suppressed because it is too large Load Diff

6549
js/apps/system/aardvark/test/specs/graphViewer/lib/jslint.js
View File

File diff suppressed because it is too large Load Diff

20
js/apps/system/aardvark/test/specs/models/graphSpec.js
View File

@ -93,54 +93,54 @@
}); });
it("should addEdgeDefinition", function() { it("should addEdgeDefinition", function() {
ajaxVerify =function (opt) { ajaxVerify = function (opt) {
expect(opt.async).toEqual(false); expect(opt.async).toEqual(false);
expect(opt.type).toEqual("POST"); expect(opt.type).toEqual("POST");
expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/edge"); expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/edge");
expect(opt.data).toEqual('{"bla":"blub"}'); expect(opt.data).toEqual('{"bla":"blub"}');
} };
model.addEdgeDefinition({bla : "blub"}); model.addEdgeDefinition({bla : "blub"});
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
}); });
it("should deleteEdgeDefinition", function() { it("should deleteEdgeDefinition", function() {
ajaxVerify =function (opt) { ajaxVerify = function (opt) {
expect(opt.async).toEqual(false); expect(opt.async).toEqual(false);
expect(opt.type).toEqual("DELETE"); expect(opt.type).toEqual("DELETE");
expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/edge/ec"); expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/edge/ec");
} };
model.deleteEdgeDefinition("ec"); model.deleteEdgeDefinition("ec");
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
}); });
it("should modifyEdgeDefinition", function() { it("should modifyEdgeDefinition", function() {
ajaxVerify =function (opt) { ajaxVerify = function (opt) {
expect(opt.async).toEqual(false); expect(opt.async).toEqual(false);
expect(opt.type).toEqual("PUT"); expect(opt.type).toEqual("PUT");
expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/edge/ec"); expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/edge/ec");
expect(opt.data).toEqual('{"bla":"blub","collection":"ec"}'); expect(opt.data).toEqual('{"bla":"blub","collection":"ec"}');
} };
model.modifyEdgeDefinition({bla : "blub", collection : "ec"}); model.modifyEdgeDefinition({bla : "blub", collection : "ec"});
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
}); });
it("should addVertexCollection", function() { it("should addVertexCollection", function() {
ajaxVerify =function (opt) { ajaxVerify = function (opt) {
expect(opt.async).toEqual(false); expect(opt.async).toEqual(false);
expect(opt.type).toEqual("POST"); expect(opt.type).toEqual("POST");
expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/vertex"); expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/vertex");
expect(opt.data).toEqual('{"collection":"vertexCollectionName"}'); expect(opt.data).toEqual('{"collection":"vertexCollectionName"}');
} };
model.addVertexCollection("vertexCollectionName"); model.addVertexCollection("vertexCollectionName");
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
}); });
it("should deleteVertexCollection", function() { it("should deleteVertexCollection", function() {
ajaxVerify =function (opt) { ajaxVerify = function (opt) {
expect(opt.async).toEqual(false); expect(opt.async).toEqual(false);
expect(opt.type).toEqual("DELETE"); expect(opt.type).toEqual("DELETE");
expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/vertex/ec"); expect(opt.url).toEqual("/_api/gharial/" + myKey+ "/vertex/ec");
} };
model.deleteVertexCollection("ec"); model.deleteVertexCollection("ec");
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
}); });

8
js/apps/system/aardvark/test/specs/planner/views/planSymmetricViewSpec.js
View File

@ -12,7 +12,9 @@
$('body').append('<div id="content" class="removeMe"></div>'); $('body').append('<div id="content" class="removeMe"></div>');
ajaxFake = { ajaxFake = {
done: function(){} done: function(){
return undefined;
}
}; };
myView = new window.PlanSymmetricView(); myView = new window.PlanSymmetricView();
myView.render(true); myView.render(true);
@ -97,7 +99,7 @@
expect(window.alert).toHaveBeenCalledWith("Please provide at least one Host"); expect(window.alert).toHaveBeenCalledWith("Please provide at least one Host");
}); });
it("should not start an asymmetrical cluster because no dbserver and coordinator ist provided", function() { it("should not start an asymmetrical cluster without dbserver and coordinator", function() {
myView.render(false); myView.render(false);
$(".add").click(); $(".add").click();
$(".add").click(); $(".add").click();
@ -106,7 +108,7 @@
$(".port", d).val(i); $(".port", d).val(i);
if (i === 0) { if (i === 0) {
$(".isDBServer", d).attr("checked",false); $(".isDBServer", d).attr("checked",false);
$(".isCoordinator", d).val(false) $(".isCoordinator", d).val(false);
} else if (i === 1) { } else if (i === 1) {
$(".isDBServer", d).attr("checked",false); $(".isDBServer", d).attr("checked",false);
$(".isCoordinator", d).attr("checked",false); $(".isCoordinator", d).attr("checked",false);

44
js/apps/system/aardvark/test/specs/router/routerSpec.js
View File

@ -21,6 +21,7 @@
collectionsViewDummy, collectionsViewDummy,
databaseDummy, databaseDummy,
userBarDummy, userBarDummy,
graphManagementView,
documentViewDummy, documentViewDummy,
statisticsDescriptionCollectionDummy, statisticsDescriptionCollectionDummy,
statisticsCollectionDummy, statisticsCollectionDummy,
@ -171,6 +172,11 @@
throw "should be a spy"; throw "should be a spy";
} }
}; };
graphManagementView = {
render: function () {
throw "should be a spy";
}
};
documentsViewDummy = { documentsViewDummy = {
render: function () { render: function () {
throw "should be a spy"; throw "should be a spy";
@ -184,6 +190,7 @@
}; };
spyOn(window, "DocumentsView").andReturn(documentsViewDummy); spyOn(window, "DocumentsView").andReturn(documentsViewDummy);
spyOn(window, "GraphManagementView").andReturn(graphManagementView);
spyOn(window, "DocumentView").andReturn(documentViewDummy); spyOn(window, "DocumentView").andReturn(documentViewDummy);
spyOn(window, "arangoCollections").andReturn(storeDummy); spyOn(window, "arangoCollections").andReturn(storeDummy);
spyOn(window, "ArangoUsers").andReturn(sessionDummy); spyOn(window, "ArangoUsers").andReturn(sessionDummy);
@ -263,6 +270,24 @@
expect(window.CurrentDatabase).toHaveBeenCalled(); expect(window.CurrentDatabase).toHaveBeenCalled();
expect(fakeDB.fetch).toHaveBeenCalled(); expect(fakeDB.fetch).toHaveBeenCalled();
}); });
it("should handle resize", function () {
r.dashboardView = {
resize : function () {
}
};
r.graphManagementView = {
handleResize : function () {
}
};
spyOn(r.dashboardView , "resize");
spyOn(r.graphManagementView , "handleResize");
r.handleResize();
expect(r.dashboardView.resize).toHaveBeenCalled();
expect(r.graphManagementView.handleResize).toHaveBeenCalled();
});
}); });
describe("navigation", function () { describe("navigation", function () {
@ -410,6 +435,25 @@
}); });
it("should route to graphManagement", function () {
spyOn(graphManagementView, "render");
simpleNavigationCheck(
{
url: "graph"
},
"GraphManagementView",
"graphviewer-menu",
{
collection: new window.GraphCollection(),
collectionCollection: storeDummy
},
{
},
true
);
});
it("should route to document", function () { it("should route to document", function () {
var colid = 5, var colid = 5,
docid = 6; docid = 6;