Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 2acb69b3d -> 826f9841f
Fixed broken IT by splitting the test class into two separate classes. This is a simply solution and should be ok as this tests fails only if we run all tests at once on the commandline. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/826f9841 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/826f9841 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/826f9841 Branch: refs/heads/master Commit: 826f9841f4642138d7dc37299fe9a4169fa99647 Parents: 2acb69b Author: Oliver B. Fischer <[email protected]> Authored: Wed Nov 22 10:17:44 2017 +0100 Committer: Oliver B. Fischer <[email protected]> Committed: Wed Nov 22 10:24:32 2017 +0100 ---------------------------------------------------------------------- .../tamaya/cdi/BaseTestConfiguration.java | 43 ++++++++++++++++ .../org/apache/tamaya/cdi/ConfiguredBTest.java | 54 ++++++++++++++++++++ .../org/apache/tamaya/cdi/ConfiguredTest.java | 24 +-------- 3 files changed, 98 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/826f9841/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/BaseTestConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/BaseTestConfiguration.java b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/BaseTestConfiguration.java new file mode 100644 index 0000000..ad762a7 --- /dev/null +++ b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/BaseTestConfiguration.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy current the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.tamaya.cdi; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.mockito.AdditionalMatchers; + +import javax.enterprise.inject.spi.Extension; + +abstract class BaseTestConfiguration { + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(WebArchive.class) + .addClasses(ConfiguredTest.class, ConfiguredClass.class, InjectedClass.class, + AdditionalMatchers.class, NotFoundNoDefault.class, + ConfigurationProducer.class) + .addAsServiceProvider(Extension.class, TamayaCDIInjectionExtension.class) + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsWebInfResource("META-INF/javaconfiguration.properties", "META-INF/javaconfiguration.properties"); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/826f9841/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredBTest.java ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredBTest.java b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredBTest.java new file mode 100644 index 0000000..abb0721 --- /dev/null +++ b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredBTest.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy current the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.tamaya.cdi; + +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.AdditionalMatchers; + +import javax.enterprise.inject.spi.CDI; +import javax.enterprise.inject.spi.Extension; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +/** + * Tests for CDI integration. + */ +@RunWith(Arquillian.class) +public class ConfiguredBTest extends BaseTestConfiguration { + @Test + public void test_Configuration_is_injected_correctly(){ + ConfiguredClass item = CDI.current().select(ConfiguredClass.class).get(); + System.out.println("********************************************"); + System.out.println(item); + System.out.println("********************************************"); + double actual = 1234.5678; + MatcherAssert.assertThat(item.getDoubleValue(), is(actual)); + } +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/826f9841/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredTest.java ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredTest.java b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredTest.java index f50a9c6..8143d95 100644 --- a/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredTest.java +++ b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfiguredTest.java @@ -28,7 +28,6 @@ import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.model.InitializationError; import org.mockito.AdditionalMatchers; import javax.enterprise.inject.spi.CDI; @@ -42,28 +41,7 @@ import static org.junit.Assert.assertTrue; * Tests for CDI integration. */ @RunWith(Arquillian.class) -public class ConfiguredTest { - - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(ConfiguredTest.class, ConfiguredClass.class, InjectedClass.class, - AdditionalMatchers.class, NotFoundNoDefault.class, - ConfigurationProducer.class) - .addAsServiceProvider(Extension.class, TamayaCDIInjectionExtension.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsWebInfResource("META-INF/javaconfiguration.properties", "META-INF/javaconfiguration.properties"); - } - - @Test - public void test_Configuration_is_injected_correctly(){ - ConfiguredClass item = CDI.current().select(ConfiguredClass.class).get(); - System.out.println("********************************************"); - System.out.println(item); - System.out.println("********************************************"); - double actual = 1234.5678; - MatcherAssert.assertThat(item.getDoubleValue(), is(actual)); - } +public class ConfiguredTest extends BaseTestConfiguration { @Test public void test_Default_injections_are_accessible(){
