From 29a272027d599ccdfd06a63de5aa4612578412be Mon Sep 17 00:00:00 2001 From: Emily-Jiang Date: Thu, 16 Sep 2021 10:18:59 +0100 Subject: [PATCH 1/3] AdditionalAssertions missing in the test war --- .../eclipse/microprofile/config/tck/ArrayConverterTest.java | 3 ++- .../org/eclipse/microprofile/config/tck/ConverterTest.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java index b9ea22ef..4a2e6dae 100644 --- a/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java @@ -46,6 +46,7 @@ import org.eclipse.microprofile.config.spi.Converter; import org.eclipse.microprofile.config.tck.converters.Pizza; import org.eclipse.microprofile.config.tck.converters.PizzaConverter; +import org.eclipse.microprofile.config.tck.util.AdditionalAssertions; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -69,7 +70,7 @@ public static WebArchive deploy() { JavaArchive testJar = ShrinkWrap .create(JavaArchive.class, "arrayConverterTest.jar") .addPackage(PizzaConverter.class.getPackage()) - .addClasses(ArrayConverterTest.class, ArrayConverterBean.class) + .addClasses(ArrayConverterTest.class, ArrayConverterBean.class, AdditionalAssertions.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsServiceProvider(Converter.class, PizzaConverter.class) .as(JavaArchive.class); diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java index e3b61fd5..470186db 100644 --- a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java @@ -52,6 +52,7 @@ import org.eclipse.microprofile.config.tck.converters.Duck; import org.eclipse.microprofile.config.tck.converters.DuckConverter; import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter; +import org.eclipse.microprofile.config.tck.util.AdditionalAssertions; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -79,7 +80,8 @@ public static WebArchive deploy() { .create(JavaArchive.class, "converterTest.jar") .addClass(ConverterTest.class) .addPackage(CustomDbConfigSource.class.getPackage()) - .addClasses(DuckConverter.class, Duck.class, Donald.class, UpperCaseDuckConverter.class) + .addClasses(DuckConverter.class, Duck.class, Donald.class, UpperCaseDuckConverter.class, + AdditionalAssertions.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsServiceProvider(ConfigSource.class, CustomDbConfigSource.class) .addAsServiceProvider(ConfigSourceProvider.class, CustomConfigSourceProvider.class) From 5e5e6a70b2a84312ac864175597a92381b007ea2 Mon Sep 17 00:00:00 2001 From: Emily-Jiang Date: Thu, 16 Sep 2021 11:05:04 +0100 Subject: [PATCH 2/3] update copyright year --- .../org/eclipse/microprofile/config/tck/ArrayConverterTest.java | 2 +- .../java/org/eclipse/microprofile/config/tck/ConverterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java index 4a2e6dae..f6dd8bbe 100644 --- a/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/config/tck/ArrayConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Contributors to the Eclipse Foundation + * Copyright (c) 2017, 2021 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java index 470186db..a1d4da65 100644 --- a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation + * Copyright (c) 2016, 2021 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. From cf767dd99d2189151b880c5538bd998adeea7d4a Mon Sep 17 00:00:00 2001 From: Emily-Jiang Date: Thu, 16 Sep 2021 11:10:33 +0100 Subject: [PATCH 3/3] Fixes: 664 --- .../org/eclipse/microprofile/config/tck/ConfigProviderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConfigProviderTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConfigProviderTest.java index e78543d7..114a08ed 100644 --- a/tck/src/main/java/org/eclipse/microprofile/config/tck/ConfigProviderTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/config/tck/ConfigProviderTest.java @@ -83,7 +83,6 @@ public static void setupCheck() { @Test public void testEnvironmentConfigSource() { - Assert.assertNotNull(config.getValue("path", String.class)); String value = System.getenv().get("MP_TCK_ENV_DUMMY"); Assert.assertNotNull(value); Assert.assertEquals("dummy", value);