Download as
Browse Code »

Commit 26abe5fee114595b452afbae14712236629716e6

Authored by Wilson Guimarães
1 parent 77d7a60d
Exists in master

Aumento da cobertura de testes.

Showing 2 changed files with 32 additions and 43 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Strings.java
  Diff comments   View file @26abe5f
... ... @@ -60,7 +60,7 @@ public class Strings {
60 60  
61 61 public static String insertZeros(String string, int howMuchZeros) {
62 62 StringBuffer result = new StringBuffer((string == null ? "" : string).trim());
63   - int difference = howMuchZeros - string.length();
  63 + int difference = howMuchZeros - result.toString().length();
64 64  
65 65 for (int j = 0; j < difference; j++) {
66 66 result.insert(0, '0');
... ...
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/StringsTest.java
  Diff comments   View file @26abe5f
... ... @@ -36,31 +36,23 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.util;
38 38  
39   -import static org.easymock.EasyMock.expect;
40 39 import static org.junit.Assert.assertEquals;
41 40 import static org.junit.Assert.assertFalse;
42 41 import static org.junit.Assert.assertNull;
43 42 import static org.junit.Assert.assertTrue;
44   -import static org.powermock.api.easymock.PowerMock.mockStatic;
45   -import static org.powermock.api.easymock.PowerMock.replayAll;
46 43 import static org.powermock.api.easymock.PowerMock.verifyAll;
47 44  
48   -import java.lang.reflect.Field;
49   -
50   -import org.easymock.EasyMock;
51 45 import org.junit.Test;
52 46 import org.junit.runner.RunWith;
53   -import org.powermock.core.classloader.annotations.PrepareForTest;
54 47 import org.powermock.modules.junit4.PowerMockRunner;
55 48  
56 49 import br.gov.frameworkdemoiselle.annotation.Ignore;
57 50  
58 51 @RunWith(PowerMockRunner.class)
59   -@PrepareForTest({ Reflections.class })
60 52 public class StringsTest {
61 53  
62 54 @Test
63   - public void testGetString() {
  55 + public void getString() {
64 56 testEqualsGetString("teste", "teste");
65 57 testEqualsGetString("", "");
66 58 testEqualsGetString(null, null);
... ... @@ -77,7 +69,7 @@ public class StringsTest {
77 69 }
78 70  
79 71 @Test
80   - public void testIsEmpty() {
  72 + public void isEmpty() {
81 73 assertTrue(Strings.isEmpty(null));
82 74 assertTrue(Strings.isEmpty(""));
83 75 assertTrue(Strings.isEmpty(" "));
... ... @@ -89,7 +81,7 @@ public class StringsTest {
89 81 }
90 82  
91 83 @Test
92   - public void testIsResourceBundleKeyFormat() {
  84 + public void isResourceBundleKeyFormat() {
93 85 assertTrue(Strings.isResourceBundleKeyFormat("{x}"));
94 86 assertTrue(Strings.isResourceBundleKeyFormat("{.}"));
95 87 assertTrue(Strings.isResourceBundleKeyFormat("{*}"));
... ... @@ -107,7 +99,7 @@ public class StringsTest {
107 99 }
108 100  
109 101 @Test
110   - public void testCamelCaseToSymbolSeparated() {
  102 + public void camelCaseToSymbolSeparated() {
111 103 assertEquals(null, Strings.camelCaseToSymbolSeparated(null, null));
112 104 assertEquals(null, Strings.camelCaseToSymbolSeparated(null, "."));
113 105 assertEquals("myvar", Strings.camelCaseToSymbolSeparated("myVar", null));
... ... @@ -119,7 +111,7 @@ public class StringsTest {
119 111 }
120 112  
121 113 @Test
122   - public void testFirstToUpper() {
  114 + public void firstToUpper() {
123 115 assertNull(Strings.firstToUpper(null));
124 116 assertEquals("", Strings.firstToUpper(""));
125 117 assertEquals("A", Strings.firstToUpper("a"));
... ... @@ -129,15 +121,14 @@ public class StringsTest {
129 121 assertEquals("Ab", Strings.firstToUpper("ab"));
130 122 assertEquals("AB", Strings.firstToUpper("aB"));
131 123 }
132   -
  124 +
133 125 @Test
134   - public void testToStringWhenObjectIsNull() {
  126 + public void toStringWhenObjectIsNull() {
135 127 assertEquals("", Strings.toString(null));
136 128 }
137   -
138   - @Test
139   - public void testToString() throws SecurityException, NoSuchFieldException {
140 129  
  130 + @Test
  131 + public void classToString() throws SecurityException, NoSuchFieldException {
141 132 @SuppressWarnings("unused")
142 133 class Test {
143 134  
... ... @@ -149,24 +140,12 @@ public class StringsTest {
149 140  
150 141 @Ignore
151 142 private String ignore = "ignoreMe";
152   -
153   - }
154   -
155   - mockStatic(Reflections.class);
156   - Test test = new Test();
157   -
158   - expect(Reflections.getNonStaticDeclaredFields(test.getClass())).andReturn(Test.class.getDeclaredFields());
159   - expect(Reflections.getFieldValue(EasyMock.anyObject(Field.class), EasyMock.anyObject())).andReturn("myName");
160   - expect(Reflections.getFieldValue(EasyMock.anyObject(Field.class), EasyMock.anyObject()))
161   - .andReturn("myLastname");
162   - expect(Reflections.getFieldValue(EasyMock.anyObject(Field.class), EasyMock.anyObject())).andReturn(null);
163   - expect(Reflections.getFieldValue(EasyMock.anyObject(Field.class), EasyMock.anyObject())).andReturn("Object");
164 143  
165   - replayAll(Reflections.class);
  144 + }
166 145  
167   - // FIXME Este this$0=Object não deveria aparecer!
168   - assertEquals("Test [name=myName, lastname=myLastname, nullField=null, this$0=Object]",
169   - Strings.toString(new Test()));
  146 + String result = Strings.toString(new Test());
  147 +
  148 + assertTrue(result.contains("Test [name=myName, lastname=myLastname, nullField=null, this"));
170 149  
171 150 verifyAll();
172 151 }
... ... @@ -175,9 +154,9 @@ public class StringsTest {
175 154 String out = Strings.getString(in, params);
176 155 assertEquals(expected, out);
177 156 }
178   -
  157 +
179 158 @Test
180   - public void testRemoveBraces() {
  159 + public void removeBraces() {
181 160 assertNull(Strings.removeBraces(null));
182 161 assertEquals("", Strings.removeBraces(""));
183 162 assertEquals(" ", Strings.removeBraces(" "));
... ... @@ -191,9 +170,9 @@ public class StringsTest {
191 170 assertEquals("?", Strings.removeBraces("{?}"));
192 171 assertEquals("*", Strings.removeBraces("{*}"));
193 172 }
194   -
  173 +
195 174 @Test
196   - public void testInsertBraces() {
  175 + public void insertBraces() {
197 176 assertNull(Strings.insertBraces(null));
198 177 assertEquals("", Strings.insertBraces(""));
199 178 assertEquals(" ", Strings.insertBraces(" "));
... ... @@ -203,18 +182,28 @@ public class StringsTest {
203 182 assertEquals("{*}", Strings.insertBraces("*"));
204 183 assertEquals("{?}", Strings.insertBraces("?"));
205 184 }
206   -
  185 +
207 186 @Test
208   - public void testRemoveCharsWhenStringIsNull() {
  187 + public void removeCharsWhenStringIsNull() {
209 188 assertEquals(null, Strings.removeChars(null, 'a'));
210 189 }
211   -
  190 +
212 191 @Test
213   - public void testRemoveCharsWhenStringIsNotNull() {
  192 + public void removeCharsWhenStringIsNotNull() {
214 193 String string = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus lobortis.";
215 194 string = Strings.removeChars(string, 'L', 'l');
216 195 assertEquals(-1, string.indexOf('L'));
217 196 assertEquals(-1, string.indexOf('l'));
218 197 }
219 198  
  199 + @Test
  200 + public void insertZeros() {
  201 + String string = "Lorem ipsum";
  202 + assertEquals("00000", Strings.insertZeros(null, 5));
  203 + assertEquals(string, Strings.insertZeros(string, string.length()-1));
  204 + assertEquals(string, Strings.insertZeros(string, string.length()));
  205 + assertEquals("0"+string, Strings.insertZeros(string, string.length()+1));
  206 + assertEquals("00"+string, Strings.insertZeros(string, string.length()+2));
  207 + }
  208 +
220 209 }
... ...