Skip to content

Commit c29e08e

Browse files
sebbASFsebbASF
committed
Let JUnit handle the exceptions
1 parent f00d97a commit c29e08e

2 files changed

Lines changed: 115 additions & 128 deletions

File tree

‎src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java‎

Lines changed: 62 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -90,88 +90,79 @@ public void testAddRemoveObservers() {
9090

9191
/**
9292
* Test checkAndNotify() method
93+
* @throws Exception
9394
*/
9495
@Test
95-
public void testMonitor() {
96+
public void testMonitor() throws Exception {
97+
final long interval = 100;
98+
listener.clear();
99+
final FileAlterationMonitor monitor = new FileAlterationMonitor(interval, observer);
100+
assertEquals("Interval", interval, monitor.getInterval());
101+
monitor.start();
102+
96103
try {
97-
final long interval = 100;
98-
listener.clear();
99-
final FileAlterationMonitor monitor = new FileAlterationMonitor(interval, observer);
100-
assertEquals("Interval", interval, monitor.getInterval());
101-
monitor.start();
102-
103-
try {
104-
monitor.start(); // try and start again
105-
fail("Expected IllegalStateException");
106-
} catch (final IllegalStateException e) {
107-
// expected result, monitor already running
108-
}
104+
monitor.start(); // try and start again
105+
fail("Expected IllegalStateException");
106+
} catch (final IllegalStateException e) {
107+
// expected result, monitor already running
108+
}
109109

110-
// Create a File
111-
checkCollectionsEmpty("A");
112-
File file1 = touch(new File(testDir, "file1.java"));
113-
checkFile("Create", file1, listener.getCreatedFiles());
114-
listener.clear();
115-
116-
// Update a file
117-
checkCollectionsEmpty("B");
118-
file1 = touch(file1);
119-
checkFile("Update", file1, listener.getChangedFiles());
120-
listener.clear();
121-
122-
// Delete a file
123-
checkCollectionsEmpty("C");
124-
file1.delete();
125-
checkFile("Delete", file1, listener.getDeletedFiles());
126-
listener.clear();
127-
128-
// Stop monitoring
129-
monitor.stop();
130-
131-
try {
132-
monitor.stop(); // try and stop again
133-
fail("Expected IllegalStateException");
134-
} catch (final IllegalStateException e) {
135-
// expected result, monitor already stopped
136-
}
137-
} catch (final Exception e) {
138-
e.printStackTrace();
139-
fail("Threw " + e);
110+
// Create a File
111+
checkCollectionsEmpty("A");
112+
File file1 = touch(new File(testDir, "file1.java"));
113+
checkFile("Create", file1, listener.getCreatedFiles());
114+
listener.clear();
115+
116+
// Update a file
117+
checkCollectionsEmpty("B");
118+
file1 = touch(file1);
119+
checkFile("Update", file1, listener.getChangedFiles());
120+
listener.clear();
121+
122+
// Delete a file
123+
checkCollectionsEmpty("C");
124+
file1.delete();
125+
checkFile("Delete", file1, listener.getDeletedFiles());
126+
listener.clear();
127+
128+
// Stop monitoring
129+
monitor.stop();
130+
131+
try {
132+
monitor.stop(); // try and stop again
133+
fail("Expected IllegalStateException");
134+
} catch (final IllegalStateException e) {
135+
// expected result, monitor already stopped
140136
}
141137
}
142138

143139
/**
144140
* Test using a thread factory.
141+
* @throws Exception
145142
*/
146143
@Test
147-
public void testThreadFactory() {
148-
try {
149-
final long interval = 100;
150-
listener.clear();
151-
final FileAlterationMonitor monitor = new FileAlterationMonitor(interval, observer);
152-
monitor.setThreadFactory(Executors.defaultThreadFactory());
153-
assertEquals("Interval", interval, monitor.getInterval());
154-
monitor.start();
155-
156-
// Create a File
157-
checkCollectionsEmpty("A");
158-
final File file2 = touch(new File(testDir, "file2.java"));
159-
checkFile("Create", file2, listener.getCreatedFiles());
160-
listener.clear();
161-
162-
// Delete a file
163-
checkCollectionsEmpty("B");
164-
file2.delete();
165-
checkFile("Delete", file2, listener.getDeletedFiles());
166-
listener.clear();
167-
168-
// Stop monitoring
169-
monitor.stop();
170-
171-
} catch (final Exception e) {
172-
e.printStackTrace();
173-
fail("Threw " + e);
174-
}
144+
public void testThreadFactory() throws Exception {
145+
final long interval = 100;
146+
listener.clear();
147+
final FileAlterationMonitor monitor = new FileAlterationMonitor(interval, observer);
148+
monitor.setThreadFactory(Executors.defaultThreadFactory());
149+
assertEquals("Interval", interval, monitor.getInterval());
150+
monitor.start();
151+
152+
// Create a File
153+
checkCollectionsEmpty("A");
154+
final File file2 = touch(new File(testDir, "file2.java"));
155+
checkFile("Create", file2, listener.getCreatedFiles());
156+
listener.clear();
157+
158+
// Delete a file
159+
checkCollectionsEmpty("B");
160+
file2.delete();
161+
checkFile("Delete", file2, listener.getDeletedFiles());
162+
listener.clear();
163+
164+
// Stop monitoring
165+
monitor.stop();
175166
}
176167

177168
/**

‎src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java‎

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -90,65 +90,61 @@ public void testToString() {
9090

9191
/**
9292
* Test checkAndNotify() method
93+
* @throws Exception
9394
*/
9495
@Test
95-
public void testDirectory() {
96-
try {
97-
checkAndNotify();
98-
checkCollectionsEmpty("A");
99-
final File testDirA = new File(testDir, "test-dir-A");
100-
final File testDirB = new File(testDir, "test-dir-B");
101-
final File testDirC = new File(testDir, "test-dir-C");
102-
testDirA.mkdir();
103-
testDirB.mkdir();
104-
testDirC.mkdir();
105-
final File testDirAFile1 = touch(new File(testDirA, "A-file1.java"));
106-
final File testDirAFile2 = touch(new File(testDirA, "A-file2.txt")); // filter should ignore this
107-
final File testDirAFile3 = touch(new File(testDirA, "A-file3.java"));
108-
File testDirAFile4 = touch(new File(testDirA, "A-file4.java"));
109-
final File testDirBFile1 = touch(new File(testDirB, "B-file1.java"));
110-
111-
checkAndNotify();
112-
checkCollectionSizes("B", 3, 0, 0, 4, 0, 0);
113-
assertTrue("B testDirA", listener.getCreatedDirectories().contains(testDirA));
114-
assertTrue("B testDirB", listener.getCreatedDirectories().contains(testDirB));
115-
assertTrue("B testDirC", listener.getCreatedDirectories().contains(testDirC));
116-
assertTrue("B testDirAFile1", listener.getCreatedFiles().contains(testDirAFile1));
117-
assertFalse("B testDirAFile2", listener.getCreatedFiles().contains(testDirAFile2));
118-
assertTrue("B testDirAFile3", listener.getCreatedFiles().contains(testDirAFile3));
119-
assertTrue("B testDirAFile4", listener.getCreatedFiles().contains(testDirAFile4));
120-
assertTrue("B testDirBFile1", listener.getCreatedFiles().contains(testDirBFile1));
121-
122-
checkAndNotify();
123-
checkCollectionsEmpty("C");
124-
125-
testDirAFile4 = touch(testDirAFile4);
126-
FileUtils.deleteDirectory(testDirB);
127-
checkAndNotify();
128-
checkCollectionSizes("D", 0, 0, 1, 0, 1, 1);
129-
assertTrue("D testDirB", listener.getDeletedDirectories().contains(testDirB));
130-
assertTrue("D testDirAFile4", listener.getChangedFiles().contains(testDirAFile4));
131-
assertTrue("D testDirBFile1", listener.getDeletedFiles().contains(testDirBFile1));
132-
133-
FileUtils.deleteDirectory(testDir);
134-
checkAndNotify();
135-
checkCollectionSizes("E", 0, 0, 2, 0, 0, 3);
136-
assertTrue("E testDirA", listener.getDeletedDirectories().contains(testDirA));
137-
assertTrue("E testDirAFile1", listener.getDeletedFiles().contains(testDirAFile1));
138-
assertFalse("E testDirAFile2", listener.getDeletedFiles().contains(testDirAFile2));
139-
assertTrue("E testDirAFile3", listener.getDeletedFiles().contains(testDirAFile3));
140-
assertTrue("E testDirAFile4", listener.getDeletedFiles().contains(testDirAFile4));
141-
142-
testDir.mkdir();
143-
checkAndNotify();
144-
checkCollectionsEmpty("F");
145-
146-
checkAndNotify();
147-
checkCollectionsEmpty("G");
148-
} catch (final Exception e) {
149-
e.printStackTrace();
150-
fail("Threw " + e);
151-
}
96+
public void testDirectory() throws Exception {
97+
checkAndNotify();
98+
checkCollectionsEmpty("A");
99+
final File testDirA = new File(testDir, "test-dir-A");
100+
final File testDirB = new File(testDir, "test-dir-B");
101+
final File testDirC = new File(testDir, "test-dir-C");
102+
testDirA.mkdir();
103+
testDirB.mkdir();
104+
testDirC.mkdir();
105+
final File testDirAFile1 = touch(new File(testDirA, "A-file1.java"));
106+
final File testDirAFile2 = touch(new File(testDirA, "A-file2.txt")); // filter should ignore this
107+
final File testDirAFile3 = touch(new File(testDirA, "A-file3.java"));
108+
File testDirAFile4 = touch(new File(testDirA, "A-file4.java"));
109+
final File testDirBFile1 = touch(new File(testDirB, "B-file1.java"));
110+
111+
checkAndNotify();
112+
checkCollectionSizes("B", 3, 0, 0, 4, 0, 0);
113+
assertTrue("B testDirA", listener.getCreatedDirectories().contains(testDirA));
114+
assertTrue("B testDirB", listener.getCreatedDirectories().contains(testDirB));
115+
assertTrue("B testDirC", listener.getCreatedDirectories().contains(testDirC));
116+
assertTrue("B testDirAFile1", listener.getCreatedFiles().contains(testDirAFile1));
117+
assertFalse("B testDirAFile2", listener.getCreatedFiles().contains(testDirAFile2));
118+
assertTrue("B testDirAFile3", listener.getCreatedFiles().contains(testDirAFile3));
119+
assertTrue("B testDirAFile4", listener.getCreatedFiles().contains(testDirAFile4));
120+
assertTrue("B testDirBFile1", listener.getCreatedFiles().contains(testDirBFile1));
121+
122+
checkAndNotify();
123+
checkCollectionsEmpty("C");
124+
125+
testDirAFile4 = touch(testDirAFile4);
126+
FileUtils.deleteDirectory(testDirB);
127+
checkAndNotify();
128+
checkCollectionSizes("D", 0, 0, 1, 0, 1, 1);
129+
assertTrue("D testDirB", listener.getDeletedDirectories().contains(testDirB));
130+
assertTrue("D testDirAFile4", listener.getChangedFiles().contains(testDirAFile4));
131+
assertTrue("D testDirBFile1", listener.getDeletedFiles().contains(testDirBFile1));
132+
133+
FileUtils.deleteDirectory(testDir);
134+
checkAndNotify();
135+
checkCollectionSizes("E", 0, 0, 2, 0, 0, 3);
136+
assertTrue("E testDirA", listener.getDeletedDirectories().contains(testDirA));
137+
assertTrue("E testDirAFile1", listener.getDeletedFiles().contains(testDirAFile1));
138+
assertFalse("E testDirAFile2", listener.getDeletedFiles().contains(testDirAFile2));
139+
assertTrue("E testDirAFile3", listener.getDeletedFiles().contains(testDirAFile3));
140+
assertTrue("E testDirAFile4", listener.getDeletedFiles().contains(testDirAFile4));
141+
142+
testDir.mkdir();
143+
checkAndNotify();
144+
checkCollectionsEmpty("F");
145+
146+
checkAndNotify();
147+
checkCollectionsEmpty("G");
152148
}
153149

154150
/**

0 commit comments

Comments
 (0)