diff options
| author | James Iry <jamesiry@gmail.com> | 2013-02-22 08:58:50 -0800 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-02-22 08:58:50 -0800 |
| commit | 58abbb9782755d7bb56775f714bb95df45a34dd9 (patch) | |
| tree | 61986626110096645da6b5539a67eae2d29be8a5 /test | |
| parent | b8cceea6e722d1b0098b6b68538dd342307b258b (diff) | |
| parent | 68f62d7e9c200034bd42ffaf795b57fb379d9d38 (diff) | |
| download | scala-58abbb9782755d7bb56775f714bb95df45a34dd9.tar.gz scala-58abbb9782755d7bb56775f714bb95df45a34dd9.tar.bz2 scala-58abbb9782755d7bb56775f714bb95df45a34dd9.zip | |
Merge pull request #2154 from viktorklang/wip-SI7164-nonfatal-notimplementederror
SI-7164 - Removing NotImplementedError as Fatal from s.u.c.NonFatal
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/jvm/future-spec/FutureTests.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/non-fatal-tests.scala | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala index 0efa83fbd9..01c9cf82ba 100644 --- a/test/files/jvm/future-spec/FutureTests.scala +++ b/test/files/jvm/future-spec/FutureTests.scala @@ -77,7 +77,7 @@ object FutureTests extends MinimalScalaTest { val logThrowable: Throwable => Unit = p.trySuccess(_) val ec: ExecutionContext = ExecutionContext.fromExecutor(null, logThrowable) - val t = new NotImplementedError("foo") + val t = new InterruptedException() val f = Future(throw t)(ec) Await.result(p.future, 2.seconds) mustBe t } diff --git a/test/files/jvm/non-fatal-tests.scala b/test/files/jvm/non-fatal-tests.scala index 471a9d227a..22c7cba51f 100644 --- a/test/files/jvm/non-fatal-tests.scala +++ b/test/files/jvm/non-fatal-tests.scala @@ -7,7 +7,8 @@ trait NonFatalTests { Seq(new StackOverflowError, new RuntimeException, new Exception, - new Throwable) + new Throwable, + new NotImplementedError) //Fatals val fatals: Seq[Throwable] = @@ -15,8 +16,7 @@ trait NonFatalTests { new OutOfMemoryError, new LinkageError, new VirtualMachineError {}, - new Throwable with scala.util.control.ControlThrowable, - new NotImplementedError) + new Throwable with scala.util.control.ControlThrowable) def testFatalsUsingApply(): Unit = { fatals foreach { t => assert(NonFatal(t) == false) } |