From 81fc657356b75ac1c5979cf78743969bb62c025e Mon Sep 17 00:00:00 2001 From: Tim Blasi Date: Fri, 5 Jun 2015 14:19:49 -0700 Subject: [PATCH] refactor(change detect): Remove unnecessary param from tests --- .../change_detection/change_detector_spec.ts | 2 +- .../generator/gen_change_detectors.dart | 2 +- .../test/change_detection/simple_watch_config.ts | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/angular2/test/change_detection/change_detector_spec.ts b/modules/angular2/test/change_detection/change_detector_spec.ts index 52fe5b0eb8..a7d01eb66a 100644 --- a/modules/angular2/test/change_detection/change_detector_spec.ts +++ b/modules/angular2/test/change_detection/change_detector_spec.ts @@ -74,7 +74,7 @@ export function main() { function _bindSimpleValue(expression: string, context = null) { var dispatcher = new TestDispatcher(); - var protoCd = _getProtoChangeDetector(getDefinition(expression, 'propName')); + var protoCd = _getProtoChangeDetector(getDefinition(expression)); var cd = protoCd.instantiate(dispatcher); var locals = null; diff --git a/modules/angular2/test/change_detection/generator/gen_change_detectors.dart b/modules/angular2/test/change_detection/generator/gen_change_detectors.dart index 5b7ef61a83..9bf7496e08 100644 --- a/modules/angular2/test/change_detection/generator/gen_change_detectors.dart +++ b/modules/angular2/test/change_detection/generator/gen_change_detectors.dart @@ -10,7 +10,7 @@ import '../simple_watch_config.dart'; void main(List args) { var buf = new StringBuffer('var $_MAP_NAME = {'); var codegen = new Codegen(); - var allDefs = getAllDefinitions('propName'); + var allDefs = getAllDefinitions(); for (var i = 0; i < allDefs.length; ++i) { var className = 'ChangeDetector${i}'; codegen.generate('dynamic', className, allDefs[i]); diff --git a/modules/angular2/test/change_detection/simple_watch_config.ts b/modules/angular2/test/change_detection/simple_watch_config.ts index 0a2e2165f4..8000117f76 100644 --- a/modules/angular2/test/change_detection/simple_watch_config.ts +++ b/modules/angular2/test/change_detection/simple_watch_config.ts @@ -5,11 +5,10 @@ import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabil var _parser = new Parser(new Lexer()); -function _createChangeDetectorDefinition(id: string, propName: string, - expression: string): ChangeDetectorDefinition { +function _createChangeDetectorDefinition(id: string, expression: string): ChangeDetectorDefinition { reflector.reflectionCapabilities = new ReflectionCapabilities(); var ast = _parser.parseBinding(expression, 'location'); - var bindingRecords = [BindingRecord.createForElement(ast, 0, propName)]; + var bindingRecords = [BindingRecord.createForElement(ast, 0, PROP_NAME)]; var strategy = null; var variableBindings = []; @@ -18,23 +17,24 @@ function _createChangeDetectorDefinition(id: string, propName: string, directiveRecords); } +export var PROP_NAME = 'propName'; + /** * In this case, we expect `id` and `expression` to be the same string. */ -export function getDefinition(id: string, propName: string): ChangeDetectorDefinition { - // TODO(kegluneq): Remove `propName`? +export function getDefinition(id: string): ChangeDetectorDefinition { if (ListWrapper.indexOf(_availableDefinitions, id) < 0) { throw `No ChangeDetectorDefinition for ${id} available. Please modify this file if necessary.`; } - return _createChangeDetectorDefinition(id, propName, id); + return _createChangeDetectorDefinition(id, id); } /** * Get all available ChangeDetectorDefinition objects. Used to pre-generate Dart * `ChangeDetector` classes. */ -export function getAllDefinitions(propName: string): List { - return ListWrapper.map(_availableDefinitions, (id) => getDefinition(id, propName)); +export function getAllDefinitions(): List { + return ListWrapper.map(_availableDefinitions, (id) => getDefinition(id)); } var _availableDefinitions = [