diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducer.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducer.java deleted file mode 100644 index 8d5131a..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducer.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.producer; - -import java.util.Locale; - -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; - -public class LocaleProducer { - - @Default - @Produces - public Locale create() { - return Locale.getDefault(); - } -} diff --git a/impl/core/src/test/java/configuration/defaultvalue/ConfigurationDefaultValueTest.java b/impl/core/src/test/java/configuration/defaultvalue/ConfigurationDefaultValueTest.java index e4854d0..0da60b2 100644 --- a/impl/core/src/test/java/configuration/defaultvalue/ConfigurationDefaultValueTest.java +++ b/impl/core/src/test/java/configuration/defaultvalue/ConfigurationDefaultValueTest.java @@ -46,7 +46,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; @RunWith(Arquillian.class) public class ConfigurationDefaultValueTest { diff --git a/impl/core/src/test/java/configuration/field/array/ConfigurationArrayFieldTest.java b/impl/core/src/test/java/configuration/field/array/ConfigurationArrayFieldTest.java index 999429a..b07e51c 100644 --- a/impl/core/src/test/java/configuration/field/array/ConfigurationArrayFieldTest.java +++ b/impl/core/src/test/java/configuration/field/array/ConfigurationArrayFieldTest.java @@ -50,7 +50,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/configuration/field/clazz/ConfigurationClassFieldTest.java b/impl/core/src/test/java/configuration/field/clazz/ConfigurationClassFieldTest.java index 202cfd7..c81e40d 100644 --- a/impl/core/src/test/java/configuration/field/clazz/ConfigurationClassFieldTest.java +++ b/impl/core/src/test/java/configuration/field/clazz/ConfigurationClassFieldTest.java @@ -47,7 +47,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/configuration/field/custom/ConfigurationCustomFieldTest.java b/impl/core/src/test/java/configuration/field/custom/ConfigurationCustomFieldTest.java index 88ff010..78e9130 100644 --- a/impl/core/src/test/java/configuration/field/custom/ConfigurationCustomFieldTest.java +++ b/impl/core/src/test/java/configuration/field/custom/ConfigurationCustomFieldTest.java @@ -48,7 +48,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/configuration/field/ignored/ConfigurationIgnoredFieldTest.java b/impl/core/src/test/java/configuration/field/ignored/ConfigurationIgnoredFieldTest.java index e85b7e0..8e6c568 100644 --- a/impl/core/src/test/java/configuration/field/ignored/ConfigurationIgnoredFieldTest.java +++ b/impl/core/src/test/java/configuration/field/ignored/ConfigurationIgnoredFieldTest.java @@ -46,7 +46,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; @RunWith(Arquillian.class) public class ConfigurationIgnoredFieldTest { diff --git a/impl/core/src/test/java/configuration/field/map/ConfigurationMapFieldTest.java b/impl/core/src/test/java/configuration/field/map/ConfigurationMapFieldTest.java index 74fc5f0..b6e0bb9 100644 --- a/impl/core/src/test/java/configuration/field/map/ConfigurationMapFieldTest.java +++ b/impl/core/src/test/java/configuration/field/map/ConfigurationMapFieldTest.java @@ -49,7 +49,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; @RunWith(Arquillian.class) public class ConfigurationMapFieldTest { diff --git a/impl/core/src/test/java/configuration/field/named/ConfigurationNamedFieldTest.java b/impl/core/src/test/java/configuration/field/named/ConfigurationNamedFieldTest.java index be9406f..ffa0364 100644 --- a/impl/core/src/test/java/configuration/field/named/ConfigurationNamedFieldTest.java +++ b/impl/core/src/test/java/configuration/field/named/ConfigurationNamedFieldTest.java @@ -47,7 +47,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/configuration/field/notnull/ConfigurationNotNullFieldTest.java b/impl/core/src/test/java/configuration/field/notnull/ConfigurationNotNullFieldTest.java index 4b4d61a..b6cb377 100644 --- a/impl/core/src/test/java/configuration/field/notnull/ConfigurationNotNullFieldTest.java +++ b/impl/core/src/test/java/configuration/field/notnull/ConfigurationNotNullFieldTest.java @@ -49,7 +49,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java b/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java index 725718a..452d5c2 100644 --- a/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java +++ b/impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java @@ -49,7 +49,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/configuration/field/string/ConfigurationStringFieldTest.java b/impl/core/src/test/java/configuration/field/string/ConfigurationStringFieldTest.java index be72f00..85bd5d2 100644 --- a/impl/core/src/test/java/configuration/field/string/ConfigurationStringFieldTest.java +++ b/impl/core/src/test/java/configuration/field/string/ConfigurationStringFieldTest.java @@ -47,7 +47,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; @RunWith(Arquillian.class) public class ConfigurationStringFieldTest { diff --git a/impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java b/impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java index da4f366..5d296cc 100644 --- a/impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java +++ b/impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java @@ -47,7 +47,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; @RunWith(Arquillian.class) public class ConfigurationPrefixTest { diff --git a/impl/core/src/test/java/configuration/resource/ConfigurationResourceTest.java b/impl/core/src/test/java/configuration/resource/ConfigurationResourceTest.java index ce8e6f9..2dcef73 100644 --- a/impl/core/src/test/java/configuration/resource/ConfigurationResourceTest.java +++ b/impl/core/src/test/java/configuration/resource/ConfigurationResourceTest.java @@ -46,7 +46,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; @RunWith(Arquillian.class) public class ConfigurationResourceTest { diff --git a/impl/core/src/test/java/configuration/scope/ConfigurationScopeTest.java b/impl/core/src/test/java/configuration/scope/ConfigurationScopeTest.java index 5d7a674..3956488 100644 --- a/impl/core/src/test/java/configuration/scope/ConfigurationScopeTest.java +++ b/impl/core/src/test/java/configuration/scope/ConfigurationScopeTest.java @@ -45,7 +45,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.util.Beans; @RunWith(Arquillian.class) diff --git a/impl/core/src/test/java/security/athentication/ambiguity/AmbiguousAuthenticatorTest.java b/impl/core/src/test/java/security/athentication/ambiguity/AmbiguousAuthenticatorTest.java index bdfafc6..0c61435 100644 --- a/impl/core/src/test/java/security/athentication/ambiguity/AmbiguousAuthenticatorTest.java +++ b/impl/core/src/test/java/security/athentication/ambiguity/AmbiguousAuthenticatorTest.java @@ -48,7 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import security.athentication.custom.CustomAuthenticator; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.security.SecurityContext; import configuration.resource.ConfigurationResourceTest; diff --git a/impl/core/src/test/java/security/athentication/custom/CustomAuthenticatorTest.java b/impl/core/src/test/java/security/athentication/custom/CustomAuthenticatorTest.java index ec8c49e..0e286c2 100644 --- a/impl/core/src/test/java/security/athentication/custom/CustomAuthenticatorTest.java +++ b/impl/core/src/test/java/security/athentication/custom/CustomAuthenticatorTest.java @@ -49,7 +49,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.security.SecurityContext; import configuration.resource.ConfigurationResourceTest; diff --git a/impl/core/src/test/java/security/athentication/selection/SelectedAuthenticatorTest.java b/impl/core/src/test/java/security/athentication/selection/SelectedAuthenticatorTest.java index c799210..b47c925 100644 --- a/impl/core/src/test/java/security/athentication/selection/SelectedAuthenticatorTest.java +++ b/impl/core/src/test/java/security/athentication/selection/SelectedAuthenticatorTest.java @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; import security.athentication.ambiguity.DuplicatedCustomAuthenticator; import security.athentication.custom.CustomAuthenticator; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.security.SecurityContext; import configuration.resource.ConfigurationResourceTest; diff --git a/impl/core/src/test/java/security/athentication/undefined/UndefinedAuthenticatorTest.java b/impl/core/src/test/java/security/athentication/undefined/UndefinedAuthenticatorTest.java index 3fe88ab..3fcdd2a 100644 --- a/impl/core/src/test/java/security/athentication/undefined/UndefinedAuthenticatorTest.java +++ b/impl/core/src/test/java/security/athentication/undefined/UndefinedAuthenticatorTest.java @@ -46,7 +46,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import util.Tests; +import test.Tests; import br.gov.frameworkdemoiselle.security.AuthenticationException; import br.gov.frameworkdemoiselle.security.SecurityContext; diff --git a/impl/core/src/test/java/test/LocaleProducer.java b/impl/core/src/test/java/test/LocaleProducer.java new file mode 100644 index 0000000..d324a66 --- /dev/null +++ b/impl/core/src/test/java/test/LocaleProducer.java @@ -0,0 +1,51 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package test; + +import java.util.Locale; + +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; + +public class LocaleProducer { + + @Default + @Produces + public Locale create() { + return Locale.getDefault(); + } +} diff --git a/impl/core/src/test/java/test/Tests.java b/impl/core/src/test/java/test/Tests.java new file mode 100644 index 0000000..d38a4c3 --- /dev/null +++ b/impl/core/src/test/java/test/Tests.java @@ -0,0 +1,69 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package test; + +import java.io.File; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.asset.FileAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; + +public final class Tests { + + private Tests() { + } + + public static JavaArchive createDeployment(Class baseClass) { + return createDeployment().addPackages(true, baseClass.getPackage()); + } + + public static JavaArchive createDeployment() { + return ShrinkWrap + .create(JavaArchive.class) + .addClass(LocaleProducer.class) + .addPackages(true, "br") + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsManifestResource( + new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), + "services/javax.enterprise.inject.spi.Extension"); + } + + public static FileAsset createFileAsset(String pathname) { + return new FileAsset(new File(pathname)); + } +} diff --git a/impl/core/src/test/java/util/Tests.java b/impl/core/src/test/java/util/Tests.java deleted file mode 100644 index 59fb919..0000000 --- a/impl/core/src/test/java/util/Tests.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package util; - -import java.io.File; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.asset.FileAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; - -public final class Tests { - - private Tests() { - } - - public static JavaArchive createDeployment(Class baseClass) { - return createDeployment().addPackages(true, baseClass.getPackage()); - } - - public static JavaArchive createDeployment() { - return ShrinkWrap - .create(JavaArchive.class) - .addPackages(true, "br") - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsManifestResource( - new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), - "services/javax.enterprise.inject.spi.Extension"); - } - - public static FileAsset createFileAsset(String pathname) { - return new FileAsset(new File(pathname)); - } -} diff --git a/impl/core/src/uml/injection-producer.ucls b/impl/core/src/uml/injection-producer.ucls index 4aac609..e1b1479 100644 --- a/impl/core/src/uml/injection-producer.ucls +++ b/impl/core/src/uml/injection-producer.ucls @@ -38,7 +38,7 @@ - -- libgit2 0.21.2