Unit tests for target annotations selection, workaround for ceylon bug …

…eclipse-archived/ceylon#7448 (#6)

source/herd/depin/engine/DefaultResolver.ceylon

@@ -17,9 +17,15 @@ import ceylon.language.meta {
 shared class DefaultResolver(Registry registry) satisfies Resolver{
 	shared actual Dependency resolve(Declaration declaration) {
 		if(is TypedDeclaration&AnnotatedDeclaration declaration){
-
-			value annotations = declaration.annotations<Annotation>()
+			variable {Annotation*} annotations;
+			try{
+				annotations = declaration.annotations<Annotation>()
 					.select((Annotation element) => registry.controls.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.
+				//This will be enough for most of cases. 
+				annotations={NamedAnnotation(declaration.name)};
+			}
 			return Dependency{ 
 				type = declaration.openType; 
 				identification = if (annotations.empty && registry.controls.contains(`NamedAnnotation`)) 

test/test/herd/depin/engine/ceylon/AnnotationsFromConstructorParameter.ceylon

@@ -0,0 +1,21 @@
+import ceylon.test {
+	test,
+	ignore
+}
+shared class ConstructorTestClass{
+	String param;
+	shared new (String param){
+		this.param = param;}
+}
+
+shared class AnnotationsFromConstructorParameter() {
+
+	ignore
+	shared test void shouldGetAnnotationsFromConstructorParameter(){
+		assert (exists constructor = `class ConstructorTestClass`.defaultConstructor);
+		assert(exists param=constructor.parameterDeclarations.first);
+		assert(param.annotations<Annotation>().empty);
+	}
+
+
+}

test/test/herd/depin/engine/ceylon/package.ceylon

@@ -0,0 +1 @@
+shared package test.herd.depin.engine.ceylon;

test/test/herd/depin/engine/integration/ClassInjectionTest.ceylon

@@ -1,5 +1,6 @@
 import ceylon.test {
-	test
+	test,
+	ignore
 }
 
 import herd.depin.engine {
@@ -12,7 +13,8 @@ import test.herd.depin.engine.integration.model {
 	DataSource,
 	DefaultParametersConstructor,
 	DefaultedParametersByFunction,
-	DefaultedParameterFunction
+	DefaultedParameterFunction,
+	TargetWithTwoCallableConstructors
 }
 shared class ClassInjectionTest() {
 
@@ -36,4 +38,8 @@ shared class ClassInjectionTest() {
 	shared test void shouldInjectDefaultedParameterClassFunction(){
 		assert(depin.inject(`DefaultedParameterFunction`).fun()==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);
+	}
 }

test/test/herd/depin/engine/integration/dependencies/targetedConstructorDependencies.ceylon

@@ -0,0 +1,7 @@
+import test.herd.depin.engine.integration.model {
+	fixture
+}
+import herd.depin.engine {
+	dependency
+}
+shared dependency String something =fixture.targetWithTwoCallableConstructors.param;

test/test/herd/depin/engine/integration/model/TargetWithTwoCallableConstructors.ceylon

@@ -0,0 +1,17 @@
+import herd.depin.engine {
+	target,
+	named
+}
+shared class TargetWithTwoCallableConstructors {
+
+	shared String something;
+	shared new (String something){
+		this.something = something;
+
+	}
+
+	shared target new targetedConstructor(named("Abc") String something){
+		this.something=something.reversed;
+	}
+
+}

test/test/herd/depin/engine/integration/model/fixture.ceylon

@@ -23,4 +23,8 @@ shared object fixture {
 	shared object defaultedParameterFunction {
 		shared String param = "abc";
 	}
+	shared object targetWithTwoCallableConstructors{
+		shared String param ="abc";
+		shared TargetWithTwoCallableConstructors instance= TargetWithTwoCallableConstructors(param);
+	}
 }