Merge pull request #21 from Voiteh/issue/6

Fix target constructors finiding, fix tests (#6)
Voiteh · Jun 23, 2019 · 09e2975 · 09e2975
2 parents e9dbd0a + 263be21
commit 09e2975
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/source/herd/depin/api/Target.ceylon b/source/herd/depin/api/Target.ceylon
@@ -25,7 +25,7 @@ shared abstract class Target extends Injection {
 
 
 	shared FunctionModel<Object>|ValueModel<Object> targetConstructor {
-		value chain = model.getCallableConstructors(`TargetAnnotation`)
+		value chain = model.getCallableConstructors<>(`TargetAnnotation`)
 				.chain(model.getValueConstructors(`TargetAnnotation`));
 		if (!model.defaultConstructor exists) {
 			if (chain.empty) {

diff --git a/source/herd/depin/engine/DefinitionFactory.ceylon b/source/herd/depin/engine/DefinitionFactory.ceylon
@@ -1,3 +1,4 @@
+
 import ceylon.language.meta {
 	type
 }
@@ -19,8 +20,8 @@ shared class DefinitionFactory(Identification.Holder holder) satisfies Definitio
 			try{
 				annotations = declaration.annotations<Annotation>()
 						.select((Annotation element) => holder.types.contains(type(element)));
-			}catch(Exception x){
-				//Ceylon BUG!!! We can't identifiy parameter by annotations but for now we can use name of the parameter.
+			}catch(Throwable x){
+				//Ceylon BUG (https://github.com/eclipse/ceylon/issues/7448)!!! We can't identifiy parameter by annotations but for now we can use name of the parameter.
 				//This will be enough for most of cases. 
 				annotations={NamedAnnotation(declaration.name)};
 			}

diff --git a/test/test/herd/depin/engine/integration/ClassInjectionTest.ceylon b/test/test/herd/depin/engine/integration/ClassInjectionTest.ceylon
@@ -1,6 +1,5 @@
 import ceylon.test {
-	test,
-	ignore
+	test
 }
 
 import herd.depin.engine {
@@ -41,7 +40,6 @@ shared class ClassInjectionTest() {
 	shared test void shouldInjectDefaultedParameterClassFunction(){
 		assert(depin.inject(`DefaultedParameterFunction`).defaultedFunction()==fixture.defaultedParameterFunction.param);
 	}
-	ignore("until https://github.com/eclipse/ceylon/issues/7448 fixed")
 	shared test void shouldInjectTargetedConstructor(){
 		assert(depin.inject(`TargetWithTwoCallableConstructors`).something==fixture.targetWithTwoCallableConstructors.param.reversed);
 	}

diff --git a/test/test/herd/depin/engine/integration/model/TargetWithTwoCallableConstructors.ceylon b/test/test/herd/depin/engine/integration/model/TargetWithTwoCallableConstructors.ceylon
@@ -11,7 +11,7 @@ shared class TargetWithTwoCallableConstructors {
 
 	}
 
-	shared target new targetedConstructor(named("Abc") String something){
+	shared target new targetedConstructor(named("I will be ignored any way! Bug, bug, bug") String something){
 		this.something=something.reversed;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ shared class TargetWithTwoCallableConstructors { @@
     	}
-    	shared target new targetedConstructor(named("Abc") String something){
+    	shared target new targetedConstructor(named("I will be ignored any way! Bug, bug, bug") String something){
     		this.something=something.reversed;
     	}
@@ Expand Down @@