Commit 6c90896b6bfef15a978fc8fdb6230ed1434720d5
1 parent
63481c19
Exists in
master
Organização do código (formatação + import)
Showing
14 changed files
with
33 additions
and
52 deletions
Show diff stats
impl/core/src/test/java/configuration/defaultvalue/ConfigurationDefaultValueTest.java
| @@ -51,7 +51,6 @@ import org.junit.runner.RunWith; | @@ -51,7 +51,6 @@ import org.junit.runner.RunWith; | ||
| 51 | 51 | ||
| 52 | import configuration.AbstractConfigurationTest; | 52 | import configuration.AbstractConfigurationTest; |
| 53 | 53 | ||
| 54 | - | ||
| 55 | @RunWith(Arquillian.class) | 54 | @RunWith(Arquillian.class) |
| 56 | public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { | 55 | public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { |
| 57 | 56 |
impl/core/src/test/java/configuration/field/array/AbstractArrayEmptyFieldConfig.java
| @@ -39,11 +39,11 @@ package configuration.field.array; | @@ -39,11 +39,11 @@ package configuration.field.array; | ||
| 39 | public abstract class AbstractArrayEmptyFieldConfig { | 39 | public abstract class AbstractArrayEmptyFieldConfig { |
| 40 | 40 | ||
| 41 | private int[] emptyPrimitiveIntegers; | 41 | private int[] emptyPrimitiveIntegers; |
| 42 | - | 42 | + |
| 43 | private Integer[] emptyWrapperIntegers; | 43 | private Integer[] emptyWrapperIntegers; |
| 44 | - | 44 | + |
| 45 | private Integer[] errorTypeWrapperIntegers; | 45 | private Integer[] errorTypeWrapperIntegers; |
| 46 | - | 46 | + |
| 47 | public Integer[] getEmptyWrapperIntegers() { | 47 | public Integer[] getEmptyWrapperIntegers() { |
| 48 | return emptyWrapperIntegers; | 48 | return emptyWrapperIntegers; |
| 49 | } | 49 | } |
impl/core/src/test/java/configuration/field/array/ConfigurationArrayFieldTest.java
| @@ -53,18 +53,17 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | @@ -53,18 +53,17 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| 53 | import org.junit.Test; | 53 | import org.junit.Test; |
| 54 | import org.junit.runner.RunWith; | 54 | import org.junit.runner.RunWith; |
| 55 | 55 | ||
| 56 | -import configuration.AbstractConfigurationTest; | ||
| 57 | - | ||
| 58 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; | 56 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; |
| 57 | +import configuration.AbstractConfigurationTest; | ||
| 59 | 58 | ||
| 60 | @RunWith(Arquillian.class) | 59 | @RunWith(Arquillian.class) |
| 61 | public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | 60 | public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { |
| 62 | 61 | ||
| 63 | @Inject | 62 | @Inject |
| 64 | private PropertiesArrayFieldConfig propertiesConfig; | 63 | private PropertiesArrayFieldConfig propertiesConfig; |
| 65 | - | 64 | + |
| 66 | @Inject | 65 | @Inject |
| 67 | - private PropertiesArrayEmptyFieldConfig propertiesNullConfig; | 66 | + private PropertiesArrayEmptyFieldConfig propertiesNullConfig; |
| 68 | 67 | ||
| 69 | @Inject | 68 | @Inject |
| 70 | private XMLArrayFieldConfig xmlConfig; | 69 | private XMLArrayFieldConfig xmlConfig; |
| @@ -122,13 +121,13 @@ public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | @@ -122,13 +121,13 @@ public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | ||
| 122 | assertArrayEquals(expected, propertiesConfig.getWrappedDoubles()); | 121 | assertArrayEquals(expected, propertiesConfig.getWrappedDoubles()); |
| 123 | assertArrayEquals(expected, xmlConfig.getWrappedDoubles()); | 122 | assertArrayEquals(expected, xmlConfig.getWrappedDoubles()); |
| 124 | } | 123 | } |
| 125 | - | 124 | + |
| 126 | @Test | 125 | @Test |
| 127 | - public void loadEmptyString() { | 126 | + public void loadEmptyString() { |
| 128 | String[] expected = { "demoisele", "" }; | 127 | String[] expected = { "demoisele", "" }; |
| 129 | assertArrayEquals(expected, propertiesConfig.getEmptyStrings()); | 128 | assertArrayEquals(expected, propertiesConfig.getEmptyStrings()); |
| 130 | } | 129 | } |
| 131 | - | 130 | + |
| 132 | @Test | 131 | @Test |
| 133 | public void loadEmptyPrimitive() { | 132 | public void loadEmptyPrimitive() { |
| 134 | try { | 133 | try { |
| @@ -138,9 +137,9 @@ public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | @@ -138,9 +137,9 @@ public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | ||
| 138 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 137 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 139 | } | 138 | } |
| 140 | } | 139 | } |
| 141 | - | 140 | + |
| 142 | @Test | 141 | @Test |
| 143 | - public void loadEmptyWrapper() { | 142 | + public void loadEmptyWrapper() { |
| 144 | try { | 143 | try { |
| 145 | propertiesNullConfig.getEmptyWrapperIntegers(); | 144 | propertiesNullConfig.getEmptyWrapperIntegers(); |
| 146 | Assert.fail(); | 145 | Assert.fail(); |
| @@ -148,14 +147,14 @@ public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | @@ -148,14 +147,14 @@ public class ConfigurationArrayFieldTest extends AbstractConfigurationTest { | ||
| 148 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 147 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 149 | } | 148 | } |
| 150 | } | 149 | } |
| 151 | - | 150 | + |
| 152 | @Test | 151 | @Test |
| 153 | - public void loadErrorTypeWrapper() { | 152 | + public void loadErrorTypeWrapper() { |
| 154 | try { | 153 | try { |
| 155 | propertiesNullConfig.getErrorTypeWrapperIntegers(); | 154 | propertiesNullConfig.getErrorTypeWrapperIntegers(); |
| 156 | Assert.fail(); | 155 | Assert.fail(); |
| 157 | } catch (ConfigurationException cause) { | 156 | } catch (ConfigurationException cause) { |
| 158 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 157 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 159 | } | 158 | } |
| 160 | - } | 159 | + } |
| 161 | } | 160 | } |
impl/core/src/test/java/configuration/field/clazz/ConfigurationClassFieldTest.java
| @@ -50,9 +50,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | @@ -50,9 +50,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| 50 | import org.junit.Test; | 50 | import org.junit.Test; |
| 51 | import org.junit.runner.RunWith; | 51 | import org.junit.runner.RunWith; |
| 52 | 52 | ||
| 53 | -import configuration.AbstractConfigurationTest; | ||
| 54 | - | ||
| 55 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; | 53 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; |
| 54 | +import configuration.AbstractConfigurationTest; | ||
| 56 | 55 | ||
| 57 | @RunWith(Arquillian.class) | 56 | @RunWith(Arquillian.class) |
| 58 | public class ConfigurationClassFieldTest extends AbstractConfigurationTest { | 57 | public class ConfigurationClassFieldTest extends AbstractConfigurationTest { |
impl/core/src/test/java/configuration/field/custom/ConfigurationCustomFieldTest.java
| @@ -51,9 +51,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | @@ -51,9 +51,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| 51 | import org.junit.Test; | 51 | import org.junit.Test; |
| 52 | import org.junit.runner.RunWith; | 52 | import org.junit.runner.RunWith; |
| 53 | 53 | ||
| 54 | -import configuration.AbstractConfigurationTest; | ||
| 55 | - | ||
| 56 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; | 54 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; |
| 55 | +import configuration.AbstractConfigurationTest; | ||
| 57 | 56 | ||
| 58 | @RunWith(Arquillian.class) | 57 | @RunWith(Arquillian.class) |
| 59 | public class ConfigurationCustomFieldTest extends AbstractConfigurationTest { | 58 | public class ConfigurationCustomFieldTest extends AbstractConfigurationTest { |
impl/core/src/test/java/configuration/field/ignored/ConfigurationIgnoredFieldTest.java
| @@ -51,7 +51,6 @@ import org.junit.runner.RunWith; | @@ -51,7 +51,6 @@ import org.junit.runner.RunWith; | ||
| 51 | 51 | ||
| 52 | import configuration.AbstractConfigurationTest; | 52 | import configuration.AbstractConfigurationTest; |
| 53 | 53 | ||
| 54 | - | ||
| 55 | @RunWith(Arquillian.class) | 54 | @RunWith(Arquillian.class) |
| 56 | public class ConfigurationIgnoredFieldTest extends AbstractConfigurationTest { | 55 | public class ConfigurationIgnoredFieldTest extends AbstractConfigurationTest { |
| 57 | 56 |
impl/core/src/test/java/configuration/field/map/ConfigurationMapFieldTest.java
| @@ -43,7 +43,6 @@ import java.util.HashMap; | @@ -43,7 +43,6 @@ import java.util.HashMap; | ||
| 43 | import java.util.Map; | 43 | import java.util.Map; |
| 44 | 44 | ||
| 45 | import javax.inject.Inject; | 45 | import javax.inject.Inject; |
| 46 | -import javax.validation.constraints.Size; | ||
| 47 | 46 | ||
| 48 | import org.jboss.arquillian.container.test.api.Deployment; | 47 | import org.jboss.arquillian.container.test.api.Deployment; |
| 49 | import org.jboss.arquillian.junit.Arquillian; | 48 | import org.jboss.arquillian.junit.Arquillian; |
| @@ -54,7 +53,6 @@ import org.junit.runner.RunWith; | @@ -54,7 +53,6 @@ import org.junit.runner.RunWith; | ||
| 54 | 53 | ||
| 55 | import configuration.AbstractConfigurationTest; | 54 | import configuration.AbstractConfigurationTest; |
| 56 | 55 | ||
| 57 | - | ||
| 58 | @RunWith(Arquillian.class) | 56 | @RunWith(Arquillian.class) |
| 59 | public class ConfigurationMapFieldTest extends AbstractConfigurationTest { | 57 | public class ConfigurationMapFieldTest extends AbstractConfigurationTest { |
| 60 | 58 |
impl/core/src/test/java/configuration/field/named/ConfigurationNamedFieldTest.java
| @@ -43,8 +43,6 @@ import java.io.File; | @@ -43,8 +43,6 @@ import java.io.File; | ||
| 43 | 43 | ||
| 44 | import javax.inject.Inject; | 44 | import javax.inject.Inject; |
| 45 | 45 | ||
| 46 | -import junit.framework.Assert; | ||
| 47 | - | ||
| 48 | import org.jboss.arquillian.container.test.api.Deployment; | 46 | import org.jboss.arquillian.container.test.api.Deployment; |
| 49 | import org.jboss.arquillian.junit.Arquillian; | 47 | import org.jboss.arquillian.junit.Arquillian; |
| 50 | import org.jboss.shrinkwrap.api.asset.FileAsset; | 48 | import org.jboss.shrinkwrap.api.asset.FileAsset; |
| @@ -52,9 +50,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | @@ -52,9 +50,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| 52 | import org.junit.Test; | 50 | import org.junit.Test; |
| 53 | import org.junit.runner.RunWith; | 51 | import org.junit.runner.RunWith; |
| 54 | 52 | ||
| 55 | -import configuration.AbstractConfigurationTest; | ||
| 56 | - | ||
| 57 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; | 53 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; |
| 54 | +import configuration.AbstractConfigurationTest; | ||
| 58 | 55 | ||
| 59 | @RunWith(Arquillian.class) | 56 | @RunWith(Arquillian.class) |
| 60 | public class ConfigurationNamedFieldTest extends AbstractConfigurationTest { | 57 | public class ConfigurationNamedFieldTest extends AbstractConfigurationTest { |
impl/core/src/test/java/configuration/field/notnull/ConfigurationNotNullFieldTest.java
| @@ -52,9 +52,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | @@ -52,9 +52,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| 52 | import org.junit.Test; | 52 | import org.junit.Test; |
| 53 | import org.junit.runner.RunWith; | 53 | import org.junit.runner.RunWith; |
| 54 | 54 | ||
| 55 | -import configuration.AbstractConfigurationTest; | ||
| 56 | - | ||
| 57 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; | 55 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; |
| 56 | +import configuration.AbstractConfigurationTest; | ||
| 58 | 57 | ||
| 59 | @RunWith(Arquillian.class) | 58 | @RunWith(Arquillian.class) |
| 60 | public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { | 59 | public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { |
| @@ -106,8 +105,7 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { | @@ -106,8 +105,7 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { | ||
| 106 | new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.xml")), | 105 | new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.xml")), |
| 107 | "empty-field.xml") | 106 | "empty-field.xml") |
| 108 | .addAsResource( | 107 | .addAsResource( |
| 109 | - new FileAsset(new File( | ||
| 110 | - "src/test/resources/configuration/field/notnull/without-field.xml")), | 108 | + new FileAsset(new File("src/test/resources/configuration/field/notnull/without-field.xml")), |
| 111 | "without-field.xml"); | 109 | "without-field.xml"); |
| 112 | 110 | ||
| 113 | return deployment; | 111 | return deployment; |
| @@ -163,7 +161,7 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { | @@ -163,7 +161,7 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest { | ||
| 163 | } catch (ConfigurationException cause) { | 161 | } catch (ConfigurationException cause) { |
| 164 | Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); | 162 | Assert.assertEquals(NullPointerException.class, cause.getCause().getClass()); |
| 165 | } | 163 | } |
| 166 | - | 164 | + |
| 167 | try { | 165 | try { |
| 168 | xmlNoFileConfig.getAttributeNotNull(); | 166 | xmlNoFileConfig.getAttributeNotNull(); |
| 169 | fail(); | 167 | fail(); |
impl/core/src/test/java/configuration/field/primitiveorwrapper/ConfigurationPrimitiveOrWrapperFieldTest.java
| @@ -52,9 +52,8 @@ import org.junit.BeforeClass; | @@ -52,9 +52,8 @@ import org.junit.BeforeClass; | ||
| 52 | import org.junit.Test; | 52 | import org.junit.Test; |
| 53 | import org.junit.runner.RunWith; | 53 | import org.junit.runner.RunWith; |
| 54 | 54 | ||
| 55 | -import configuration.AbstractConfigurationTest; | ||
| 56 | - | ||
| 57 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; | 55 | import br.gov.frameworkdemoiselle.configuration.ConfigurationException; |
| 56 | +import configuration.AbstractConfigurationTest; | ||
| 58 | 57 | ||
| 59 | @RunWith(Arquillian.class) | 58 | @RunWith(Arquillian.class) |
| 60 | public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurationTest { | 59 | public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurationTest { |
| @@ -127,18 +126,18 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat | @@ -127,18 +126,18 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat | ||
| 127 | } catch (ConfigurationException cause) { | 126 | } catch (ConfigurationException cause) { |
| 128 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 127 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 129 | } | 128 | } |
| 130 | - | 129 | + |
| 131 | try { | 130 | try { |
| 132 | propertiesErrorConfig.getEmptyPrimitiveInteger(); | 131 | propertiesErrorConfig.getEmptyPrimitiveInteger(); |
| 133 | } catch (ConfigurationException cause) { | 132 | } catch (ConfigurationException cause) { |
| 134 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 133 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 135 | } | 134 | } |
| 136 | - | 135 | + |
| 137 | try { | 136 | try { |
| 138 | propertiesErrorConfig.getEmptyPrimitiveInteger(); | 137 | propertiesErrorConfig.getEmptyPrimitiveInteger(); |
| 139 | } catch (ConfigurationException cause) { | 138 | } catch (ConfigurationException cause) { |
| 140 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 139 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 141 | - } | 140 | + } |
| 142 | } | 141 | } |
| 143 | 142 | ||
| 144 | @Test | 143 | @Test |
| @@ -148,13 +147,13 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat | @@ -148,13 +147,13 @@ public class ConfigurationPrimitiveOrWrapperFieldTest extends AbstractConfigurat | ||
| 148 | } catch (ConfigurationException cause) { | 147 | } catch (ConfigurationException cause) { |
| 149 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 148 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 150 | } | 149 | } |
| 151 | - | 150 | + |
| 152 | try { | 151 | try { |
| 153 | propertiesErrorConfig.getEmptyWrappedInteger(); | 152 | propertiesErrorConfig.getEmptyWrappedInteger(); |
| 154 | } catch (ConfigurationException cause) { | 153 | } catch (ConfigurationException cause) { |
| 155 | assertEquals(ConversionException.class, cause.getCause().getClass()); | 154 | assertEquals(ConversionException.class, cause.getCause().getClass()); |
| 156 | } | 155 | } |
| 157 | - | 156 | + |
| 158 | try { | 157 | try { |
| 159 | propertiesErrorConfig.getEmptyWrappedInteger(); | 158 | propertiesErrorConfig.getEmptyWrappedInteger(); |
| 160 | } catch (ConfigurationException cause) { | 159 | } catch (ConfigurationException cause) { |
impl/core/src/test/java/configuration/field/string/ConfigurationStringFieldTest.java
| @@ -52,7 +52,6 @@ import org.junit.runner.RunWith; | @@ -52,7 +52,6 @@ import org.junit.runner.RunWith; | ||
| 52 | 52 | ||
| 53 | import configuration.AbstractConfigurationTest; | 53 | import configuration.AbstractConfigurationTest; |
| 54 | 54 | ||
| 55 | - | ||
| 56 | @RunWith(Arquillian.class) | 55 | @RunWith(Arquillian.class) |
| 57 | public class ConfigurationStringFieldTest extends AbstractConfigurationTest { | 56 | public class ConfigurationStringFieldTest extends AbstractConfigurationTest { |
| 58 | 57 | ||
| @@ -103,12 +102,12 @@ public class ConfigurationStringFieldTest extends AbstractConfigurationTest { | @@ -103,12 +102,12 @@ public class ConfigurationStringFieldTest extends AbstractConfigurationTest { | ||
| 103 | assertEquals(expected, propertiesConfig.getStringWithComma()); | 102 | assertEquals(expected, propertiesConfig.getStringWithComma()); |
| 104 | assertEquals(expected, xmlConfig.getStringWithComma()); | 103 | assertEquals(expected, xmlConfig.getStringWithComma()); |
| 105 | } | 104 | } |
| 106 | - | 105 | + |
| 107 | @Test | 106 | @Test |
| 108 | public void loadEmptyString() { | 107 | public void loadEmptyString() { |
| 109 | String expected = ""; | 108 | String expected = ""; |
| 110 | assertEquals(expected, systemConfig.getEmptyString()); | 109 | assertEquals(expected, systemConfig.getEmptyString()); |
| 111 | assertEquals(expected, propertiesConfig.getEmptyString()); | 110 | assertEquals(expected, propertiesConfig.getEmptyString()); |
| 112 | assertEquals(expected, xmlConfig.getEmptyString()); | 111 | assertEquals(expected, xmlConfig.getEmptyString()); |
| 113 | - } | 112 | + } |
| 114 | } | 113 | } |
impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java
| @@ -52,7 +52,6 @@ import org.junit.runner.RunWith; | @@ -52,7 +52,6 @@ import org.junit.runner.RunWith; | ||
| 52 | 52 | ||
| 53 | import configuration.AbstractConfigurationTest; | 53 | import configuration.AbstractConfigurationTest; |
| 54 | 54 | ||
| 55 | - | ||
| 56 | @RunWith(Arquillian.class) | 55 | @RunWith(Arquillian.class) |
| 57 | public class ConfigurationPrefixTest extends AbstractConfigurationTest { | 56 | public class ConfigurationPrefixTest extends AbstractConfigurationTest { |
| 58 | 57 | ||
| @@ -64,8 +63,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | @@ -64,8 +63,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | ||
| 64 | 63 | ||
| 65 | @Inject | 64 | @Inject |
| 66 | private PropertyPrefixEndingWithDot propertyEndingWithDotPrefix; | 65 | private PropertyPrefixEndingWithDot propertyEndingWithDotPrefix; |
| 67 | - | ||
| 68 | - | 66 | + |
| 69 | @Inject | 67 | @Inject |
| 70 | private XMLPrefixEndingWithoutDot xmlEndingWithoutDotPrefix; | 68 | private XMLPrefixEndingWithoutDot xmlEndingWithoutDotPrefix; |
| 71 | 69 | ||
| @@ -83,8 +81,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | @@ -83,8 +81,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | ||
| 83 | deployment.addAsResource( | 81 | deployment.addAsResource( |
| 84 | new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")), | 82 | new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")), |
| 85 | "demoiselle.properties").addAsResource( | 83 | "demoiselle.properties").addAsResource( |
| 86 | - new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.xml")), | ||
| 87 | - "demoiselle.xml"); | 84 | + new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.xml")), "demoiselle.xml"); |
| 88 | 85 | ||
| 89 | return deployment; | 86 | return deployment; |
| 90 | } | 87 | } |
| @@ -92,7 +89,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | @@ -92,7 +89,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | ||
| 92 | @Test | 89 | @Test |
| 93 | public void loadFromPrefixedExistentProperty() { | 90 | public void loadFromPrefixedExistentProperty() { |
| 94 | String expected = "prefix ending without dot"; | 91 | String expected = "prefix ending without dot"; |
| 95 | - | 92 | + |
| 96 | assertEquals(expected, propertyEndingWithoutDotPrefix.getPrefixedAttribute()); | 93 | assertEquals(expected, propertyEndingWithoutDotPrefix.getPrefixedAttribute()); |
| 97 | assertEquals(expected, xmlEndingWithoutDotPrefix.getPrefixedAttribute()); | 94 | assertEquals(expected, xmlEndingWithoutDotPrefix.getPrefixedAttribute()); |
| 98 | } | 95 | } |
| @@ -106,7 +103,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | @@ -106,7 +103,7 @@ public class ConfigurationPrefixTest extends AbstractConfigurationTest { | ||
| 106 | @Test | 103 | @Test |
| 107 | public void loadPrefixEndingWithDot() { | 104 | public void loadPrefixEndingWithDot() { |
| 108 | String expected = "prefix ending with dot"; | 105 | String expected = "prefix ending with dot"; |
| 109 | - | 106 | + |
| 110 | assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute()); | 107 | assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute()); |
| 111 | assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute()); | 108 | assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute()); |
| 112 | } | 109 | } |
impl/core/src/test/java/configuration/resource/ConfigurationResourceTest.java
| @@ -51,7 +51,6 @@ import org.junit.runner.RunWith; | @@ -51,7 +51,6 @@ import org.junit.runner.RunWith; | ||
| 51 | 51 | ||
| 52 | import configuration.AbstractConfigurationTest; | 52 | import configuration.AbstractConfigurationTest; |
| 53 | 53 | ||
| 54 | - | ||
| 55 | @RunWith(Arquillian.class) | 54 | @RunWith(Arquillian.class) |
| 56 | public class ConfigurationResourceTest extends AbstractConfigurationTest { | 55 | public class ConfigurationResourceTest extends AbstractConfigurationTest { |
| 57 | 56 |
impl/core/src/test/java/configuration/scope/ConfigurationScopeTest.java
| @@ -45,9 +45,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | @@ -45,9 +45,8 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| 45 | import org.junit.Test; | 45 | import org.junit.Test; |
| 46 | import org.junit.runner.RunWith; | 46 | import org.junit.runner.RunWith; |
| 47 | 47 | ||
| 48 | -import configuration.AbstractConfigurationTest; | ||
| 49 | - | ||
| 50 | import br.gov.frameworkdemoiselle.util.Beans; | 48 | import br.gov.frameworkdemoiselle.util.Beans; |
| 49 | +import configuration.AbstractConfigurationTest; | ||
| 51 | 50 | ||
| 52 | @RunWith(Arquillian.class) | 51 | @RunWith(Arquillian.class) |
| 53 | public class ConfigurationScopeTest extends AbstractConfigurationTest { | 52 | public class ConfigurationScopeTest extends AbstractConfigurationTest { |