finished commit

TicketMachine.java

@@ -6,11 +6,10 @@
  * to insert enough money before trying to print a ticket.
  * It also assumes that users enter sensible amounts.
  *
- * @author David J. Barnes and Michael Kolling
- * @version 2008.03.30
+ * @author James Seo
+ * @version 2018.05.24
  */
-public class TicketMachine
-{
+public class TicketMachine {
     // The price of a ticket from this machine.
     private int price;
     // The amount of money entered by a customer so far.
@@ -23,8 +22,7 @@ public class TicketMachine
      * Note that the price must be greater than zero, and there
      * are no checks to ensure this.
      */
-    public TicketMachine(int ticketCost)
-    {
+    public TicketMachine(int ticketCost) {
         price = ticketCost;
         balance = 0;
         total = 0;
@@ -33,8 +31,7 @@ public class TicketMachine
     /**
      * Return the price of a ticket.
      */
-    public int getPrice()
-    {
+    public int getPrice() {
         return price;
     }
 
@@ -42,19 +39,41 @@ public class TicketMachine
      * Return the amount of money already inserted for the
      * next ticket.
      */
-    public int getBalance()
-    {
-        return balance;
+    public int getBalance() {
+         return balance;
     }
 
     /**
      * Receive an amount of money in cents from a customer.
      */
-    public void insertMoney(int amount)
-    {
+    public void insertMoney(int amount) {
         balance = balance + amount;
     }
+    
+    public int getTotal() {
+         return total;
+    }
+    public void getPrompt() {
+    System.out.println("Please insert the correct amount of money.");
+    }
+    public void showPrice(){
+        System.out.println("# " + price + " cents.");
+          
+    }
+    
+    public void setEmpty(){
+     total = 0;
+  
+    }
+    public void setPrice(int newPrice){
+   
+    price = newPrice;
+    }   
+        
+
+
 
+ 
     /**
      * Print a ticket.
      * Update the total collected and
@@ -74,5 +93,6 @@ public class TicketMachine
         total = total + balance;
         // Clear the balance.
         balance = 0;
+    
     }
 }

TicketMachineTest.java

@@ -0,0 +1,66 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class TicketMachineTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class TicketMachineTest
+{
+    private TicketMachine ticketMa1;
+    private TicketMachine ticketMa2;
+    private TicketMachine ticketMa3;
+    private TicketMachine ticketMa4;
+
+    /**
+     * Default constructor for test class TicketMachineTest
+     */
+    public TicketMachineTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+        ticketMa1 = new TicketMachine(500);
+        ticketMa2 = new TicketMachine(100);
+        ticketMa2.showPrice();
+        ticketMa1.showPrice();
+        ticketMa3 = new TicketMachine(500);
+        ticketMa4 = new TicketMachine(100);
+        ticketMa4.showPrice();
+        ticketMa3.showPrice();
+        ticketMa4.setPrice(50);
+        ticketMa3.setPrice(100);
+        ticketMa4.showPrice();
+        ticketMa3.setPrice(100);
+        ticketMa3.showPrice();
+        ticketMa4.showPrice();
+        ticketMa3.printTicket();
+        ticketMa4.getPrice();
+        ticketMa3.getPrice();
+        ticketMa4.getPrompt();
+        
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+}