Console.java

@@ -1,32 +1,72 @@
- 
-
-import java.util.Scanner;
-
+import java.lang.Math;
+import java.util.*;
 /**
  * Created by leon on 2/9/18.
  */
-public class Console {
-
-    public static void print(String output, Object... args) {
-        System.out.printf(output, args);
-    }
-
-    public static void println(String output, Object... args) {
-        print(output + "\n", args);
-    }
-
-    public static String getStringInput(String prompt) {
-        Scanner scanner = new Scanner(System.in);
-        println(prompt);
-        String userInput = scanner.nextLine();
-        return userInput;
-    }
-
-    public static Integer getIntegerInput(String prompt) {
-        return null;
-    }
-
-    public static Double getDoubleInput(String prompt) {
-        return null;
+public class Console {    
+    public static void main(String[] args){
+        boolean run = true;                
+        double x = 0;
+        double y = 0;
+        double answer = 0.0;        
+        Scanner scanObject = new Scanner(System.in);
+   
+        while (run) {
+                System.out.println("Enter A number: ");
+                x = scanObject.nextDouble();
+                System.out.println("Enter An operation? Choose one below.");
+                System.out.println("( sin ) ( cos ) ( tan ) ( asin ) ( acos ) ( atan ) ( sqrt ) ");
+                System.out.println("( + ) ( - ) ( * ) ( / ) ( ^ )");
+                String operator = scanObject.next();//.charAt(0);
+                String s = "";  
+                if (operator.equals("sin") || operator.equals("asin") || operator.equals("cos") || operator.equals("acos") || operator.equals("tan") || operator.equals("atan") || operator.equals("sqrt")) {
+                        switch (operator){
+                            case "sin": answer = Math.toDegrees(Math.sin(x));
+                                break;
+                            case "asin": answer = Math.toDegrees(Math.asin(x));
+                                break;                    
+                            case "cos": answer = Math.toDegrees(Math.cos(x));
+                                break;
+                            case "acos": answer = Math.toDegrees(Math.acos(x));
+                                break;                    
+                            case "tan": answer = Math.toDegrees(Math.tan(x));
+                                break;
+                            case "atan": answer = Math.toDegrees(Math.atan(x));
+                                break;
+                            case "sqrt": answer = Math.toDegrees(Math.sqrt(x));
+                                break;                                
+                       //case "!": answer = factorial(x);
+                           //break;                                
+                        }            
+                            System.out.println(Math.toRadians(answer));
+                            continue;
+               } else                         
+                
+                   
+                System.out.println("Enter A second number: ");
+                y = scanObject.nextDouble();
+                s = scanObject.nextLine();
+            
+                switch (operator) {
+                       case "+": answer = x + y;
+                           break;
+                       case "-": answer = x - y;
+                           break;
+                       case "*": answer = x * y;
+                           break;
+                       case "/": answer = x/y;
+                           break;
+                       case "^": answer = Math.pow (x,y);
+                           break;
+                           
+                }        
+                   System.out.println(x + " " + operator + " " + y + " = " + answer);
+                   System.out.println("Continue or Quit");
+                   s = scanObject.nextLine();
+                   if (s.equalsIgnoreCase("Quit")){
+                       System.out.println("Have A good day!! :) ");
+                       break;
+                    }
+        }
     }
 }

ConsoleTest.java

@@ -0,0 +1,48 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class ConsoleTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class ConsoleTest
+{
+    /**
+     * Default constructor for test class ConsoleTest
+     */
+    public ConsoleTest()
+    {
+    }
+
+    /**
+     * 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 Calculator()
+    {
+    }
+}
+

MainApplication.java

@@ -2,7 +2,7 @@
 
 /**
  * Created by leon on 2/9/18.
- */
+ 
 public class MainApplication {
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
@@ -14,4 +14,4 @@ public class MainApplication {
         Console.println("The user input %s as a integer", i);
         Console.println("The user input %s as a d", d);
     }
-}
+}*/

MainApplicationTest.java

@@ -0,0 +1,42 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class MainApplicationTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class MainApplicationTest
+{
+    /**
+     * Default constructor for test class MainApplicationTest
+     */
+    public MainApplicationTest()
+    {
+    }
+
+    /**
+     * 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()
+    {
+    }
+}

operator.java

@@ -0,0 +1,20 @@
+
+/**
+ * Write a description of class operator here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class operator
+{
+
+
+
+    public operator()
+    {
+        // initialise instance variables
+    
+    }
+
+
+}

package.bluej

@@ -2,22 +2,22 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
-editor.fx.0.y=23
+editor.fx.0.height=850
+editor.fx.0.width=1142
+editor.fx.0.x=568
+editor.fx.0.y=-936
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
 package.divider.vertical=0.6847360912981455
 package.editor.height=473
 package.editor.width=493
-package.editor.x=35
-package.editor.y=60
+package.editor.x=-109
+package.editor.y=-994
 package.frame.height=759
 package.frame.width=619
 package.numDependencies=1
-package.numTargets=2
+package.numTargets=5
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +27,39 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=MainApplicationTest
 target1.showInterface=false
-target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.type=UnitTestTargetJunit4
+target1.width=120
+target1.x=110
+target1.y=40
+target2.association=ConsoleTest
 target2.height=50
-target2.name=MainApplication
+target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=80
+target2.x=80
+target2.y=200
+target3.height=50
+target3.name=ConsoleTest
+target3.showInterface=false
+target3.type=UnitTestTargetJunit4
+target3.width=80
+target3.x=110
+target3.y=170
+target4.height=50
+target4.name=operator
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=80
+target4.x=240
+target4.y=110
+target5.association=MainApplicationTest
+target5.height=50
+target5.name=MainApplication
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=120
+target5.x=80
+target5.y=70