moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Eclipse automated refactor/cleanup: convert for loops to for-each loops

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1765731 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-10-19 23:04:39 +00:00
parent 5d3d50b9d1
commit 2554a46eaf
3 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
View File

@ -44,8 +44,8 @@ public final class TestContentType extends TestCase {
String[] contentTypesToTest = new String[] { "text/xml",
"application/pgp-key", "application/vnd.hp-PCLXL",
"application/vnd.lotus-1-2-3" };
for (int i = 0; i < contentTypesToTest.length; ++i) {
new ContentType(contentTypesToTest[i]);
for (String contentType : contentTypesToTest) {
new ContentType(contentType);
}
}
@ -72,14 +72,13 @@ public final class TestContentType extends TestCase {
"text[/xml", "text]/xml", "text?/xml", "tex=t/xml",
"te{xt/xml", "tex}t/xml", "te xt/xml",
"text" + (char) 9 + "/xml", "text xml", " text/xml " };
for (int i = 0; i < contentTypesToTest.length; ++i) {
for (String contentType : contentTypesToTest) {
try {
new ContentType(contentTypesToTest[i]);
new ContentType(contentType);
} catch (InvalidFormatException e) {
continue;
}
fail("Must have fail for content type: '" + contentTypesToTest[i]
+ "' !");
fail("Must have fail for content type: '" + contentType + "' !");
}
}
@ -110,14 +109,13 @@ public final class TestContentType extends TestCase {
"mail/toto;titi = tata", // spaces not allowed
"text/\u0080" // characters above ASCII are not allowed
};
for (int i = 0; i < contentTypesToTest.length; ++i) {
for (String contentType : contentTypesToTest) {
try {
new ContentType(contentTypesToTest[i]);
new ContentType(contentType);
} catch (InvalidFormatException e) {
continue;
}
fail("Must have fail for content type: '" + contentTypesToTest[i]
+ "' !");
fail("Must have fail for content type: '" + contentType + "' !");
}
}
@ -128,14 +126,13 @@ public final class TestContentType extends TestCase {
*/
public void testContentTypeCommentFailure() {
String[] contentTypesToTest = new String[] { "text/xml(comment)" };
for (int i = 0; i < contentTypesToTest.length; ++i) {
for (String contentType : contentTypesToTest) {
try {
new ContentType(contentTypesToTest[i]);
new ContentType(contentType);
} catch (InvalidFormatException e) {
continue;
}
fail("Must have fail for content type: '" + contentTypesToTest[i]
+ "' !");
fail("Must have fail for content type: '" + contentType + "' !");
}
}

4
src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
View File

@ -133,10 +133,8 @@ public class TestXSSFExcelExtractor extends TestCase {
POITextExtractor[] extractors =
new POITextExtractor[] { ooxmlExtractor, ole2Extractor };
for (int i = 0; i < extractors.length; i++) {
@SuppressWarnings("resource")
POITextExtractor extractor = extractors[i];
for (POITextExtractor extractor : extractors) {
String text = extractor.getText().replaceAll("[\r\t]", "");
assertTrue(text.startsWith("First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n"));
Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);

26
src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
View File

@ -23,6 +23,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.TestCase;
import org.apache.poi.util.StringUtil;
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
@ -51,15 +53,9 @@ public class TestXWPFWordExtractor extends TestCase {
"Phasellus ultricies mi nec leo. Sed tempus. In sit amet lorem at velit faucibus vestibulum.\n"
));
// Check number of paragraphs
int ps = 0;
char[] t = text.toCharArray();
for (int i = 0; i < t.length; i++) {
if (t[i] == '\n') {
ps++;
}
}
assertEquals(3, ps);
// Check number of paragraphs by counting number of newlines
int numberOfParagraphs = StringUtil.count(text, '\n');
assertEquals(3, numberOfParagraphs);
extractor.close();
}
@ -90,15 +86,9 @@ public class TestXWPFWordExtractor extends TestCase {
"11.4%\t\t90\t\t\t\t\t250\t\t1,310\t\n\n \n\n\n"
));
// Check number of paragraphs
int ps = 0;
char[] t = text.toCharArray();
for (int i = 0; i < t.length; i++) {
if (t[i] == '\n') {
ps++;
}
}
assertEquals(134, ps);
// Check number of paragraphs by counting number of newlines
int numberOfParagraphs = StringUtil.count(text, '\n');
assertEquals(134, numberOfParagraphs);
extractor.close();
}