Skip to content

Commit 06f76d5

Browse files
garydgregorygarydgregory
committed
Use try-with-resources and format to 120 line length.
1 parent 8937ea3 commit 06f76d5

1 file changed

Lines changed: 29 additions & 42 deletions

File tree

‎src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java‎

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,21 +1119,19 @@ public void testMakeFileOnly() throws Exception {
11191119

11201120
@Test
11211121
public void testMagicNumberFileFilterBytes() throws Exception {
1122-
final byte[] classFileMagicNumber =
1123-
new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
1124-
final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" +
1125-
"<element>text</element>";
1122+
final byte[] classFileMagicNumber = new byte[] { (byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE };
1123+
final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" + "<element>text</element>";
11261124

11271125
final File classFileA = new File(temporaryFolder, "A.class");
11281126
final File xmlFileB = new File(temporaryFolder, "B.xml");
11291127
final File emptyFile = new File(temporaryFolder, "C.xml");
11301128
final File dir = new File(temporaryFolder, "D");
11311129
dir.mkdirs();
11321130

1133-
final OutputStream classFileAStream = FileUtils.openOutputStream(classFileA);
1134-
IOUtils.write(classFileMagicNumber, classFileAStream);
1135-
TestUtils.generateTestData(classFileAStream, 32);
1136-
classFileAStream.close();
1131+
try (final OutputStream classFileAStream = FileUtils.openOutputStream(classFileA)) {
1132+
IOUtils.write(classFileMagicNumber, classFileAStream);
1133+
TestUtils.generateTestData(classFileAStream, 32);
1134+
}
11371135

11381136
FileUtils.write(xmlFileB, xmlFileContent, StandardCharsets.UTF_8);
11391137
FileUtils.touch(emptyFile);
@@ -1145,7 +1143,6 @@ public void testMagicNumberFileFilterBytes() throws Exception {
11451143
assertFiltering(filter, emptyFile, false);
11461144
assertFiltering(filter, dir, false);
11471145

1148-
11491146
filter = FileFilterUtils.magicNumberFileFilter(classFileMagicNumber);
11501147

11511148
assertFiltering(filter, classFileA, true);
@@ -1156,37 +1153,33 @@ public void testMagicNumberFileFilterBytes() throws Exception {
11561153

11571154
@Test
11581155
public void testMagicNumberFileFilterBytesOffset() throws Exception {
1159-
final byte[] tarMagicNumber = new byte[] {0x75, 0x73, 0x74, 0x61, 0x72};
1156+
final byte[] tarMagicNumber = new byte[] { 0x75, 0x73, 0x74, 0x61, 0x72 };
11601157
final long tarMagicNumberOffset = 257;
11611158

11621159
final File tarFileA = new File(temporaryFolder, "A.tar");
11631160
final File randomFileB = new File(temporaryFolder, "B.txt");
11641161
final File dir = new File(temporaryFolder, "D");
11651162
dir.mkdirs();
11661163

1167-
final OutputStream tarFileAStream = FileUtils.openOutputStream(tarFileA);
1168-
TestUtils.generateTestData(tarFileAStream, tarMagicNumberOffset);
1169-
IOUtils.write(tarMagicNumber, tarFileAStream);
1170-
tarFileAStream.close();
1164+
try (final OutputStream tarFileAStream = FileUtils.openOutputStream(tarFileA)) {
1165+
TestUtils.generateTestData(tarFileAStream, tarMagicNumberOffset);
1166+
IOUtils.write(tarMagicNumber, tarFileAStream);
1167+
}
11711168

11721169
if (!randomFileB.getParentFile().exists()) {
1173-
throw new IOException("Cannot create file " + randomFileB
1174-
+ " as the parent directory does not exist");
1170+
throw new IOException("Cannot create file " + randomFileB + " as the parent directory does not exist");
11751171
}
1176-
try (final BufferedOutputStream output =
1177-
new BufferedOutputStream(new FileOutputStream(randomFileB))) {
1172+
try (final BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(randomFileB))) {
11781173
TestUtils.generateTestData(output, 2 * tarMagicNumberOffset);
11791174
}
11801175

1181-
IOFileFilter filter =
1182-
new MagicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
1176+
IOFileFilter filter = new MagicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
11831177

11841178
assertFiltering(filter, tarFileA, true);
11851179
assertFiltering(filter, randomFileB, false);
11861180
assertFiltering(filter, dir, false);
11871181

1188-
filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber,
1189-
tarMagicNumberOffset);
1182+
filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
11901183

11911184
assertFiltering(filter, tarFileA, true);
11921185
assertFiltering(filter, randomFileB, false);
@@ -1195,21 +1188,19 @@ public void testMagicNumberFileFilterBytesOffset() throws Exception {
11951188

11961189
@Test
11971190
public void testMagicNumberFileFilterString() throws Exception {
1198-
final byte[] classFileMagicNumber =
1199-
new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
1200-
final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" +
1201-
"<element>text</element>";
1191+
final byte[] classFileMagicNumber = new byte[] { (byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE };
1192+
final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" + "<element>text</element>";
12021193
final String xmlMagicNumber = "<?xml version=\"1.0\"";
12031194

12041195
final File classFileA = new File(temporaryFolder, "A.class");
12051196
final File xmlFileB = new File(temporaryFolder, "B.xml");
12061197
final File dir = new File(temporaryFolder, "D");
12071198
dir.mkdirs();
12081199

1209-
final OutputStream classFileAStream = FileUtils.openOutputStream(classFileA);
1210-
IOUtils.write(classFileMagicNumber, classFileAStream);
1211-
TestUtils.generateTestData(classFileAStream, 32);
1212-
classFileAStream.close();
1200+
try (final OutputStream classFileAStream = FileUtils.openOutputStream(classFileA)) {
1201+
IOUtils.write(classFileMagicNumber, classFileAStream);
1202+
TestUtils.generateTestData(classFileAStream, 32);
1203+
}
12131204

12141205
FileUtils.write(xmlFileB, xmlFileContent, StandardCharsets.UTF_8);
12151206

@@ -1236,29 +1227,25 @@ public void testMagicNumberFileFilterStringOffset() throws Exception {
12361227
final File dir = new File(temporaryFolder, "D");
12371228
dir.mkdirs();
12381229

1239-
final OutputStream tarFileAStream = FileUtils.openOutputStream(tarFileA);
1240-
TestUtils.generateTestData(tarFileAStream, tarMagicNumberOffset);
1241-
IOUtils.write(tarMagicNumber, tarFileAStream, StandardCharsets.UTF_8);
1242-
tarFileAStream.close();
1230+
try (final OutputStream tarFileAStream = FileUtils.openOutputStream(tarFileA)) {
1231+
TestUtils.generateTestData(tarFileAStream, tarMagicNumberOffset);
1232+
IOUtils.write(tarMagicNumber, tarFileAStream, StandardCharsets.UTF_8);
1233+
}
12431234

12441235
if (!randomFileB.getParentFile().exists()) {
1245-
throw new IOException("Cannot create file " + randomFileB
1246-
+ " as the parent directory does not exist");
1236+
throw new IOException("Cannot create file " + randomFileB + " as the parent directory does not exist");
12471237
}
1248-
try (final BufferedOutputStream output =
1249-
new BufferedOutputStream(new FileOutputStream(randomFileB))) {
1238+
try (final BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(randomFileB))) {
12501239
TestUtils.generateTestData(output, 2 * tarMagicNumberOffset);
12511240
}
12521241

1253-
IOFileFilter filter =
1254-
new MagicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
1242+
IOFileFilter filter = new MagicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
12551243

12561244
assertFiltering(filter, tarFileA, true);
12571245
assertFiltering(filter, randomFileB, false);
12581246
assertFiltering(filter, dir, false);
12591247

1260-
filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber,
1261-
tarMagicNumberOffset);
1248+
filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
12621249

12631250
assertFiltering(filter, tarFileA, true);
12641251
assertFiltering(filter, randomFileB, false);

0 commit comments

Comments
 (0)