You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2017/05/02 10:28:19 UTC

[1/2] commons-io git commit: Fail if expected Exception not thrown

Repository: commons-io
Updated Branches:
  refs/heads/master bfd83b00e -> f00d97a6c


Fail if expected Exception not thrown

Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/c295a589
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/c295a589
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/c295a589

Branch: refs/heads/master
Commit: c295a589777a35730c90b26f28f7cc938d4053e3
Parents: 419ad3e
Author: Sebb <se...@apache.org>
Authored: Tue May 2 11:27:34 2017 +0100
Committer: Sebb <se...@apache.org>
Committed: Tue May 2 11:27:34 2017 +0100

----------------------------------------------------------------------
 .../apache/commons/io/monitor/FileAlterationMonitorTestCase.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-io/blob/c295a589/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
index ec8b792..973b150 100644
--- a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
+++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
@@ -102,6 +102,7 @@ public class FileAlterationMonitorTestCase extends AbstractMonitorTestCase {
 
             try {
                 monitor.start(); // try and start again
+                fail("Expected IllegalStateException");
             } catch (final IllegalStateException e) {
                 // expected result, monitor already running
             }
@@ -129,6 +130,7 @@ public class FileAlterationMonitorTestCase extends AbstractMonitorTestCase {
 
             try {
                 monitor.stop(); // try and stop again
+                fail("Expected IllegalStateException");
             } catch (final IllegalStateException e) {
                 // expected result, monitor already stopped
             }


[2/2] commons-io git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-io.git

Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-io.git

Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/f00d97a6
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/f00d97a6
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/f00d97a6

Branch: refs/heads/master
Commit: f00d97a6cea0a08c8112ffb8bd0b6847373899ae
Parents: c295a58 bfd83b0
Author: Sebb <se...@apache.org>
Authored: Tue May 2 11:28:01 2017 +0100
Committer: Sebb <se...@apache.org>
Committed: Tue May 2 11:28:01 2017 +0100

----------------------------------------------------------------------
 .travis.yml                                     |  2 +-
 README.md                                       |  1 -
 checkstyle.xml                                  |  4 -
 pom.xml                                         | 16 +++-
 src/changes/changes.xml                         |  6 ++
 .../java/org/apache/commons/io/FileUtils.java   | 69 +++++++++++++++
 .../java/org/apache/commons/io/IOUtils.java     |  8 +-
 .../commons/io/filefilter/FileFilterUtils.java  | 12 +--
 .../MessageDigestCalculatingInputStream.java    | 15 ++++
 .../commons/io/input/ObservableInputStream.java | 32 ++++++-
 .../commons/io/output/WriterOutputStream.java   |  5 ++
 src/site/resources/profile.clirr                |  0
 src/site/resources/profile.cobertura            |  0
 .../apache/commons/io/FileUtilsTestCase.java    | 89 ++++++++++++++++++++
 .../org/apache/commons/io/IOUtilsTestCase.java  | 10 +--
 15 files changed, 244 insertions(+), 25 deletions(-)
----------------------------------------------------------------------