From be6b87a31bc2b4ca9df367097aeb9c17f5451db1 Mon Sep 17 00:00:00 2001 From: "Davis W. Frank & Rajan Agaskar" Date: Fri, 7 Dec 2012 17:37:20 -0800 Subject: [PATCH] Remove obsolete NestedResults --- lib/jasmine-core/jasmine.js | 73 ---------------------------------- spec/core/NestedResultsSpec.js | 54 ------------------------- spec/runner.html | 1 - src/core/NestedResults.js | 73 ---------------------------------- tasks/jasmine_dev/sources.rb | 1 - 5 files changed, 202 deletions(-) delete mode 100644 spec/core/NestedResultsSpec.js delete mode 100644 src/core/NestedResults.js diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index b21010c0..441b3152 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -1484,79 +1484,6 @@ jasmine.MultiReporter.prototype.addReporter = function(reporter) { })(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 everything below passed - */ -jasmine.NestedResults.prototype.passed = function() { - return this.passedCount === this.totalCount; -}; /** * Base class for pretty printing for expectation results. */ diff --git a/spec/core/NestedResultsSpec.js b/spec/core/NestedResultsSpec.js deleted file mode 100644 index fc1e5607..00000000 --- a/spec/core/NestedResultsSpec.js +++ /dev/null @@ -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); - }); - -}); diff --git a/spec/runner.html b/spec/runner.html index add81ca8..b462dac5 100644 --- a/spec/runner.html +++ b/spec/runner.html @@ -36,7 +36,6 @@ - diff --git a/src/core/NestedResults.js b/src/core/NestedResults.js deleted file mode 100644 index 1b0867f1..00000000 --- a/src/core/NestedResults.js +++ /dev/null @@ -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 everything below passed - */ -jasmine.NestedResults.prototype.passed = function() { - return this.passedCount === this.totalCount; -}; diff --git a/tasks/jasmine_dev/sources.rb b/tasks/jasmine_dev/sources.rb index dfd3e611..caf0cb1a 100644 --- a/tasks/jasmine_dev/sources.rb +++ b/tasks/jasmine_dev/sources.rb @@ -9,7 +9,6 @@ class JasmineDev < Thor "JsApiReporter.js", "Matchers.js", "MultiReporter.js", - "NestedResults.js", "PrettyPrinter.js", "Queue.js", "Runner.js",