Download as
Browse Code »

Commit f272192b10946e976b9cd5d2dbb04536e7bd09c0

Authored by Cleverson Sacramento
1 parent be55bc1b
Exists in master

Mais simplificações na estrutura dos testes

Showing 15 changed files with 30 additions and 53 deletions   Show diff stats
impl/core/src/test/java/configuration/ConfigurationTests.java
  Diff comments   View file @f272192
@@ -47,10 +47,11 @@ public final class ConfigurationTests { @@ -47,10 +47,11 @@ public final class ConfigurationTests {
47 private ConfigurationTests() { 47 private ConfigurationTests() {
48 } 48 }
49 49
50 - public static JavaArchive createDeployment() { 50 + public static JavaArchive createDeployment(Class<?> baseClass) {
51 return ShrinkWrap 51 return ShrinkWrap
52 .create(JavaArchive.class) 52 .create(JavaArchive.class)
53 .addPackages(true, "br") 53 .addPackages(true, "br")
  54 + .addPackages(true, baseClass.getPackage())
54 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") 55 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
55 .addAsManifestResource( 56 .addAsManifestResource(
56 new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), 57 new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
impl/core/src/test/java/configuration/defaultvalue/ConfigurationDefaultValueTest.java
  Diff comments   View file @f272192
@@ -52,7 +52,7 @@ import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ import org.junit.runner.RunWith;
52 import configuration.ConfigurationTests; 52 import configuration.ConfigurationTests;
53 53
54 @RunWith(Arquillian.class) 54 @RunWith(Arquillian.class)
55 -public class ConfigurationDefaultValueTest { 55 +public class ConfigurationDefaultValueTest {
56 56
57 @Inject 57 @Inject
58 private FilledDefaultValueConfig filledFieldConfig; 58 private FilledDefaultValueConfig filledFieldConfig;
@@ -65,9 +65,8 @@ public class ConfigurationDefaultValueTest { @@ -65,9 +65,8 @@ public class ConfigurationDefaultValueTest {
65 65
66 @Deployment 66 @Deployment
67 public static JavaArchive createDeployment() { 67 public static JavaArchive createDeployment() {
68 - JavaArchive deployment = ConfigurationTests.createDeployment(); 68 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationDefaultValueTest.class);
69 69
70 - deployment.addPackages(true, ConfigurationDefaultValueTest.class.getPackage());  
71 deployment.addAsResource( 70 deployment.addAsResource(
72 new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.properties")), 71 new FileAsset(new File("src/test/resources/configuration/field/default/demoiselle.properties")),
73 "demoiselle.properties").addAsResource( 72 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/field/array/ConfigurationArrayFieldTest.java
  Diff comments   View file @f272192
@@ -57,7 +57,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -57,7 +57,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
57 import configuration.ConfigurationTests; 57 import configuration.ConfigurationTests;
58 58
59 @RunWith(Arquillian.class) 59 @RunWith(Arquillian.class)
60 -public class ConfigurationArrayFieldTest { 60 +public class ConfigurationArrayFieldTest {
61 61
62 @Inject 62 @Inject
63 private PropertiesArrayFieldConfig propertiesConfig; 63 private PropertiesArrayFieldConfig propertiesConfig;
@@ -70,9 +70,7 @@ public class ConfigurationArrayFieldTest { @@ -70,9 +70,7 @@ public class ConfigurationArrayFieldTest {
70 70
71 @Deployment 71 @Deployment
72 public static JavaArchive createDeployment() { 72 public static JavaArchive createDeployment() {
73 - JavaArchive deployment = ConfigurationTests.createDeployment();  
74 -  
75 - deployment.addPackages(true, ConfigurationArrayFieldTest.class.getPackage()); 73 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationArrayFieldTest.class);
76 deployment.addAsResource( 74 deployment.addAsResource(
77 new FileAsset(new File("src/test/resources/configuration/field/array/demoiselle.properties")), 75 new FileAsset(new File("src/test/resources/configuration/field/array/demoiselle.properties")),
78 "demoiselle.properties").addAsResource( 76 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/field/clazz/ConfigurationClassFieldTest.java
  Diff comments   View file @f272192
@@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
54 import configuration.ConfigurationTests; 54 import configuration.ConfigurationTests;
55 55
56 @RunWith(Arquillian.class) 56 @RunWith(Arquillian.class)
57 -public class ConfigurationClassFieldTest { 57 +public class ConfigurationClassFieldTest {
58 58
59 @Inject 59 @Inject
60 private PropertiesExistentClassFieldConfig propertiesExistentConfig; 60 private PropertiesExistentClassFieldConfig propertiesExistentConfig;
@@ -67,9 +67,7 @@ public class ConfigurationClassFieldTest { @@ -67,9 +67,7 @@ public class ConfigurationClassFieldTest {
67 67
68 @Deployment 68 @Deployment
69 public static JavaArchive createDeployment() { 69 public static JavaArchive createDeployment() {
70 - JavaArchive deployment = ConfigurationTests.createDeployment();  
71 -  
72 - deployment.addPackages(true, ConfigurationClassFieldTest.class.getPackage()); 70 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationClassFieldTest.class);
73 deployment.addAsResource(new FileAsset(new File( 71 deployment.addAsResource(new FileAsset(new File(
74 "src/test/resources/configuration/field/class/demoiselle.properties")), "demoiselle.properties"); 72 "src/test/resources/configuration/field/class/demoiselle.properties")), "demoiselle.properties");
75 73
impl/core/src/test/java/configuration/field/custom/ConfigurationCustomFieldTest.java
  Diff comments   View file @f272192
@@ -55,7 +55,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -55,7 +55,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
55 import configuration.ConfigurationTests; 55 import configuration.ConfigurationTests;
56 56
57 @RunWith(Arquillian.class) 57 @RunWith(Arquillian.class)
58 -public class ConfigurationCustomFieldTest { 58 +public class ConfigurationCustomFieldTest {
59 59
60 @Inject 60 @Inject
61 private CustomMappedFieldConfig mappedField; 61 private CustomMappedFieldConfig mappedField;
@@ -65,9 +65,7 @@ public class ConfigurationCustomFieldTest { @@ -65,9 +65,7 @@ public class ConfigurationCustomFieldTest {
65 65
66 @Deployment 66 @Deployment
67 public static JavaArchive createDeployment() { 67 public static JavaArchive createDeployment() {
68 - JavaArchive deployment = ConfigurationTests.createDeployment();  
69 -  
70 - deployment.addPackages(true, ConfigurationCustomFieldTest.class.getPackage()); 68 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationCustomFieldTest.class);
71 deployment.addAsResource(new FileAsset(new File( 69 deployment.addAsResource(new FileAsset(new File(
72 "src/test/resources/configuration/field/custom/demoiselle.properties")), "demoiselle.properties"); 70 "src/test/resources/configuration/field/custom/demoiselle.properties")), "demoiselle.properties");
73 71
impl/core/src/test/java/configuration/field/ignored/ConfigurationIgnoredFieldTest.java
  Diff comments   View file @f272192
@@ -52,7 +52,7 @@ import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ import org.junit.runner.RunWith;
52 import configuration.ConfigurationTests; 52 import configuration.ConfigurationTests;
53 53
54 @RunWith(Arquillian.class) 54 @RunWith(Arquillian.class)
55 -public class ConfigurationIgnoredFieldTest { 55 +public class ConfigurationIgnoredFieldTest {
56 56
57 @Inject 57 @Inject
58 private FilledIgnoredFieldConfig filledFieldConfig; 58 private FilledIgnoredFieldConfig filledFieldConfig;
@@ -65,10 +65,7 @@ public class ConfigurationIgnoredFieldTest { @@ -65,10 +65,7 @@ public class ConfigurationIgnoredFieldTest {
65 65
66 @Deployment 66 @Deployment
67 public static JavaArchive createDeployment() { 67 public static JavaArchive createDeployment() {
68 - JavaArchive deployment = ConfigurationTests.createDeployment();  
69 -  
70 - deployment.addPackages(true, "br");  
71 - deployment.addPackages(true, ConfigurationIgnoredFieldTest.class.getPackage()); 68 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationIgnoredFieldTest.class);
72 deployment.addAsResource( 69 deployment.addAsResource(
73 new FileAsset(new File("src/test/resources/configuration/field/ignored/demoiselle.properties")), 70 new FileAsset(new File("src/test/resources/configuration/field/ignored/demoiselle.properties")),
74 "demoiselle.properties").addAsResource( 71 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/field/map/ConfigurationMapFieldTest.java
  Diff comments   View file @f272192
@@ -54,7 +54,7 @@ import org.junit.runner.RunWith; @@ -54,7 +54,7 @@ import org.junit.runner.RunWith;
54 import configuration.ConfigurationTests; 54 import configuration.ConfigurationTests;
55 55
56 @RunWith(Arquillian.class) 56 @RunWith(Arquillian.class)
57 -public class ConfigurationMapFieldTest { 57 +public class ConfigurationMapFieldTest {
58 58
59 @Inject 59 @Inject
60 private PropertiesMapFieldConfig propertiesConfig; 60 private PropertiesMapFieldConfig propertiesConfig;
@@ -64,9 +64,7 @@ public class ConfigurationMapFieldTest { @@ -64,9 +64,7 @@ public class ConfigurationMapFieldTest {
64 64
65 @Deployment 65 @Deployment
66 public static JavaArchive createDeployment() { 66 public static JavaArchive createDeployment() {
67 - JavaArchive deployment = ConfigurationTests.createDeployment();  
68 -  
69 - deployment.addPackages(true, ConfigurationMapFieldTest.class.getPackage()); 67 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationMapFieldTest.class);
70 deployment.addAsResource( 68 deployment.addAsResource(
71 new FileAsset(new File("src/test/resources/configuration/field/map/demoiselle.properties")), 69 new FileAsset(new File("src/test/resources/configuration/field/map/demoiselle.properties")),
72 "demoiselle.properties").addAsResource( 70 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/field/named/ConfigurationNamedFieldTest.java
  Diff comments   View file @f272192
@@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
54 import configuration.ConfigurationTests; 54 import configuration.ConfigurationTests;
55 55
56 @RunWith(Arquillian.class) 56 @RunWith(Arquillian.class)
57 -public class ConfigurationNamedFieldTest { 57 +public class ConfigurationNamedFieldTest {
58 58
59 @Inject 59 @Inject
60 private PropertyNamed propertyNamed; 60 private PropertyNamed propertyNamed;
@@ -70,9 +70,7 @@ public class ConfigurationNamedFieldTest { @@ -70,9 +70,7 @@ public class ConfigurationNamedFieldTest {
70 70
71 @Deployment 71 @Deployment
72 public static JavaArchive createDeployment() { 72 public static JavaArchive createDeployment() {
73 - JavaArchive deployment = ConfigurationTests.createDeployment();  
74 -  
75 - deployment.addPackages(true, ConfigurationNamedFieldTest.class.getPackage()); 73 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationNamedFieldTest.class);
76 deployment.addAsResource( 74 deployment.addAsResource(
77 new FileAsset(new File("src/test/resources/configuration/field/named/demoiselle.properties")), 75 new FileAsset(new File("src/test/resources/configuration/field/named/demoiselle.properties")),
78 "demoiselle.properties").addAsResource( 76 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/field/notnull/ConfigurationNotNullFieldTest.java
  Diff comments   View file @f272192
@@ -56,7 +56,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -56,7 +56,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
56 import configuration.ConfigurationTests; 56 import configuration.ConfigurationTests;
57 57
58 @RunWith(Arquillian.class) 58 @RunWith(Arquillian.class)
59 -public class ConfigurationNotNullFieldTest { 59 +public class ConfigurationNotNullFieldTest {
60 60
61 @Inject 61 @Inject
62 private PropertyWithFilledFieldConfig propertyFilledFieldConfig; 62 private PropertyWithFilledFieldConfig propertyFilledFieldConfig;
@@ -84,9 +84,7 @@ public class ConfigurationNotNullFieldTest { @@ -84,9 +84,7 @@ public class ConfigurationNotNullFieldTest {
84 84
85 @Deployment 85 @Deployment
86 public static JavaArchive createDeployment() { 86 public static JavaArchive createDeployment() {
87 - JavaArchive deployment = ConfigurationTests.createDeployment();  
88 -  
89 - deployment.addPackages(true, ConfigurationNotNullFieldTest.class.getPackage()); 87 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationNotNullFieldTest.class);
90 deployment 88 deployment
91 .addAsResource( 89 .addAsResource(
92 new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.properties")), 90 new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.properties")),
impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java
  Diff comments   View file @f272192
@@ -56,7 +56,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -56,7 +56,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
56 import configuration.ConfigurationTests; 56 import configuration.ConfigurationTests;
57 57
58 @RunWith(Arquillian.class) 58 @RunWith(Arquillian.class)
59 -public class ConfigurationPrimitiveOrWrapperFieldTest { 59 +public class ConfigurationPrimitiveOrWrapperFieldTest {
60 60
61 @Inject 61 @Inject
62 private PropertiesPrimitiveOrWrapperFieldConfig propertiesConfig; 62 private PropertiesPrimitiveOrWrapperFieldConfig propertiesConfig;
@@ -78,9 +78,7 @@ public class ConfigurationPrimitiveOrWrapperFieldTest { @@ -78,9 +78,7 @@ public class ConfigurationPrimitiveOrWrapperFieldTest {
78 78
79 @Deployment 79 @Deployment
80 public static JavaArchive createDeployment() { 80 public static JavaArchive createDeployment() {
81 - JavaArchive deployment = ConfigurationTests.createDeployment();  
82 -  
83 - deployment.addPackages(true, ConfigurationPrimitiveOrWrapperFieldTest.class.getPackage()); 81 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationPrimitiveOrWrapperFieldTest.class);
84 deployment.addAsResource( 82 deployment.addAsResource(
85 new FileAsset(new File( 83 new FileAsset(new File(
86 "src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties")), 84 "src/test/resources/configuration/field/primitiveorwrapper/demoiselle.properties")),
impl/core/src/test/java/configuration/field/string/ConfigurationStringFieldTest.java
  Diff comments   View file @f272192
@@ -53,7 +53,7 @@ import org.junit.runner.RunWith; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith;
53 import configuration.ConfigurationTests; 53 import configuration.ConfigurationTests;
54 54
55 @RunWith(Arquillian.class) 55 @RunWith(Arquillian.class)
56 -public class ConfigurationStringFieldTest { 56 +public class ConfigurationStringFieldTest {
57 57
58 @Inject 58 @Inject
59 private PropertiesStringFieldConfig propertiesConfig; 59 private PropertiesStringFieldConfig propertiesConfig;
@@ -66,9 +66,7 @@ public class ConfigurationStringFieldTest { @@ -66,9 +66,7 @@ public class ConfigurationStringFieldTest {
66 66
67 @Deployment 67 @Deployment
68 public static JavaArchive createDeployment() { 68 public static JavaArchive createDeployment() {
69 - JavaArchive deployment = ConfigurationTests.createDeployment();  
70 -  
71 - deployment.addPackages(true, ConfigurationStringFieldTest.class.getPackage()); 69 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationStringFieldTest.class);
72 deployment.addAsResource( 70 deployment.addAsResource(
73 new FileAsset(new File("src/test/resources/configuration/field/string/demoiselle.properties")), 71 new FileAsset(new File("src/test/resources/configuration/field/string/demoiselle.properties")),
74 "demoiselle.properties").addAsResource( 72 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java
  Diff comments   View file @f272192
@@ -53,7 +53,7 @@ import org.junit.runner.RunWith; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith;
53 import configuration.ConfigurationTests; 53 import configuration.ConfigurationTests;
54 54
55 @RunWith(Arquillian.class) 55 @RunWith(Arquillian.class)
56 -public class ConfigurationPrefixTest { 56 +public class ConfigurationPrefixTest {
57 57
58 @Inject 58 @Inject
59 private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix; 59 private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix;
@@ -75,9 +75,7 @@ public class ConfigurationPrefixTest { @@ -75,9 +75,7 @@ public class ConfigurationPrefixTest {
75 75
76 @Deployment 76 @Deployment
77 public static JavaArchive createDeployment() { 77 public static JavaArchive createDeployment() {
78 - JavaArchive deployment = ConfigurationTests.createDeployment();  
79 -  
80 - deployment.addPackages(true, ConfigurationPrefixTest.class.getPackage()); 78 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationPrefixTest.class);
81 deployment.addAsResource( 79 deployment.addAsResource(
82 new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")), 80 new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")),
83 "demoiselle.properties").addAsResource( 81 "demoiselle.properties").addAsResource(
impl/core/src/test/java/configuration/resource/ConfigurationResourceTest.java
  Diff comments   View file @f272192
@@ -52,7 +52,7 @@ import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ import org.junit.runner.RunWith;
52 import configuration.ConfigurationTests; 52 import configuration.ConfigurationTests;
53 53
54 @RunWith(Arquillian.class) 54 @RunWith(Arquillian.class)
55 -public class ConfigurationResourceTest { 55 +public class ConfigurationResourceTest {
56 56
57 @Inject 57 @Inject
58 private PropertiesDefaultFileConfig propDefault; 58 private PropertiesDefaultFileConfig propDefault;
@@ -80,9 +80,7 @@ public class ConfigurationResourceTest { @@ -80,9 +80,7 @@ public class ConfigurationResourceTest {
80 80
81 @Deployment 81 @Deployment
82 public static JavaArchive createDeployment() { 82 public static JavaArchive createDeployment() {
83 - JavaArchive deployment = ConfigurationTests.createDeployment();  
84 -  
85 - deployment.addPackages(true, ConfigurationResourceTest.class.getPackage()); 83 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationResourceTest.class);
86 deployment 84 deployment
87 .addAsResource( 85 .addAsResource(
88 new FileAsset(new File("src/test/resources/configuration/resource/demoiselle.properties")), 86 new FileAsset(new File("src/test/resources/configuration/resource/demoiselle.properties")),
impl/core/src/test/java/configuration/scope/ConfigurationScopeTest.java
  Diff comments   View file @f272192
@@ -49,12 +49,11 @@ import br.gov.frameworkdemoiselle.util.Beans; @@ -49,12 +49,11 @@ import br.gov.frameworkdemoiselle.util.Beans;
49 import configuration.ConfigurationTests; 49 import configuration.ConfigurationTests;
50 50
51 @RunWith(Arquillian.class) 51 @RunWith(Arquillian.class)
52 -public class ConfigurationScopeTest { 52 +public class ConfigurationScopeTest {
53 53
54 @Deployment 54 @Deployment
55 public static JavaArchive createDeployment() { 55 public static JavaArchive createDeployment() {
56 - JavaArchive deployment = ConfigurationTests.createDeployment();  
57 - deployment.addPackages(true, ConfigurationScopeTest.class.getPackage()); 56 + JavaArchive deployment = ConfigurationTests.createDeployment(ConfigurationScopeTest.class);
58 return deployment; 57 return deployment;
59 } 58 }
60 59
impl/core/src/test/java/security/SecurityTests.java
  Diff comments   View file @f272192
@@ -47,10 +47,11 @@ public final class SecurityTests { @@ -47,10 +47,11 @@ public final class SecurityTests {
47 private SecurityTests() { 47 private SecurityTests() {
48 } 48 }
49 49
50 - public static JavaArchive createConfigurationDeployment() { 50 + public static JavaArchive createDeployment(Class<?> baseClass) {
51 return ShrinkWrap 51 return ShrinkWrap
52 .create(JavaArchive.class) 52 .create(JavaArchive.class)
53 .addPackages(true, "br") 53 .addPackages(true, "br")
  54 + .addPackages(true, baseClass.getPackage())
54 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") 55 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
55 .addAsManifestResource( 56 .addAsManifestResource(
56 new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"), 57 new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),