Remove obsolete NestedResults
This commit is contained in:
@@ -1484,79 +1484,6 @@ jasmine.MultiReporter.prototype.addReporter = function(reporter) {
|
|||||||
})(functionName);
|
})(functionName);
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
/**
|
|
||||||
* Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults
|
|
||||||
*
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults = function() {
|
|
||||||
/**
|
|
||||||
* The total count of results
|
|
||||||
*/
|
|
||||||
this.totalCount = 0;
|
|
||||||
/**
|
|
||||||
* Number of passed results
|
|
||||||
*/
|
|
||||||
this.passedCount = 0;
|
|
||||||
/**
|
|
||||||
* Number of failed results
|
|
||||||
*/
|
|
||||||
this.failedCount = 0;
|
|
||||||
/**
|
|
||||||
* Was this suite/spec skipped?
|
|
||||||
*/
|
|
||||||
this.skipped = false;
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
*/
|
|
||||||
this.items_ = [];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Roll up the result counts.
|
|
||||||
*
|
|
||||||
* @param result
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults.prototype.rollupCounts = function(result) {
|
|
||||||
this.totalCount += result.totalCount;
|
|
||||||
this.passedCount += result.passedCount;
|
|
||||||
this.failedCount += result.failedCount;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Getter for the results: message & results.
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults.prototype.getItems = function() {
|
|
||||||
return this.items_;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a result, tracking counts (total, passed, & failed)
|
|
||||||
* @param {jasmine.ExpectationResult|jasmine.NestedResults} result
|
|
||||||
*/
|
|
||||||
//TODO: Results are meant for consumption by reporters, not internally.
|
|
||||||
jasmine.NestedResults.prototype.addResult = function(result) {
|
|
||||||
if (result.type != 'log') {
|
|
||||||
if (result.items_) {
|
|
||||||
this.rollupCounts(result);
|
|
||||||
} else {
|
|
||||||
this.totalCount++;
|
|
||||||
if (result.passed) {
|
|
||||||
this.passedCount++;
|
|
||||||
} else {
|
|
||||||
this.failedCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.items_.push(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns {Boolean} True if <b>everything</b> below passed
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults.prototype.passed = function() {
|
|
||||||
return this.passedCount === this.totalCount;
|
|
||||||
};
|
|
||||||
/**
|
/**
|
||||||
* Base class for pretty printing for expectation results.
|
* Base class for pretty printing for expectation results.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
describe('jasmine.NestedResults', function() {
|
|
||||||
it('#addResult increments counters', function() {
|
|
||||||
// Leaf case
|
|
||||||
var results = new jasmine.NestedResults();
|
|
||||||
|
|
||||||
results.addResult(jasmine.buildExpectationResult({
|
|
||||||
matcherName: "foo", passed: true, message: 'Passed.', actual: 'bar', expected: 'bar'}
|
|
||||||
));
|
|
||||||
|
|
||||||
expect(results.getItems().length).toEqual(1);
|
|
||||||
expect(results.totalCount).toEqual(1);
|
|
||||||
expect(results.passedCount).toEqual(1);
|
|
||||||
expect(results.failedCount).toEqual(0);
|
|
||||||
|
|
||||||
results.addResult(jasmine.buildExpectationResult({
|
|
||||||
matcherName: "baz", passed: false, message: 'FAIL.', actual: "corge", expected: "quux"
|
|
||||||
}));
|
|
||||||
|
|
||||||
expect(results.getItems().length).toEqual(2);
|
|
||||||
expect(results.totalCount).toEqual(2);
|
|
||||||
expect(results.passedCount).toEqual(1);
|
|
||||||
expect(results.failedCount).toEqual(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should roll up counts for nested results', function() {
|
|
||||||
// Branch case
|
|
||||||
var leafResultsOne = new jasmine.NestedResults();
|
|
||||||
leafResultsOne.addResult(jasmine.buildExpectationResult({
|
|
||||||
matcherName: "toSomething", passed: true, message: 'message', actual: '', expected:''
|
|
||||||
}));
|
|
||||||
|
|
||||||
leafResultsOne.addResult(jasmine.buildExpectationResult({
|
|
||||||
matcherName: "toSomethingElse", passed: false, message: 'message', actual: 'a', expected: 'b'
|
|
||||||
}));
|
|
||||||
|
|
||||||
var leafResultsTwo = new jasmine.NestedResults();
|
|
||||||
leafResultsTwo.addResult(jasmine.buildExpectationResult({
|
|
||||||
matcherName: "toSomething", passed: true, message: 'message', actual: '', expected: ''
|
|
||||||
}));
|
|
||||||
leafResultsTwo.addResult(jasmine.buildExpectationResult({
|
|
||||||
matcherName: "toSomethineElse", passed: false, message: 'message', actual: 'c', expected: 'd'
|
|
||||||
}));
|
|
||||||
|
|
||||||
var branchResults = new jasmine.NestedResults();
|
|
||||||
branchResults.addResult(leafResultsOne);
|
|
||||||
branchResults.addResult(leafResultsTwo);
|
|
||||||
|
|
||||||
expect(branchResults.getItems().length).toEqual(2);
|
|
||||||
expect(branchResults.totalCount).toEqual(4);
|
|
||||||
expect(branchResults.passedCount).toEqual(2);
|
|
||||||
expect(branchResults.failedCount).toEqual(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
@@ -36,7 +36,6 @@
|
|||||||
<script type="text/javascript" src=".././spec/core/ClockSpec.js"></script>
|
<script type="text/javascript" src=".././spec/core/ClockSpec.js"></script>
|
||||||
<script type="text/javascript" src=".././spec/core/DelayedFunctionSchedulerSpec.js"></script>
|
<script type="text/javascript" src=".././spec/core/DelayedFunctionSchedulerSpec.js"></script>
|
||||||
<script type="text/javascript" src=".././spec/core/MultiReporterSpec.js"></script>
|
<script type="text/javascript" src=".././spec/core/MultiReporterSpec.js"></script>
|
||||||
<script type="text/javascript" src=".././spec/core/NestedResultsSpec.js"></script>
|
|
||||||
<script type="text/javascript" src=".././spec/core/PrettyPrintSpec.js"></script>
|
<script type="text/javascript" src=".././spec/core/PrettyPrintSpec.js"></script>
|
||||||
<script type="text/javascript" src=".././spec/core/ReporterSpec.js"></script>
|
<script type="text/javascript" src=".././spec/core/ReporterSpec.js"></script>
|
||||||
<script type="text/javascript" src=".././spec/core/RunnerSpec.js"></script>
|
<script type="text/javascript" src=".././spec/core/RunnerSpec.js"></script>
|
||||||
|
|||||||
@@ -1,73 +0,0 @@
|
|||||||
/**
|
|
||||||
* Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults
|
|
||||||
*
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults = function() {
|
|
||||||
/**
|
|
||||||
* The total count of results
|
|
||||||
*/
|
|
||||||
this.totalCount = 0;
|
|
||||||
/**
|
|
||||||
* Number of passed results
|
|
||||||
*/
|
|
||||||
this.passedCount = 0;
|
|
||||||
/**
|
|
||||||
* Number of failed results
|
|
||||||
*/
|
|
||||||
this.failedCount = 0;
|
|
||||||
/**
|
|
||||||
* Was this suite/spec skipped?
|
|
||||||
*/
|
|
||||||
this.skipped = false;
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
*/
|
|
||||||
this.items_ = [];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Roll up the result counts.
|
|
||||||
*
|
|
||||||
* @param result
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults.prototype.rollupCounts = function(result) {
|
|
||||||
this.totalCount += result.totalCount;
|
|
||||||
this.passedCount += result.passedCount;
|
|
||||||
this.failedCount += result.failedCount;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Getter for the results: message & results.
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults.prototype.getItems = function() {
|
|
||||||
return this.items_;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a result, tracking counts (total, passed, & failed)
|
|
||||||
* @param {jasmine.ExpectationResult|jasmine.NestedResults} result
|
|
||||||
*/
|
|
||||||
//TODO: Results are meant for consumption by reporters, not internally.
|
|
||||||
jasmine.NestedResults.prototype.addResult = function(result) {
|
|
||||||
if (result.type != 'log') {
|
|
||||||
if (result.items_) {
|
|
||||||
this.rollupCounts(result);
|
|
||||||
} else {
|
|
||||||
this.totalCount++;
|
|
||||||
if (result.passed) {
|
|
||||||
this.passedCount++;
|
|
||||||
} else {
|
|
||||||
this.failedCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.items_.push(result);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns {Boolean} True if <b>everything</b> below passed
|
|
||||||
*/
|
|
||||||
jasmine.NestedResults.prototype.passed = function() {
|
|
||||||
return this.passedCount === this.totalCount;
|
|
||||||
};
|
|
||||||
@@ -9,7 +9,6 @@ class JasmineDev < Thor
|
|||||||
"JsApiReporter.js",
|
"JsApiReporter.js",
|
||||||
"Matchers.js",
|
"Matchers.js",
|
||||||
"MultiReporter.js",
|
"MultiReporter.js",
|
||||||
"NestedResults.js",
|
|
||||||
"PrettyPrinter.js",
|
"PrettyPrinter.js",
|
||||||
"Queue.js",
|
"Queue.js",
|
||||||
"Runner.js",
|
"Runner.js",
|
||||||
|
|||||||
Reference in New Issue
Block a user