Updated Branches: refs/heads/master 84c21570d -> 97bde1241
DELTASPIKE-479 added test Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/90c0129b Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/90c0129b Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/90c0129b Branch: refs/heads/master Commit: 90c0129b9fb375688f423f4dcc664002161ed855 Parents: 84c2157 Author: gpetracek <[email protected]> Authored: Wed Dec 25 17:22:54 2013 +0100 Committer: gpetracek <[email protected]> Committed: Wed Dec 25 17:22:54 2013 +0100 ---------------------------------------------------------------------- .../test/api/config/PropertyLoaderTest.java | 10 --- .../core/api/exclude/ExcludeEarFileTest.java | 45 +++++++++++++ .../test/core/api/exclude/ExcludeTest.java | 41 +----------- .../core/api/exclude/ExcludeWarFileTest.java | 70 ++++++++++++++++++++ 4 files changed, 116 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/90c0129b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/PropertyLoaderTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/PropertyLoaderTest.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/PropertyLoaderTest.java index 3dcb23a..a414a3e 100644 --- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/PropertyLoaderTest.java +++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/PropertyLoaderTest.java @@ -18,22 +18,12 @@ */ package org.apache.deltaspike.test.api.config; -import org.apache.deltaspike.core.api.config.ConfigResolver; import org.apache.deltaspike.core.api.config.PropertyLoader; import org.apache.deltaspike.core.api.projectstage.ProjectStage; import org.apache.deltaspike.core.util.ProjectStageProducer; -import org.apache.deltaspike.test.category.SeCategory; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/90c0129b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java new file mode 100644 index 0000000..fe9f2df --- /dev/null +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java @@ -0,0 +1,45 @@ +/* +* 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 of 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.deltaspike.test.core.api.exclude; + +import org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +/** + * Tests for {@link org.apache.deltaspike.core.api.exclude.Exclude} + */ +@RunWith(Arquillian.class) +@Category(EnterpriseArchiveProfileCategory.class) +public class ExcludeEarFileTest extends ExcludeTest +{ + @Deployment + public static EnterpriseArchive deployEar() + { + String simpleName = ExcludeEarFileTest.class.getSimpleName(); + String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); + + return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") + .addAsModule(ExcludeWarFileTest.deploy()); + } +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/90c0129b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java index 970c528..f8c09ae 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java @@ -18,58 +18,19 @@ */ package org.apache.deltaspike.test.core.api.exclude; - import org.apache.deltaspike.core.api.provider.BeanProvider; -import org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension; -import org.apache.deltaspike.core.util.ProjectStageProducer; -import org.apache.deltaspike.test.core.impl.activation.TestClassDeactivator; -import org.apache.deltaspike.test.util.ArchiveUtils; -import org.apache.deltaspike.test.util.FileUtils; -import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.enterprise.inject.spi.Extension; -import java.net.URL; - /** * Tests for {@link org.apache.deltaspike.core.api.exclude.Exclude} */ @RunWith(Arquillian.class) -public class ExcludeTest +public abstract class ExcludeTest { /** - * X TODO creating a WebArchive is only a workaround because JavaArchive cannot contain other archives. - */ - @Deployment - public static WebArchive deploy() - { - System.setProperty("org.apache.deltaspike.ProjectStage", "Production"); - ProjectStageProducer.setProjectStage(null); - - URL fileUrl = ExcludeTest.class.getClassLoader() - .getResource("META-INF/apache-deltaspike.properties"); - - JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeTest.jar") - .addPackage(ExcludeTest.class.getPackage()) - .addPackage(TestClassDeactivator.class.getPackage()) - .addAsManifestResource(FileUtils.getFileForURL(fileUrl.toString())) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - - return ShrinkWrap.create(WebArchive.class, "exclude.war") - .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive()) - .addAsLibraries(testJar) - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsServiceProvider(Extension.class, ExcludeExtension.class); - } - - /** * check if this package is included at all */ @Test http://git-wip-us.apache.org/repos/asf/deltaspike/blob/90c0129b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java new file mode 100644 index 0000000..5921b93 --- /dev/null +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java @@ -0,0 +1,70 @@ +/* +* 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 of 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.deltaspike.test.core.api.exclude; + +import org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension; +import org.apache.deltaspike.core.util.ProjectStageProducer; +import org.apache.deltaspike.test.core.impl.activation.TestClassDeactivator; +import org.apache.deltaspike.test.util.ArchiveUtils; +import org.apache.deltaspike.test.util.FileUtils; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.runner.RunWith; + +import javax.enterprise.inject.spi.Extension; +import java.net.URL; + +/** + * Tests for {@link org.apache.deltaspike.core.api.exclude.Exclude} + */ +@RunWith(Arquillian.class) +public class ExcludeWarFileTest extends ExcludeTest +{ + /** + * X TODO creating a WebArchive is only a workaround because JavaArchive cannot contain other archives. + */ + @Deployment + public static WebArchive deploy() + { + String simpleName = ExcludeWarFileTest.class.getSimpleName(); + String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); + + System.setProperty("org.apache.deltaspike.ProjectStage", "Production"); + ProjectStageProducer.setProjectStage(null); + + URL fileUrl = ExcludeWarFileTest.class.getClassLoader() + .getResource("META-INF/apache-deltaspike.properties"); + + JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeTest.jar") + .addPackage(ExcludeWarFileTest.class.getPackage()) + .addPackage(TestClassDeactivator.class.getPackage()) + .addAsManifestResource(FileUtils.getFileForURL(fileUrl.toString())) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + + return ShrinkWrap.create(WebArchive.class, archiveName + ".war") + .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive()) + .addAsLibraries(testJar) + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsServiceProvider(Extension.class, ExcludeExtension.class); + } +}
