Download as
Browse Code »

Commit 83f02fc7688003f46b1ed9f62e8d98a2820f1283

Authored by Cleverson Sacramento
2 parents f8b9aeb1 e201247b
Exists in master

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

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImplTest.java
  Diff comments   View file @83f02fc
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
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.internal.implementation; 37 package br.gov.frameworkdemoiselle.internal.implementation;
  38 +
38 import org.junit.Ignore; 39 import org.junit.Ignore;
39 import static org.junit.Assert.assertEquals; 40 import static org.junit.Assert.assertEquals;
40 import static org.junit.Assert.assertNotNull; 41 import static org.junit.Assert.assertNotNull;
@@ -55,7 +56,7 @@ import org.powermock.reflect.Whitebox; @@ -55,7 +56,7 @@ import org.powermock.reflect.Whitebox;
55 import br.gov.frameworkdemoiselle.internal.configuration.PaginationConfig; 56 import br.gov.frameworkdemoiselle.internal.configuration.PaginationConfig;
56 import br.gov.frameworkdemoiselle.pagination.Pagination; 57 import br.gov.frameworkdemoiselle.pagination.Pagination;
57 import br.gov.frameworkdemoiselle.pagination.PaginationContext; 58 import br.gov.frameworkdemoiselle.pagination.PaginationContext;
58 -@Ignore 59 +
59 @RunWith(PowerMockRunner.class) 60 @RunWith(PowerMockRunner.class)
60 public class PaginationContextImplTest { 61 public class PaginationContextImplTest {
61 62
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationImplTest.java
  Diff comments   View file @83f02fc
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
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.internal.implementation; 37 package br.gov.frameworkdemoiselle.internal.implementation;
  38 +
38 import org.junit.Ignore; 39 import org.junit.Ignore;
39 import static org.junit.Assert.assertEquals; 40 import static org.junit.Assert.assertEquals;
40 import static org.junit.Assert.fail; 41 import static org.junit.Assert.fail;
@@ -49,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.Strings; @@ -49,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.Strings;
49 /** 50 /**
50 * @author SERPRO 51 * @author SERPRO
51 */ 52 */
52 -@Ignore 53 +
53 public class PaginationImplTest { 54 public class PaginationImplTest {
54 55
55 private Pagination pagination; 56 private Pagination pagination;
@@ -171,7 +172,7 @@ public class PaginationImplTest { @@ -171,7 +172,7 @@ public class PaginationImplTest {
171 fail(); 172 fail();
172 } catch (IndexOutOfBoundsException cause) { 173 } catch (IndexOutOfBoundsException cause) {
173 } 174 }
174 - 175 +
175 try { 176 try {
176 pagination.setTotalResults(0); 177 pagination.setTotalResults(0);
177 pagination.setFirstResult(0); 178 pagination.setFirstResult(0);
@@ -314,7 +315,7 @@ public class PaginationImplTest { @@ -314,7 +315,7 @@ public class PaginationImplTest {
314 pagination.setCurrentPage(9); 315 pagination.setCurrentPage(9);
315 assertEquals(90, pagination.getFirstResult()); 316 assertEquals(90, pagination.getFirstResult());
316 } 317 }
317 - 318 +
318 @Test 319 @Test
319 public void testToStringFormat() { 320 public void testToStringFormat() {
320 assertEquals(Strings.toString(pagination), pagination.toString()); 321 assertEquals(Strings.toString(pagination), pagination.toString());