Merge branch '2.3' of ssh://git@github.com/demoiselle/framework.git into 2.3

Emerson Oliveira
2 parents d8f9ba05 04aa1987
Showing 8 changed files with 18 additions and 17 deletions Show diff stats
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfigTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ReflectionsTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java
@@ -41,21 +41,20 @@ import org.junit.Ignore;
 import org.junit.Before;
 import org.junit.Test;
-@Ignore
 public class PaginationConfigTest {
 	private PaginationConfig config;
-	
+
 	@Before
 	public void setUp() throws Exception {
 		this.config = new PaginationConfig();
 	}
-	
+
 	@Test
 	public void testGetMaxPageLinks() {
 		assertEquals(5, config.getMaxPageLinks());
 	}
-	
+
 	@Test
 	public void testGetPageSize() {
 		assertEquals(10, config.getPageSize());
 package br.gov.frameworkdemoiselle.internal.configuration;
+
 import org.junit.Ignore;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
-@Ignore
 public class SecurityConfigTest {
 	private SecurityConfig config;
@@ -35,6 +35,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 package br.gov.frameworkdemoiselle.internal.context;
+
 import org.junit.Ignore;
 import java.util.Map;
 import java.util.TreeMap;
@@ -45,7 +46,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.reflect.Whitebox;
-@Ignore
+
 public class ContextStoreTest {
 	private ContextStore store;
@@ -17,6 +17,7 @@
  * Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 package br.gov.frameworkdemoiselle.internal.context;
+
 import org.junit.Ignore;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expectLastCall;
@@ -39,7 +40,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-@Ignore
+
 public class ContextsTest {
 	private AfterBeanDiscovery event;
@@ -193,7 +194,7 @@ public class ContextsTest {
 		Contexts.add(context, event);
 		assertEquals(1, Contexts.getActiveContexts().size());
 	}
-	
+
 	// Only to get 100% on coverage report
 	@Test
 	public void testCreateNew() {
@@ -35,6 +35,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 package br.gov.frameworkdemoiselle.internal.context;
+
 import org.junit.Ignore;
 import static org.easymock.EasyMock.expect;
 import static org.junit.Assert.fail;
@@ -58,7 +59,7 @@ import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
-@Ignore
+
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ Bean.class })
 public class ThreadLocalContextTest {
@@ -43,7 +43,7 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 import br.gov.frameworkdemoiselle.exception.ApplicationException;
-@Ignore
+
 public class ExceptionsTest {
 	@Test
@@ -35,11 +35,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 package br.gov.frameworkdemoiselle.util;
-import org.junit.Ignore;
+
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
-@Ignore
+
 public class ReflectionsTest {
 	@Test
@@ -51,7 +51,7 @@ public class ReflectionsTest {
 }
 class SomeClass<T, I> {
-	
+
 }
 class OtherClass extends SomeClass<Long, String> {
@@ -33,9 +33,9 @@
  * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  * 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.util;
-import org.junit.Ignore;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -44,8 +44,8 @@ import static org.powermock.api.easymock.PowerMock.verifyAll;
 import org.junit.Test;
-//import br.gov.frameworkdemoiselle.annotation.Ignore;
-@Ignore
+import br.gov.frameworkdemoiselle.annotation.Ignore;
+
 public class StringsTest {
 	@Test
@@ -204,4 +204,3 @@ public class StringsTest {
 	}
 }
- */
	@@ -43,7 +43,7 @@ import static org.junit.Assert.fail;		@@ -43,7 +43,7 @@ import static org.junit.Assert.fail;
43	import org.junit.Test;	43	import org.junit.Test;
44		44
45	import br.gov.frameworkdemoiselle.exception.ApplicationException;	45	import br.gov.frameworkdemoiselle.exception.ApplicationException;
46	-@Ignore	46	+
47	public class ExceptionsTest {	47	public class ExceptionsTest {
48		48
49	@Test	49	@Test
	@@ -35,11 +35,11 @@		@@ -35,11 +35,11 @@
35	* 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.	35	* 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	*/	36	*/
37	package br.gov.frameworkdemoiselle.util;	37	package br.gov.frameworkdemoiselle.util;
38	-import org.junit.Ignore;	38	+
39	import static org.junit.Assert.assertEquals;	39	import static org.junit.Assert.assertEquals;
40		40
41	import org.junit.Test;	41	import org.junit.Test;
42	-@Ignore	42	+
43	public class ReflectionsTest {	43	public class ReflectionsTest {
44		44
45	@Test	45	@Test
	@@ -51,7 +51,7 @@ public class ReflectionsTest {		@@ -51,7 +51,7 @@ public class ReflectionsTest {
51	}	51	}
52		52
53	class SomeClass<T, I> {	53	class SomeClass<T, I> {
54	-	54	+
55	}	55	}
56		56
57	class OtherClass extends SomeClass<Long, String> {	57	class OtherClass extends SomeClass<Long, String> {