Fixed #16 - allow Throwable types in expectToThrow.

Allow subtypes of expected Exception type to be thrown.
renatoathaydes · Jul 26, 2018 · e3d70c4 · e3d70c4
1 parent 10a451c
commit e3d70c4
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 6 deletions.
diff --git a/source/com/athaydes/specks/assertion/assertions.ceylon b/source/com/athaydes/specks/assertion/assertions.ceylon
@@ -44,18 +44,18 @@ shared AssertionResult expectCondition(Boolean expectedToBeTrue)
         => expect(expectedToBeTrue, toBe(identicalTo(true)));
 
 "Platform independent name of an Exception"
-shared String platformIndependentName(Type<Exception>|Throwable exception) =>
+shared String platformIndependentName(Type<Throwable>|Throwable exception) =>
         exception.string.replace("::", ".");
 
 "Creates an assertion that is successful only if a `when` function throws a [[Throwable]]
- with the [[expectedType]].
+ with the [[expectedType]], or a subtype of it.
 
  This assertion is commonly used with the [[errorCheck]] block."
 see(`function errorCheck`)
-shared AssertionResult expectToThrow(Type<Exception> expectedType)(Throwable? result) {
+shared AssertionResult expectToThrow(Type<Throwable> expectedType)(Throwable? result) {
 
     AssertionResult verifyActualException(Throwable result) {
-        if (type(result).exactly(expectedType)) {
+        if (type(result).subtypeOf(expectedType)) {
             return success;
         } else {
             value resultType = platformIndependentName(result);

diff --git a/tests/test/com/athaydes/specks/specksTests.ceylon b/tests/test/com/athaydes/specks/specksTests.ceylon
@@ -103,12 +103,17 @@ test shared void happySpecificationThatPassesAllTests() {
             examples = {[1], [2]};
             when(Integer i) => throwThis(Exception("Bad"));
             expectToThrow(`Exception`)
+        },
+        errorCheck {
+            description = "Exception subtypes are acceptable";
+            when() => 1 / 0;
+            expectToThrow(`Exception`)
         }
     }.run();
 
     value specResultAtIndex = specResultAt(specResult);
 
-    assertEquals(specResult.size, 4); // number of blocks
+    assertEquals(specResult.size, 5); // number of blocks
 
     assertEquals(specResultAtIndex(0), [
         [2, 4, 6] -> [success, success],
@@ -124,6 +129,9 @@ test shared void happySpecificationThatPassesAllTests() {
     assertEquals(specResultAtIndex(3), [
         [1] -> [success],
         [2] -> [success]]);
+
+    assertEquals(specResultAtIndex(4), [
+        [] -> [success]]);
 }
 
 test shared void featuresShouldFailWithExplanationMessage() {
@@ -141,12 +149,22 @@ test shared void featuresShouldFailWithExplanationMessage() {
             error,
             () => expect(null, exist),
             () => expect([1,2,3].contains(5), identicalTo(true))
+        },
+        errorCheck {
+            description = "No throws when an error is expected";
+            when() => [];
+            expectToThrow(`Exception`)
+        },
+        errorCheck {
+            description = "Non-subtypes are NOT acceptable";
+            when() => throwThis(Exception("Bad"));
+            expectToThrow(`MutationException`)
         }
     }.run();
 
     value specResultAtIndex = specResultAt(specResult);
 
-    assertEquals(specResult.size, 1);
+    assertEquals(specResult.size, 3);
 
     value firstResults = specResultAtIndex(0);
 
@@ -163,6 +181,27 @@ test shared void featuresShouldFailWithExplanationMessage() {
     assertEquals(results[5], "\nFeature 'should fail with explanation message' failed: expected true but was false");
 
     assertEquals(results.size, 6);
+
+    value errorCheckResults = specResultAtIndex(1);
+
+    assertEquals(errorCheckResults.size, 1);
+    assertEquals(errorCheckResults[0]?.key, []);
+
+    assert(exists results2 = errorCheckResults[0]?.item);
+    assertEquals(results2[0], "\nErrorCheck 'No throws when an error is expected' failed: no Exception thrown");
+    assertEquals(results2.size, 1);
+
+    value errorCheckResults2 = specResultAtIndex(2);
+
+    assertEquals(errorCheckResults2.size, 1);
+    assertEquals(errorCheckResults2[0]?.key, []);
+
+    assert(exists results3 = errorCheckResults2[0]?.item);
+    assertEquals(results3[0], "\nErrorCheck 'Non-subtypes are NOT acceptable' failed: \
+                               expected ceylon.language.meta.model.MutationException \
+                               but threw ceylon.language.Exception \"Bad\"");
+
+    assertEquals(results3.size, 1);
 }
 
 test shared void featuresShouldFailWithExplanationMessageForFailedExamples() {