exercises complete

TicketMachine.java

@@ -9,7 +9,7 @@
  * @author David J. Barnes and Michael Kolling
  * @version 2008.03.30
  */
-public class TicketMachine
+class TicketMachine
 {
     // The price of a ticket from this machine.
     private int price;
@@ -17,19 +17,28 @@ public class TicketMachine
     private int balance;
     // The total amount of money collected by this machine.
     private int total;
+    private int status;
+
+    public class Student {
+
+    }
+
+    public class LabClass{
+
+    }
 
     /**
      * Create a machine that issues tickets of the given price.
      * Note that the price must be greater than zero, and there
      * are no checks to ensure this.
      */
-    public TicketMachine(int ticketCost)
+    public TicketMachine()
     {
-        price = ticketCost;
+        price = 1000;
         balance = 0;
         total = 0;
     }
-
+    
     /**
      * Return the price of a ticket.
      */
@@ -38,6 +47,25 @@ public class TicketMachine
         return price;
     }
 
+    public void setPrice(int ticketCost){
+        ticketCost = price;
+    }
+
+    public void discount(int amount){
+        amount = price - amount;
+
+    }
+    
+    public void prompt(){
+        System.out.println("Please insert correct amount of money");
+
+    }    
+    
+    public void showPrice(){
+        System.out.println("The price of the ticket is " + price + " cents");
+
+    }
+
     /**
      * Return the amount of money already inserted for the
      * next ticket.
@@ -47,6 +75,10 @@ public class TicketMachine
         return balance;
     }
 
+    public int getTotal() {
+        return total;
+    }
+
     /**
      * Receive an amount of money in cents from a customer.
      */
@@ -54,7 +86,9 @@ public class TicketMachine
     {
         balance = balance + amount;
     }
-
+    public void empty(){
+        total = 0;
+    }
     /**
      * Print a ticket.
      * Update the total collected and
@@ -67,6 +101,8 @@ public class TicketMachine
         System.out.println("# The BlueJ Line");
         System.out.println("# Ticket");
         System.out.println("# " + price + " cents.");
+        System.out.println("# " + "price" + " cents."); 
+        System.out.println("#   price  cents."); 
         System.out.println("##################");
         System.out.println();
 

TicketMachineTest.java

@@ -1,51 +0,0 @@
-
-
-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
-{
-    /**
-     * Default constructor for test class TicketMachineTest
-     */
-    public TicketMachineTest()
-    {
-    }
-
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
-    @Before
-    public void setUp()
-    {
-    }
-
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @After
-    public void tearDown()
-    {
-    }
-
-    @Test
-    public void testTicket()
-    {
-        TicketMachine ticketMa1 = new TicketMachine(50505);
-        ticketMa1.insertMoney(699605);
-        assertEquals(0, ticketMa1.toString());
-    }
-}
-