From aa4ea911450b4a3fc0f512986f4d516b85ad8ab7 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 15 Aug 2013 10:14:29 -0300 Subject: [PATCH] Correção do @Deployment dos teste do management --- impl/core/src/test/java/management/AnnotationTestCase.java | 4 ++-- impl/core/src/test/java/management/ManagementBootstrapTestCase.java | 4 ++-- impl/core/src/test/java/management/ManagementTestCase.java | 40 ++++++++++++++++++---------------------- impl/core/src/test/java/management/NotificationTestCase.java | 48 ++++++++++++++++++++++++------------------------ impl/core/src/test/java/management/ValidationTestCase.java | 13 +++++-------- 5 files changed, 51 insertions(+), 58 deletions(-) diff --git a/impl/core/src/test/java/management/AnnotationTestCase.java b/impl/core/src/test/java/management/AnnotationTestCase.java index 049bd55..075af76 100644 --- a/impl/core/src/test/java/management/AnnotationTestCase.java +++ b/impl/core/src/test/java/management/AnnotationTestCase.java @@ -53,7 +53,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import test.LocaleProducer; +import test.Tests; //TODO O arquillian está com um problema onde, embora os testes rodem todos individualmente, //ao pedir para rodar todos este teste individual causa todos os testes executados após esse @@ -70,7 +70,7 @@ public class AnnotationTestCase { public static JavaArchive createWrongAnnotationDeployment() { return ShrinkWrap .create(JavaArchive.class) - .addClass(LocaleProducer.class) + .addClass(Tests.class) .addPackages(true, "br") .addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml") .addAsManifestResource( diff --git a/impl/core/src/test/java/management/ManagementBootstrapTestCase.java b/impl/core/src/test/java/management/ManagementBootstrapTestCase.java index 07599aa..1c9b021 100644 --- a/impl/core/src/test/java/management/ManagementBootstrapTestCase.java +++ b/impl/core/src/test/java/management/ManagementBootstrapTestCase.java @@ -55,7 +55,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import test.LocaleProducer; +import test.Tests; import br.gov.frameworkdemoiselle.internal.management.ManagedType; import br.gov.frameworkdemoiselle.lifecycle.ManagementExtension; import br.gov.frameworkdemoiselle.util.Beans; @@ -72,7 +72,7 @@ public class ManagementBootstrapTestCase { public static JavaArchive createDeployment() { return ShrinkWrap .create(JavaArchive.class) - .addClass(LocaleProducer.class) + .addClass(Tests.class) .addPackages(true, "br") .addAsResource( new FileAsset(new File( diff --git a/impl/core/src/test/java/management/ManagementTestCase.java b/impl/core/src/test/java/management/ManagementTestCase.java index cb5570c..1ee7f4c 100644 --- a/impl/core/src/test/java/management/ManagementTestCase.java +++ b/impl/core/src/test/java/management/ManagementTestCase.java @@ -53,7 +53,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import test.LocaleProducer; +import test.Tests; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.util.Beans; @@ -70,18 +70,15 @@ public class ManagementTestCase { public static JavaArchive createMultithreadedDeployment() { return ShrinkWrap .create(JavaArchive.class) - .addClass(LocaleProducer.class) + .addClass(Tests.class) .addPackages(true, "br") .addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml") .addAsManifestResource( new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), "services/javax.enterprise.inject.spi.Extension") .addPackages(false, ManagementTestCase.class.getPackage()) - .addClasses(DummyManagementExtension.class - , DummyManagedClass.class - , ManagedClassStore.class - , RequestScopeBeanClient.class - , RequestScopedClass.class); + .addClasses(DummyManagementExtension.class, DummyManagedClass.class, ManagedClassStore.class, + RequestScopeBeanClient.class, RequestScopedClass.class); } @Test @@ -167,32 +164,31 @@ public class ManagementTestCase { } } - + @Test - public void testAccessLevelControl(){ - //tentamos escrever em uma propriedade que, apesar de ter método setter, está marcada como read-only. + public void testAccessLevelControl() { + // tentamos escrever em uma propriedade que, apesar de ter método setter, está marcada como read-only. ManagedClassStore store = Beans.getReference(ManagedClassStore.class); - - try{ - store.setProperty(DummyManagedClass.class, "readOnlyPropertyWithSetMethod","A Value"); + + try { + store.setProperty(DummyManagedClass.class, "readOnlyPropertyWithSetMethod", "A Value"); Assert.fail(); - } - catch(DemoiselleException de){ + } catch (DemoiselleException de) { System.out.println(de.getMessage()); - //success + // success } } - + @Test public void testRequestScopedOperation() { ManagedClassStore store = Beans.getReference(ManagedClassStore.class); - - //Esta operação faz multiplos acessos a um bean RequestScoped. Durante a operação todos os acessos devem - //operar sob a mesma instância, mas uma segunda invocação deve operar em uma instância nova + + // Esta operação faz multiplos acessos a um bean RequestScoped. Durante a operação todos os acessos devem + // operar sob a mesma instância, mas uma segunda invocação deve operar em uma instância nova Object info = store.invoke(DummyManagedClass.class, "requestScopedOperation"); Assert.assertEquals("-OPERATION ONE CALLED--OPERATION TWO CALLED-", info); - - //Segunda invocação para testar se uma nova instância é criada, já que esse é um novo request. + + // Segunda invocação para testar se uma nova instância é criada, já que esse é um novo request. info = store.invoke(DummyManagedClass.class, "requestScopedOperation"); Assert.assertEquals("-OPERATION ONE CALLED--OPERATION TWO CALLED-", info); } diff --git a/impl/core/src/test/java/management/NotificationTestCase.java b/impl/core/src/test/java/management/NotificationTestCase.java index 005e5d0..e0f230f 100644 --- a/impl/core/src/test/java/management/NotificationTestCase.java +++ b/impl/core/src/test/java/management/NotificationTestCase.java @@ -52,7 +52,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import test.LocaleProducer; +import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.internal.management.ManagedType; import br.gov.frameworkdemoiselle.internal.management.Management; @@ -63,74 +63,74 @@ import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; /** - * Test the {@link NotificationManager} with a dummy extension - * to check if notifications are correctly propagated + * Test the {@link NotificationManager} with a dummy extension to check if notifications are correctly propagated * * @author serpro - * */ @RunWith(Arquillian.class) public class NotificationTestCase { - + @Inject private NotificationManager manager; - + @Inject @Name("demoiselle-core-bundle") private ResourceBundle bundle; - + @Deployment public static JavaArchive createDeployment() { return ShrinkWrap .create(JavaArchive.class) - .addClass(LocaleProducer.class) + .addClass(Tests.class) .addPackages(true, "br") .addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml") .addAsManifestResource( new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), "services/javax.enterprise.inject.spi.Extension") .addPackages(false, NotificationTestCase.class.getPackage()) - .addClasses(DummyNotificationListener.class,DummyManagedClass.class); + .addClasses(DummyNotificationListener.class, DummyManagedClass.class); } - + /** * Test sending a normal notification */ @Test - public void testSendGenericNotification(){ + public void testSendGenericNotification() { manager.sendNotification(new GenericNotification("Test Message")); DummyNotificationListener listener = Beans.getReference(DummyNotificationListener.class); Assert.assertEquals("Test Message", listener.getMessage()); } - + /** * Test sending a notification of change in attribute */ @Test - public void testSendAttributeChangeNotification(){ - manager.sendNotification(new AttributeChangeNotification("Test Message", "attribute", String.class, "old", "new")); + public void testSendAttributeChangeNotification() { + manager.sendNotification(new AttributeChangeNotification("Test Message", "attribute", String.class, "old", + "new")); DummyNotificationListener listener = Beans.getReference(DummyNotificationListener.class); Assert.assertEquals("Test Message - attribute", listener.getMessage()); } - + /** - * Test if notifications are automatically sent when an attribute from a managed - * class change values + * Test if notifications are automatically sent when an attribute from a managed class change values */ @Test - public void testNotifyChangeManagedClass(){ + public void testNotifyChangeManagedClass() { Management manager = Beans.getReference(Management.class); - - for (ManagedType type : manager.getManagedTypes()){ - if (type.getType().equals(DummyManagedClass.class)){ + + for (ManagedType type : manager.getManagedTypes()) { + if (type.getType().equals(DummyManagedClass.class)) { manager.setProperty(type, "id", new Integer(10)); break; } } - + DummyNotificationListener listener = Beans.getReference(DummyNotificationListener.class); - Assert.assertEquals( bundle.getString("management-notification-attribute-changed","id",DummyManagedClass.class.getCanonicalName()) + " - id" - , listener.getMessage()); + Assert.assertEquals( + bundle.getString("management-notification-attribute-changed", "id", + DummyManagedClass.class.getCanonicalName()) + + " - id", listener.getMessage()); } } diff --git a/impl/core/src/test/java/management/ValidationTestCase.java b/impl/core/src/test/java/management/ValidationTestCase.java index 2e431c7..7ba8133 100644 --- a/impl/core/src/test/java/management/ValidationTestCase.java +++ b/impl/core/src/test/java/management/ValidationTestCase.java @@ -17,7 +17,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import test.LocaleProducer; +import test.Tests; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.util.Beans; @@ -28,18 +28,15 @@ public class ValidationTestCase { public static JavaArchive createDeployment() { return ShrinkWrap .create(JavaArchive.class) - .addClass(LocaleProducer.class) + .addClass(Tests.class) .addPackages(true, "br") .addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml") .addAsManifestResource( new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), "services/javax.enterprise.inject.spi.Extension") .addPackages(false, NotificationTestCase.class.getPackage()) - .addClasses(DummyManagementExtension.class - , ManagedClassStore.class - , DummyManagedClass.class - , DummyValidator.class - , DummyValidatorAnnotation.class); + .addClasses(DummyManagementExtension.class, ManagedClassStore.class, DummyManagedClass.class, + DummyValidator.class, DummyValidatorAnnotation.class); } /** @@ -87,7 +84,7 @@ public class ValidationTestCase { Assert.fail(); } catch (DemoiselleException e) { - Assert.assertTrue( e.getMessage().contains("Test Message") ); + Assert.assertTrue(e.getMessage().contains("Test Message")); } } -- libgit2 0.21.2