Download as
Browse Code »

Commit 1bbe3f46a13a1626e862a6c51a22477f856393c7

Authored by Emerson Oliveira
2 parents d8f9ba05 04aa1987
Exists in master

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

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
  Diff comments   View file @1bbe3f4
... ... @@ -41,21 +41,20 @@ import org.junit.Ignore;
41 41 import org.junit.Before;
42 42 import org.junit.Test;
43 43  
44   -@Ignore
45 44 public class PaginationConfigTest {
46 45  
47 46 private PaginationConfig config;
48   -
  47 +
49 48 @Before
50 49 public void setUp() throws Exception {
51 50 this.config = new PaginationConfig();
52 51 }
53   -
  52 +
54 53 @Test
55 54 public void testGetMaxPageLinks() {
56 55 assertEquals(5, config.getMaxPageLinks());
57 56 }
58   -
  57 +
59 58 @Test
60 59 public void testGetPageSize() {
61 60 assertEquals(10, config.getPageSize());
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java
  Diff comments   View file @1bbe3f4
1 1 package br.gov.frameworkdemoiselle.internal.configuration;
  2 +
2 3 import org.junit.Ignore;
3 4 import static org.junit.Assert.assertEquals;
4 5  
5 6 import org.junit.Before;
6 7 import org.junit.Test;
7 8  
8   -@Ignore
9 9 public class SecurityConfigTest {
10 10  
11 11 private SecurityConfig config;
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java
  Diff comments   View file @1bbe3f4
... ... @@ -35,6 +35,7 @@
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.context;
  38 +
38 39 import org.junit.Ignore;
39 40 import java.util.Map;
40 41 import java.util.TreeMap;
... ... @@ -45,7 +46,7 @@ import org.junit.Before;
45 46 import org.junit.Test;
46 47 import org.powermock.api.easymock.PowerMock;
47 48 import org.powermock.reflect.Whitebox;
48   -@Ignore
  49 +
49 50 public class ContextStoreTest {
50 51  
51 52 private ContextStore store;
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java
  Diff comments   View file @1bbe3f4
... ... @@ -17,6 +17,7 @@
17 17 * Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
18 18 */
19 19 package br.gov.frameworkdemoiselle.internal.context;
  20 +
20 21 import org.junit.Ignore;
21 22 import static org.easymock.EasyMock.createMock;
22 23 import static org.easymock.EasyMock.expectLastCall;
... ... @@ -39,7 +40,7 @@ import org.junit.BeforeClass;
39 40 import org.junit.Test;
40 41  
41 42 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
42   -@Ignore
  43 +
43 44 public class ContextsTest {
44 45  
45 46 private AfterBeanDiscovery event;
... ... @@ -193,7 +194,7 @@ public class ContextsTest {
193 194 Contexts.add(context, event);
194 195 assertEquals(1, Contexts.getActiveContexts().size());
195 196 }
196   -
  197 +
197 198 // Only to get 100% on coverage report
198 199 @Test
199 200 public void testCreateNew() {
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java
  Diff comments   View file @1bbe3f4
... ... @@ -35,6 +35,7 @@
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.context;
  38 +
38 39 import org.junit.Ignore;
39 40 import static org.easymock.EasyMock.expect;
40 41 import static org.junit.Assert.fail;
... ... @@ -58,7 +59,7 @@ import org.powermock.api.easymock.PowerMock;
58 59 import org.powermock.core.classloader.annotations.PrepareForTest;
59 60 import org.powermock.modules.junit4.PowerMockRunner;
60 61 import org.powermock.reflect.Whitebox;
61   -@Ignore
  62 +
62 63 @RunWith(PowerMockRunner.class)
63 64 @PrepareForTest({ Bean.class })
64 65 public class ThreadLocalContextTest {
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java
  Diff comments   View file @1bbe3f4
... ... @@ -43,7 +43,7 @@ import static org.junit.Assert.fail;
43 43 import org.junit.Test;
44 44  
45 45 import br.gov.frameworkdemoiselle.exception.ApplicationException;
46   -@Ignore
  46 +
47 47 public class ExceptionsTest {
48 48  
49 49 @Test
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ReflectionsTest.java
  Diff comments   View file @1bbe3f4
... ... @@ -35,11 +35,11 @@
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 36 */
37 37 package br.gov.frameworkdemoiselle.util;
38   -import org.junit.Ignore;
  38 +
39 39 import static org.junit.Assert.assertEquals;
40 40  
41 41 import org.junit.Test;
42   -@Ignore
  42 +
43 43 public class ReflectionsTest {
44 44  
45 45 @Test
... ... @@ -51,7 +51,7 @@ public class ReflectionsTest {
51 51 }
52 52  
53 53 class SomeClass<T, I> {
54   -
  54 +
55 55 }
56 56  
57 57 class OtherClass extends SomeClass<Long, String> {
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java
  Diff comments   View file @1bbe3f4
... ... @@ -33,9 +33,9 @@
33 33 * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34 34 * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 + */
36 37  
37 38 package br.gov.frameworkdemoiselle.util;
38   -import org.junit.Ignore;
39 39 import static org.junit.Assert.assertEquals;
40 40 import static org.junit.Assert.assertFalse;
41 41 import static org.junit.Assert.assertNull;
... ... @@ -44,8 +44,8 @@ import static org.powermock.api.easymock.PowerMock.verifyAll;
44 44  
45 45 import org.junit.Test;
46 46  
47   -//import br.gov.frameworkdemoiselle.annotation.Ignore;
48   -@Ignore
  47 +import br.gov.frameworkdemoiselle.annotation.Ignore;
  48 +
49 49 public class StringsTest {
50 50  
51 51 @Test
... ... @@ -204,4 +204,3 @@ public class StringsTest {
204 204 }
205 205  
206 206 }
207   - */
... ...