diff --git a/lib/apiguardian-api-1.0.0.jar b/lib/apiguardian-api-1.0.0.jar new file mode 100644 index 0000000..6cbff70 Binary files /dev/null and b/lib/apiguardian-api-1.0.0.jar differ diff --git a/lib/javax.annotation.jar b/lib/javax.annotation.jar new file mode 100644 index 0000000..52dca7f Binary files /dev/null and b/lib/javax.annotation.jar differ diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar new file mode 100644 index 0000000..4ebf5ec Binary files /dev/null and b/lib/javax.ejb.jar differ diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar new file mode 100644 index 0000000..d31451a Binary files /dev/null and b/lib/javax.jms.jar differ diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar new file mode 100644 index 0000000..21d80e0 Binary files /dev/null and b/lib/javax.persistence.jar differ diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar new file mode 100644 index 0000000..696a234 Binary files /dev/null and b/lib/javax.resource.jar differ diff --git a/lib/javax.servlet.jar b/lib/javax.servlet.jar new file mode 100644 index 0000000..0519e4a Binary files /dev/null and b/lib/javax.servlet.jar differ diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar new file mode 100644 index 0000000..9c0631c Binary files /dev/null and b/lib/javax.servlet.jsp.jar differ diff --git a/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar new file mode 100644 index 0000000..7be17cc Binary files /dev/null and b/lib/javax.servlet.jsp.jstl.jar differ diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar new file mode 100644 index 0000000..729c695 Binary files /dev/null and b/lib/javax.transaction.jar differ diff --git a/lib/junit-jupiter-api-5.0.0.jar b/lib/junit-jupiter-api-5.0.0.jar new file mode 100644 index 0000000..5e0d9ce Binary files /dev/null and b/lib/junit-jupiter-api-5.0.0.jar differ diff --git a/lib/junit-platform-commons-1.0.0.jar b/lib/junit-platform-commons-1.0.0.jar new file mode 100644 index 0000000..3210003 Binary files /dev/null and b/lib/junit-platform-commons-1.0.0.jar differ diff --git a/lib/opentest4j-1.0.0.jar b/lib/opentest4j-1.0.0.jar new file mode 100644 index 0000000..1b5f425 Binary files /dev/null and b/lib/opentest4j-1.0.0.jar differ diff --git a/org/jboss/arquillian/container/test/api/annotations.xml b/org/jboss/arquillian/container/test/api/annotations.xml new file mode 100644 index 0000000..0dfb4ce --- /dev/null +++ b/org/jboss/arquillian/container/test/api/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/org/junit/runner/annotations.xml b/org/junit/runner/annotations.xml new file mode 100644 index 0000000..aa891a0 --- /dev/null +++ b/org/junit/runner/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/nl/noorderzon/functies/Reservation.java b/src/main/java/nl/noorderzon/functies/Reservation.java index 1e366d0..2064ae0 100644 --- a/src/main/java/nl/noorderzon/functies/Reservation.java +++ b/src/main/java/nl/noorderzon/functies/Reservation.java @@ -19,6 +19,7 @@ public class Reservation { private int capacity; private boolean validReservation; private int voorstelling = 1; + private int quant_res; private static EntityManagerFactory emf = Persistence.createEntityManagerFactory("nl.noorderzon.hibernate"); @@ -30,9 +31,15 @@ public class Reservation { */ public Reservation(int quant_res) { Calculate(quant_res); + this.quant_res = quant_res; System.out.println("ValidReservation = " + validReservation); System.out.println("Capacity = " + capacity); updateCapaciteit(); + + } + + public int getQuant_res() { + return quant_res; } // Main aangemaakt om te testen diff --git a/src/main/java/nl/noorderzon/functies/ReservationTest.java b/src/main/java/nl/noorderzon/functies/ReservationTest.java index 458fa04..6d248b7 100644 --- a/src/main/java/nl/noorderzon/functies/ReservationTest.java +++ b/src/main/java/nl/noorderzon/functies/ReservationTest.java @@ -1,22 +1,82 @@ package nl.noorderzon.functies; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.Assert.*; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; -class ReservationTest { +/**The test class ReservationTest**/ - // om de if-else statement te testen worden voor de beide condities een test gemaakt. - @Test - public void calculateStatementOne() { - assertTrue(); +public class ReservationTest { + private Reservation res1; + private Reservation res2; + private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private final PrintStream originalOut = System.out; + private int capacity; + + /** + * Constructor for the test class + **/ + + public ReservationTest(){ + } + + /* + * Set up the test reservations + * Called before every test method + */ + + @Before + public void setUp() { + res1 = new Reservation(5); + res2 = new Reservation(2); + capacity = 500; + } + + public void setUpStreams() { + System.setOut(new PrintStream(outContent)); + } + + /* + Tears down the test setup. + Method called after every test + */ + + @After + public void tearDown(){ + } + public void restoreStreams() { + System.setOut(originalOut); } + /** + * Test that a reservation item is correctly initialised (quantity). + */ @Test - void getCapacity() { + public void testInit() { + Reservation res1 = new Reservation(5); + assertEquals(5, res1.getQuant_res()); } + @Test - void isValidReservation() { + public void out() { + System.out.print("ValidReservation"); + assertEquals("ValidReservation", outContent.toString()); } -} \ No newline at end of file + + // als er vrijdag nog tijd is dan deze nog uitwerken + /* @Test + public void testCalculate1(){ + Reservation res1 = new Reservation(4); + capacity = capacity - getQuant_res; + assertEquals(true, ) + }*/ + + + +} +