Skip to content

Commit 48384a7

Browse files
committed
tests: added some missing null checks
1 parent eed9e70 commit 48384a7

File tree

1 file changed

+31
-4
lines changed

1 file changed

+31
-4
lines changed

app/test/processing/app/tools/ZipDeflaterTest.java

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
package processing.app.tools;
3131

3232
import static org.junit.Assert.assertEquals;
33+
import static org.junit.Assert.assertTrue;
34+
import static org.junit.Assert.assertNotNull;
3335

3436
import java.io.File;
3537
import java.util.Arrays;
@@ -57,11 +59,17 @@ public void shouldDeflateZip() throws Exception {
5759
new ZipDeflater(file, destFolder).deflate();
5860

5961
String[] files = destFolder.list();
62+
assertNotNull(files);
6063
assertEquals(1, files.length);
6164
assertEquals("Test2", files[0]);
6265

63-
file = destFolder.listFiles()[0];
66+
File[] destFolders = destFolder.listFiles();
67+
assertNotNull(destFolders);
68+
assertTrue(destFolders.length > 0);
69+
file = destFolders[0];
70+
assertNotNull(file);
6471
files = file.list();
72+
assertNotNull(files);
6573
assertEquals(5, files.length);
6674
Arrays.sort(files);
6775
assertEquals("Test.cpp", files[0]);
@@ -77,11 +85,17 @@ public void shouldDeflateZipAndMoveContentsToParentFolder() throws Exception {
7785
new ZipDeflater(file, destFolder).deflate();
7886

7987
String[] files = destFolder.list();
88+
assertNotNull(files);
8089
assertEquals(1, files.length);
8190
assertEquals("Test", files[0]);
8291

83-
file = destFolder.listFiles()[0];
92+
File[] destFolders = destFolder.listFiles();
93+
assertNotNull(destFolders);
94+
assertTrue(destFolders.length > 0);
95+
file = destFolders[0];
96+
assertNotNull(file);
8497
files = file.list();
98+
assertNotNull(files);
8599
assertEquals(5, files.length);
86100
Arrays.sort(files);
87101
assertEquals("Test.cpp", files[0]);
@@ -97,11 +111,17 @@ public void shouldDeflateMacZip() throws Exception {
97111
new ZipDeflater(file, destFolder).deflate();
98112

99113
String[] files = destFolder.list();
114+
assertNotNull(files);
100115
assertEquals(1, files.length);
101116
assertEquals("Keypad", files[0]);
102117

103-
file = destFolder.listFiles()[0];
118+
File[] destFolders = destFolder.listFiles();
119+
assertNotNull(destFolders);
120+
assertTrue(destFolders.length > 0);
121+
file = destFolders[0];
122+
assertNotNull(file);
104123
files = file.list();
124+
assertNotNull(files);
105125
assertEquals(4, files.length);
106126
Arrays.sort(files);
107127
assertEquals("Keypad.cpp", files[0]);
@@ -110,6 +130,7 @@ public void shouldDeflateMacZip() throws Exception {
110130
assertEquals("keywords.txt", files[3]);
111131

112132
files = new File(file, "examples").list();
133+
assertNotNull(files);
113134
assertEquals(4, files.length);
114135
Arrays.sort(files);
115136
assertEquals("CustomKeypad", files[0]);
@@ -124,11 +145,17 @@ public void shouldDeleteHiddenFiles() throws Exception {
124145
new ZipDeflater(file, destFolder).deflate();
125146

126147
String[] files = destFolder.list();
148+
assertNotNull(files);
127149
assertEquals(1, files.length);
128150
assertEquals("Keypad_with_hidden_files", files[0]);
129151

130-
file = destFolder.listFiles()[0];
152+
File[] destFolders = destFolder.listFiles();
153+
assertNotNull(destFolders);
154+
assertTrue(destFolders.length > 0);
155+
file = destFolders[0];
156+
assertNotNull(file);
131157
files = file.list();
158+
assertNotNull(files);
132159
assertEquals(4, files.length);
133160
}
134161

0 commit comments

Comments
 (0)