feat(core): improve NoAnnotationError message

vsavkin · vsavkin · commit 197cf09689fb · 2015-12-17T23:37:54.000Z
Closes #4866 Closes #5927
diff --git a/modules/angular2/src/core/di/exceptions.ts b/modules/angular2/src/core/di/exceptions.ts
@@ -222,8 +222,10 @@ export class NoAnnotationError extends BaseException {
         signature.push(parameter.map(stringify).join(' '));
       }
     }
-    return "Cannot resolve all parameters for " + stringify(typeOrFunc) + "(" +
-           signature.join(', ') + "). " + 'Make sure they all have valid type or annotations.';
+    return "Cannot resolve all parameters for '" + stringify(typeOrFunc) + "'(" +
+           signature.join(', ') + "). " +
+           "Make sure that all the parameters are decorated with Inject or have valid type annotations and that '" +
+           stringify(typeOrFunc) + "' is decorated with Injectable.";
   }
 }
 
diff --git a/modules/angular2/test/core/di/injector_spec.ts b/modules/angular2/test/core/di/injector_spec.ts
@@ -88,6 +88,8 @@ class NoAnnotations {
   constructor(secretDependency) {}
 }
 
+function factoryFn(a) {}
+
 export function main() {
   var dynamicProviders = [
     provide('provider0', {useValue: 1}),
@@ -142,10 +144,20 @@ export function main() {
         expect(car.engine).toBeAnInstanceOf(TurboEngine);
       });
 
-      it('should throw when no type and not @Inject', () => {
+      it('should throw when no type and not @Inject (class case)', () => {
         expect(() => createInjector([NoAnnotations]))
-            .toThrowError('Cannot resolve all parameters for NoAnnotations(?). ' +
-                          'Make sure they all have valid type or annotations.');
+            .toThrowError(
+                "Cannot resolve all parameters for 'NoAnnotations'(?). " +
+                'Make sure that all the parameters are decorated with Inject or have valid type annotations ' +
+                "and that 'NoAnnotations' is decorated with Injectable.");
+      });
+
+      it('should throw when no type and not @Inject (factory case)', () => {
+        expect(() => createInjector([provide("someToken", {useFactory: factoryFn})]))
+            .toThrowError(
+                "Cannot resolve all parameters for 'factoryFn'(?). " +
+                'Make sure that all the parameters are decorated with Inject or have valid type annotations ' +
+                "and that 'factoryFn' is decorated with Injectable.");
       });
 
       it('should cache instances', () => {

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,10 @@ export class NoAnnotationError extends BaseException {`
`222`	`222`	`signature.push(parameter.map(stringify).join(' '));`
`223`	`223`	`}`
`224`	`224`	`}`
`225`		`- return "Cannot resolve all parameters for " + stringify(typeOrFunc) + "(" +`
`226`		`- signature.join(', ') + "). " + 'Make sure they all have valid type or annotations.';`
	`225`	`+ return "Cannot resolve all parameters for '" + stringify(typeOrFunc) + "'(" +`
	`226`	`+ signature.join(', ') + "). " +`
	`227`	`+ "Make sure that all the parameters are decorated with Inject or have valid type annotations and that '" +`
	`228`	`+ stringify(typeOrFunc) + "' is decorated with Injectable.";`
`227`	`229`	`}`
`228`	`230`	`}`
`229`	`231`