Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for bugs #20 and #19 #21

Merged
merged 2 commits into from
Mar 9, 2015
Merged

Fix for bugs #20 and #19 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f1dead
Suite description now add its children
WouterOet Mar 8, 2015
3f865e1
Fix for bug #19
WouterOet Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions oleaster-matcher/src/main/java/com/mscharhag/oleaster/matcher/matchers/ExceptionMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public <T extends Exception> void toThrow(Class<T> expectedExceptionClass, Strin
Arguments.ensureNotNull(expectedMessage, "expectedMessage cannot be null");
this.toThrow(expectedExceptionClass);
String exceptionMessage = this.exception.getMessage();
Expectations.expectTrue(expectedMessage.equals(exceptionMessage),
"Expected exception message '%s' but was '%s'", exceptionMessage, exceptionMessage);
Expectations.expectTrue(expectedMessage.equals(exceptionMessage),
"Expected exception message '%s' but was '%s'", expectedMessage, exceptionMessage);
}

private void runCodeBlock(CodeBlock block) {
Expand Down
3 changes: 2 additions & 1 deletion ...r-matcher/src/test/java/com/mscharhag/oleaster/matcher/matchers/ExceptionMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public class ExceptionMatcherTest {
});

it("fails if the exception message is not equal to the expected message", () -> {
TestUtil.expectAssertionError(() -> matcher.toThrow(IllegalArgumentException.class, "foo"));
String expectedMessage = "Expected exception message 'foo' but was 'test exception'";
TestUtil.expectAssertionError(() -> matcher.toThrow(IllegalArgumentException.class, "foo"), expectedMessage);
});

it("is ok if it is checked for a super class of the thrown exception", () -> {
Expand Down
6 changes: 0 additions & 6 deletions oleaster-runner/src/main/java/com/mscharhag/oleaster/runner/OleasterRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ protected Description describeChild(Spec child) {
}


@Override
public Description getDescription() {
return Description.createSuiteDescription(this.getTestClass().getJavaClass().getName());
}


protected SuiteBuilder createSuiteBuilder() {
return new StaticSupportingSuiteBuilder();
}
Expand Down
5 changes: 5 additions & 0 deletions oleaster-runner/src/test/java/com/mscharhag/oleaster/runner/OleasterRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ public void buildTestSuite(SuiteBuilder sb) {
runner = new OleasterRunner(TestClass.class);
});

it("adds the filtered children to the suite", () -> {
int numberOfChildren = runner.getDescription().getChildren().size();
assertEquals(2, numberOfChildren);
});

describe("when specs are obtained from the test class using getChildren()", () -> {

beforeEach(() -> {
Expand Down