revert(format): Revert "chore(format): update to latest formatter"
This reverts commit 03627aa84d.
This commit is contained in:
Alex Rickabaugh
@@ -1,4 +1,8 @@
|
||||
import {makeDecorator, makeParamDecorator, makePropDecorator} from 'angular2/src/core/util/decorators';
|
||||
import {
|
||||
makeDecorator,
|
||||
makeParamDecorator,
|
||||
makePropDecorator
|
||||
} from 'angular2/src/core/util/decorators';
|
||||
|
||||
export class ClassDecoratorMeta {
|
||||
constructor(public value) {}
|
||||
|
||||
@@ -1,8 +1,24 @@
|
||||
import {describe, it, iit, ddescribe, expect, beforeEach, browserDetection} from 'angular2/testing_internal';
|
||||
import {
|
||||
describe,
|
||||
it,
|
||||
iit,
|
||||
ddescribe,
|
||||
expect,
|
||||
beforeEach,
|
||||
browserDetection
|
||||
} from 'angular2/testing_internal';
|
||||
import {OnInit} from 'angular2/core';
|
||||
import {Reflector, ReflectionInfo} from 'angular2/src/core/reflection/reflection';
|
||||
import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
|
||||
import {ClassDecorator, ParamDecorator, PropDecorator, classDecorator, paramDecorator, propDecorator, HasGetterAndSetterDecorators} from './reflector_common';
|
||||
import {
|
||||
ClassDecorator,
|
||||
ParamDecorator,
|
||||
PropDecorator,
|
||||
classDecorator,
|
||||
paramDecorator,
|
||||
propDecorator,
|
||||
HasGetterAndSetterDecorators
|
||||
} from './reflector_common';
|
||||
import {IS_DART} from 'angular2/src/facade/lang';
|
||||
|
||||
class AType {
|
||||
@@ -13,13 +29,14 @@ class AType {
|
||||
|
||||
@ClassDecorator('class')
|
||||
class ClassWithDecorators {
|
||||
@PropDecorator('p1') @PropDecorator('p2') a;
|
||||
@PropDecorator("p1") @PropDecorator("p2") a;
|
||||
b;
|
||||
|
||||
@PropDecorator('p3')
|
||||
set c(value) {}
|
||||
@PropDecorator("p3")
|
||||
set c(value) {
|
||||
}
|
||||
|
||||
constructor(@ParamDecorator('a') a: AType, @ParamDecorator('b') b: AType) {
|
||||
constructor(@ParamDecorator("a") a: AType, @ParamDecorator("b") b: AType) {
|
||||
this.a = a;
|
||||
this.b = b;
|
||||
}
|
||||
@@ -68,19 +85,19 @@ export function main() {
|
||||
|
||||
beforeEach(() => { reflector = new Reflector(new ReflectionCapabilities()); });
|
||||
|
||||
describe('usage tracking', () => {
|
||||
describe("usage tracking", () => {
|
||||
beforeEach(() => { reflector = new Reflector(null); });
|
||||
|
||||
it('should be disabled by default', () => {
|
||||
it("should be disabled by default", () => {
|
||||
expect(() => reflector.listUnusedKeys()).toThrowError('Usage tracking is disabled');
|
||||
});
|
||||
|
||||
it('should report unused keys', () => {
|
||||
it("should report unused keys", () => {
|
||||
reflector.trackUsage();
|
||||
expect(reflector.listUnusedKeys()).toEqual([]);
|
||||
|
||||
reflector.registerType(AType, new ReflectionInfo(null, null, () => 'AType'));
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, null, () => 'TestObj'));
|
||||
reflector.registerType(AType, new ReflectionInfo(null, null, () => "AType"));
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, null, () => "TestObj"));
|
||||
expect(reflector.listUnusedKeys()).toEqual([AType, TestObj]);
|
||||
|
||||
reflector.factory(AType);
|
||||
@@ -91,8 +108,8 @@ export function main() {
|
||||
});
|
||||
});
|
||||
|
||||
describe('factory', () => {
|
||||
it('should create a factory for the given type', () => {
|
||||
describe("factory", () => {
|
||||
it("should create a factory for the given type", () => {
|
||||
var obj = reflector.factory(TestObj)(1, 2);
|
||||
|
||||
expect(obj.a).toEqual(1);
|
||||
@@ -102,7 +119,7 @@ export function main() {
|
||||
// Makes Edge to disconnect when running the full unit test campaign
|
||||
// TODO: remove when issue is solved: https://github.com/angular/angular/issues/4756
|
||||
if (!browserDetection.isEdge) {
|
||||
it('should check args from no to max', () => {
|
||||
it("should check args from no to max", () => {
|
||||
var f = t => reflector.factory(t);
|
||||
var checkArgs = (obj, args) => expect(obj.args).toEqual(args);
|
||||
|
||||
@@ -132,141 +149,141 @@ export function main() {
|
||||
});
|
||||
}
|
||||
|
||||
it('should throw when more than 20 arguments',
|
||||
it("should throw when more than 20 arguments",
|
||||
() => { expect(() => reflector.factory(TestObjWith21Args)).toThrowError(); });
|
||||
|
||||
it('should return a registered factory if available', () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, null, () => 'fake'));
|
||||
expect(reflector.factory(TestObj)()).toEqual('fake');
|
||||
it("should return a registered factory if available", () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, null, () => "fake"));
|
||||
expect(reflector.factory(TestObj)()).toEqual("fake");
|
||||
});
|
||||
});
|
||||
|
||||
describe('parameters', () => {
|
||||
it('should return an array of parameters for a type', () => {
|
||||
describe("parameters", () => {
|
||||
it("should return an array of parameters for a type", () => {
|
||||
var p = reflector.parameters(ClassWithDecorators);
|
||||
expect(p).toEqual([[AType, paramDecorator('a')], [AType, paramDecorator('b')]]);
|
||||
});
|
||||
|
||||
it('should work for a class without annotations', () => {
|
||||
it("should work for a class without annotations", () => {
|
||||
var p = reflector.parameters(ClassWithoutDecorators);
|
||||
expect(p.length).toEqual(2);
|
||||
});
|
||||
|
||||
it('should return registered parameters if available', () => {
|
||||
it("should return registered parameters if available", () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, [[1], [2]]));
|
||||
expect(reflector.parameters(TestObj)).toEqual([[1], [2]]);
|
||||
});
|
||||
|
||||
it('should return an empty list when no parameters field in the stored type info', () => {
|
||||
it("should return an empty list when no parameters field in the stored type info", () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo());
|
||||
expect(reflector.parameters(TestObj)).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('propMetadata', () => {
|
||||
it('should return a string map of prop metadata for the given class', () => {
|
||||
describe("propMetadata", () => {
|
||||
it("should return a string map of prop metadata for the given class", () => {
|
||||
var p = reflector.propMetadata(ClassWithDecorators);
|
||||
expect(p['a']).toEqual([propDecorator('p1'), propDecorator('p2')]);
|
||||
expect(p['c']).toEqual([propDecorator('p3')]);
|
||||
expect(p["a"]).toEqual([propDecorator("p1"), propDecorator("p2")]);
|
||||
expect(p["c"]).toEqual([propDecorator("p3")]);
|
||||
});
|
||||
|
||||
it('should return registered meta if available', () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, null, null, null, {'a': [1, 2]}));
|
||||
expect(reflector.propMetadata(TestObj)).toEqual({'a': [1, 2]});
|
||||
it("should return registered meta if available", () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo(null, null, null, null, {"a": [1, 2]}));
|
||||
expect(reflector.propMetadata(TestObj)).toEqual({"a": [1, 2]});
|
||||
});
|
||||
|
||||
if (IS_DART) {
|
||||
it('should merge metadata from getters and setters', () => {
|
||||
it("should merge metadata from getters and setters", () => {
|
||||
var p = reflector.propMetadata(HasGetterAndSetterDecorators);
|
||||
expect(p['a']).toEqual([propDecorator('get'), propDecorator('set')]);
|
||||
expect(p["a"]).toEqual([propDecorator("get"), propDecorator("set")]);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
describe('annotations', () => {
|
||||
it('should return an array of annotations for a type', () => {
|
||||
describe("annotations", () => {
|
||||
it("should return an array of annotations for a type", () => {
|
||||
var p = reflector.annotations(ClassWithDecorators);
|
||||
expect(p).toEqual([classDecorator('class')]);
|
||||
});
|
||||
|
||||
it('should return registered annotations if available', () => {
|
||||
it("should return registered annotations if available", () => {
|
||||
reflector.registerType(TestObj, new ReflectionInfo([1, 2]));
|
||||
expect(reflector.annotations(TestObj)).toEqual([1, 2]);
|
||||
});
|
||||
|
||||
it('should work for a class without annotations', () => {
|
||||
it("should work for a class without annotations", () => {
|
||||
var p = reflector.annotations(ClassWithoutDecorators);
|
||||
expect(p).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
if (IS_DART) {
|
||||
describe('interfaces', () => {
|
||||
it('should return an array of interfaces for a type', () => {
|
||||
describe("interfaces", () => {
|
||||
it("should return an array of interfaces for a type", () => {
|
||||
var p = reflector.interfaces(ClassImplementingInterface);
|
||||
expect(p).toEqual([Interface, Interface2]);
|
||||
});
|
||||
|
||||
it('should return an empty array otherwise', () => {
|
||||
it("should return an empty array otherwise", () => {
|
||||
var p = reflector.interfaces(ClassWithDecorators);
|
||||
expect(p).toEqual([]);
|
||||
});
|
||||
|
||||
it('should throw for undeclared lifecycle interfaces',
|
||||
it("should throw for undeclared lifecycle interfaces",
|
||||
() => { expect(() => reflector.interfaces(ClassDoesNotDeclareOnInit)).toThrowError(); });
|
||||
|
||||
it('should throw for class inheriting a lifecycle impl and not declaring the interface',
|
||||
it("should throw for class inheriting a lifecycle impl and not declaring the interface",
|
||||
() => {
|
||||
expect(() => reflector.interfaces(SubClassDoesNotDeclareOnInit)).toThrowError();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
describe('getter', () => {
|
||||
it('returns a function reading a property', () => {
|
||||
describe("getter", () => {
|
||||
it("returns a function reading a property", () => {
|
||||
var getA = reflector.getter('a');
|
||||
expect(getA(new TestObj(1, 2))).toEqual(1);
|
||||
});
|
||||
|
||||
it('should return a registered getter if available', () => {
|
||||
reflector.registerGetters({'abc': (obj) => 'fake'});
|
||||
expect(reflector.getter('abc')('anything')).toEqual('fake');
|
||||
it("should return a registered getter if available", () => {
|
||||
reflector.registerGetters({"abc": (obj) => "fake"});
|
||||
expect(reflector.getter("abc")("anything")).toEqual("fake");
|
||||
});
|
||||
});
|
||||
|
||||
describe('setter', () => {
|
||||
it('returns a function setting a property', () => {
|
||||
describe("setter", () => {
|
||||
it("returns a function setting a property", () => {
|
||||
var setA = reflector.setter('a');
|
||||
var obj = new TestObj(1, 2);
|
||||
setA(obj, 100);
|
||||
expect(obj.a).toEqual(100);
|
||||
});
|
||||
|
||||
it('should return a registered setter if available', () => {
|
||||
it("should return a registered setter if available", () => {
|
||||
var updateMe;
|
||||
reflector.registerSetters({'abc': (obj, value) => { updateMe = value; }});
|
||||
reflector.setter('abc')('anything', 'fake');
|
||||
reflector.registerSetters({"abc": (obj, value) => { updateMe = value; }});
|
||||
reflector.setter("abc")("anything", "fake");
|
||||
|
||||
expect(updateMe).toEqual('fake');
|
||||
expect(updateMe).toEqual("fake");
|
||||
});
|
||||
});
|
||||
|
||||
describe('method', () => {
|
||||
it('returns a function invoking a method', () => {
|
||||
describe("method", () => {
|
||||
it("returns a function invoking a method", () => {
|
||||
var func = reflector.method('identity');
|
||||
var obj = new TestObj(1, 2);
|
||||
expect(func(obj, ['value'])).toEqual('value');
|
||||
});
|
||||
|
||||
it('should return a registered method if available', () => {
|
||||
reflector.registerMethods({'abc': (obj, args) => args});
|
||||
expect(reflector.method('abc')('anything', ['fake'])).toEqual(['fake']);
|
||||
it("should return a registered method if available", () => {
|
||||
reflector.registerMethods({"abc": (obj, args) => args});
|
||||
expect(reflector.method("abc")("anything", ["fake"])).toEqual(['fake']);
|
||||
});
|
||||
});
|
||||
|
||||
if (IS_DART) {
|
||||
describe('importUri', () => {
|
||||
it('should return the importUri for a type', () => {
|
||||
describe("importUri", () => {
|
||||
it("should return the importUri for a type", () => {
|
||||
expect(reflector.importUri(TestObjWith00Args)
|
||||
.endsWith('test/core/reflection/reflector_spec.dart'))
|
||||
.toBe(true);
|
||||
@@ -337,89 +354,82 @@ class TestObjWith09Args {
|
||||
|
||||
class TestObjWith10Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith11Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith12Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith13Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith14Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith15Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith16Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any, a16: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any, a16: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith17Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith18Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any, a18: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any,
|
||||
a18: any) {
|
||||
this.args = [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18];
|
||||
}
|
||||
}
|
||||
|
||||
class TestObjWith19Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any, a18: any, a19: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any,
|
||||
a18: any, a19: any) {
|
||||
this.args =
|
||||
[a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19];
|
||||
}
|
||||
@@ -427,10 +437,9 @@ class TestObjWith19Args {
|
||||
|
||||
class TestObjWith20Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any, a18: any, a19: any,
|
||||
a20: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any,
|
||||
a18: any, a19: any, a20: any) {
|
||||
this.args =
|
||||
[a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20];
|
||||
}
|
||||
@@ -438,13 +447,31 @@ class TestObjWith20Args {
|
||||
|
||||
class TestObjWith21Args {
|
||||
args: any[];
|
||||
constructor(
|
||||
a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any, a10: any,
|
||||
a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any, a18: any, a19: any,
|
||||
a20: any, a21: any) {
|
||||
constructor(a1: any, a2: any, a3: any, a4: any, a5: any, a6: any, a7: any, a8: any, a9: any,
|
||||
a10: any, a11: any, a12: any, a13: any, a14: any, a15: any, a16: any, a17: any,
|
||||
a18: any, a19: any, a20: any, a21: any) {
|
||||
this.args = [
|
||||
a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
|
||||
a12, a13, a14, a15, a16, a17, a18, a19, a20, a21
|
||||
a1,
|
||||
a2,
|
||||
a3,
|
||||
a4,
|
||||
a5,
|
||||
a6,
|
||||
a7,
|
||||
a8,
|
||||
a9,
|
||||
a10,
|
||||
a11,
|
||||
a12,
|
||||
a13,
|
||||
a14,
|
||||
a15,
|
||||
a16,
|
||||
a17,
|
||||
a18,
|
||||
a19,
|
||||
a20,
|
||||
a21
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user