Skip to content

Convert exception assertions to AssertJ in QueenAttackCalculatorTest #2199

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

Merged
andrerfcsantos merged 1 commit into from
Nov 12, 2022
Merged

Convert exception assertions to AssertJ in QueenAttackCalculatorTest #2199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 22 additions & 47 deletions exercises/practice/queen-attack/src/test/java/QueenAttackCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;

import org.junit.Ignore;
import org.junit.Test;

import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;


public class QueenAttackCalculatorTest {

Expand All @@ -17,49 +16,33 @@ public void testCreateQueenWithAValidPosition() {
@Ignore("Remove to run test")
@Test
public void testCreateQueenMustHavePositiveRow() {
IllegalArgumentException expected =
assertThrows(
IllegalArgumentException.class,
() -> new Queen(-2, 2));

assertThat(expected)
.hasMessage("Queen position must have positive row.");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new Queen(-2, 2))
.withMessage("Queen position must have positive row.");
}

@Ignore("Remove to run test")
@Test
public void testCreateQueenMustHaveRowOnBoard() {
IllegalArgumentException expected =
assertThrows(
IllegalArgumentException.class,
() -> new Queen(8, 4));

assertThat(expected)
.hasMessage("Queen position must have row <= 7.");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new Queen(8, 4))
.withMessage("Queen position must have row <= 7.");
}

@Ignore("Remove to run test")
@Test
public void testCreateQueenMustHavePositiveColumn() {
IllegalArgumentException expected =
assertThrows(
IllegalArgumentException.class,
() -> new Queen(2, -2));

assertThat(expected)
.hasMessage("Queen position must have positive column.");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new Queen(2, -2))
.withMessage("Queen position must have positive column.");
}

@Ignore("Remove to run test")
@Test
public void testCreateQueenMustHaveColumnOnBoard() {
IllegalArgumentException expected =
assertThrows(
IllegalArgumentException.class,
() -> new Queen(4, 8));

assertThat(expected)
.hasMessage("Queen position must have column <= 7.");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new Queen(4, 8))
.withMessage("Queen position must have column <= 7.");
}

@Ignore("Remove to run test")
Expand Down Expand Up @@ -128,25 +111,17 @@ public void testQueensCanAttackOnFourthDiagonal() {
@Ignore("Remove to run test")
@Test
public void testNullPositionsNotAllowed() {
IllegalArgumentException expected =
assertThrows(
IllegalArgumentException.class,
() -> new QueenAttackCalculator(null, new Queen(0, 7)));

assertThat(expected)
.hasMessage("You must supply valid positions for both Queens.");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new QueenAttackCalculator(null, new Queen(0, 7)))
.withMessage("You must supply valid positions for both Queens.");
}

@Ignore("Remove to run test")
@Test
public void testQueensMustNotOccupyTheSameSquare() {
IllegalArgumentException expected =
assertThrows(
IllegalArgumentException.class,
() -> new QueenAttackCalculator(new Queen(2, 2), new Queen(2, 2)));

assertThat(expected)
.hasMessage("Queens cannot occupy the same position.");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new QueenAttackCalculator(new Queen(2, 2), new Queen(2, 2)))
.withMessage("Queens cannot occupy the same position.");
}

}