resolve merge conflicts

trentjeff · May 11, 2023 · c559999 · c559999
1 parent 2149c3a
commit c559999
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 25 deletions.
diff --git a/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java b/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java
@@ -14,36 +14,86 @@
  * limitations under the License.
  */
 
-package io.helidon.tests.functional.context.injection;
+package io.helidon.pico.api;
 
-import io.helidon.microprofile.tests.junit5.HelidonTest;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.client.WebTarget;
+import java.lang.annotation.Annotation;
+
+import io.helidon.common.types.AnnotationAndValueDefault;
+
+import jakarta.inject.Named;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-<<<<<<<< HEAD:tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java
-/**
- * Unit test for {@link CheckInjectionResource}.
- */
-@HelidonTest
-class CheckInjectionTest {
-========
 class QualifierAndValueDefaultTest {
->>>>>>>> 23e63fe9f2 (resolves renaming):pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java
 
-    private final WebTarget baseTarget;
+    @Test
+    void buildAndCompare() {
+        QualifierAndValueDefault qav1 = QualifierAndValueDefault.builder()
+                .type(Named.class)
+                .value("x.y")
+                .build();
+        AnnotationAndValueDefault qav2 = QualifierAndValueDefault.builder()
+                .type(Named.class)
+                .value("x.y")
+                .build();
+        assertThat(qav1.compareTo(qav2),
+                   is(0));
+    }
+
+    @Named("io.helidon.pico.api.DefaultQualifierAndValueTest")
+    @ClassNamed(QualifierAndValueDefaultTest.class)
+    @Test
+    public void createClassNamed() throws Exception {
+        QualifierAndValueDefault qav1 = QualifierAndValueDefault.createClassNamed(QualifierAndValueDefaultTest.class);
+        QualifierAndValueDefault qav2 = QualifierAndValueDefault.builder()
+                .type(Named.class)
+                .value(QualifierAndValueDefault.class.getName())
+                .build();
+        assertThat(qav1.compareTo(qav2),
+                   is(0));
+
+        assertThat("runtime retention expected for " + ClassNamed.class,
+                   getClass().getMethod("createClassNamed").getAnnotation(ClassNamed.class),
+                   notNullValue());
 
-    @Inject
-    CheckInjectionTest(WebTarget baseTarget) {
-        this.baseTarget = baseTarget;
     }
 
     @Test
-    void testCheckInjection() {
-        WebTarget target = baseTarget.path("/check");
-        assertThat(target.request().get().getStatus(), is(200));
+    public void buildAndCompareClassNamed() {
+        QualifierAndValueDefault qav1 = QualifierAndValueDefault.createNamed(new FakeNamed());
+        QualifierAndValueDefault qav2 = QualifierAndValueDefault.createNamed(new FakeClassNamed());
+
+        assertThat(qav1.compareTo(qav2),
+                   is(0));
+        assertThat(qav2.compareTo(qav1),
+                   is(0));
+    }
+
+    class FakeNamed implements Named {
+        @Override
+        public String value() {
+            return QualifierAndValueDefaultTest.class.getName();
+        }
+
+        @Override
+        public Class<? extends Annotation> annotationType() {
+            return Named.class;
+        }
     }
-}
+
+    class FakeClassNamed implements ClassNamed {
+        @Override
+        public Class value() {
+            return QualifierAndValueDefaultTest.class;
+        }
+
+        @Override
+        public Class<? extends Annotation> annotationType() {
+            return ClassNamed.class;
+        }
+    }
+
+}
diff --git a/...ction/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java b/...ction/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java
@@ -24,15 +24,11 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-<<<<<<<< HEAD:tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java
 /**
  * Unit test for {@link CheckInjectionResource}.
  */
 @HelidonTest
 class CheckInjectionTest {
-========
-class QualifierAndValueDefaultTest {
->>>>>>>> 23e63fe9f2 (resolves renaming):pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java
 
     private final WebTarget baseTarget;
 
@@ -46,4 +42,4 @@ void testCheckInjection() {
         WebTarget target = baseTarget.path("/check");
         assertThat(target.request().get().getStatus(), is(200));
     }
-}
+}