Gerrit3

org/jboss/arquillian/container/test/api/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='org.jboss.arquillian.container.test.api.Deployment'>
+        <annotation name='java.lang.Deprecated'/>
+    </item>
+</root>

org/junit/runner/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='org.junit.runner.RunWith'>
+        <annotation name='java.lang.Deprecated'/>
+    </item>
+</root>

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

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());
     }
-}
+
+    // 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, )
+    }*/
+
+
+
+}
+