added deg and rad tests, added fortune method, deleted old comments

Calculator.java

@@ -1,4 +1,3 @@
-
 import java.util.*;
 class Calculator{
     public static void main(String args[]){
@@ -119,6 +118,9 @@ class Calculator{
                     memory = result;
                     calc.printAns(String.valueOf(result));
                     break;
+                    
+                    case "fortune cookie":
+                    
                 }
             }
 

MathMethods.java

@@ -70,10 +70,13 @@ public class MathMethods
     }
 
     public static String fortuneCookie() {
-     String[] wiseWords = new String[] {"You're a hard worker and you will do great on all the labs!", 
-         "Look how much java you learned this week! That's awesome!", "Keep up the good Work" ,
-        "Don't forget to talk to our visitors, they give us jobs!"};  
-        return "";
+     Random rand = new Random();
+        String[] wiseWords = new String[] {"You're a hard worker and you will do great on all the labs!", 
+         "Look how much java you learned this week! That's awesome!", "Keep up the good work!" ,
+        "You're cushing it!", "You're a coding rockstar!", 
+        "Keep coding!"};  
+        int arrIndex = rand.nextInt(6)+1;
+        return wiseWords[arrIndex];
     }
     
     public static void printAns(String printAnswer){
@@ -87,47 +90,4 @@ public class MathMethods
     
     
     
-    
-// public static double squareRoot(double n1) {
-// double result = Math.sqrt(x);
-// return result;
-// }
-
-// public static double invert(double n1) {
-// double result = x*-1;
-// return result;
-// }
-
-// public static double sin(double n1){
-// double result = Math.sin(x);
-// return result;
-// }
-
-// public static double iSin(double n1){
-// double result = Math.asin(x);
-// return result;
-// }
-
-// public static double degToRad(double n1) {
-// double result = Math.toRadians(x);
-// return result;
-// }
-
-// public static double radToDeg(double n1) {
-// double result = Math.toDegrees(x);
-// return result;
-// }
-
-// public static Double exponent(double n1, double n2){
-// return (Math.pow(n1, n2));
-// }
-
-// public static Double cosine(double n1){
-// return (Math.cos(n1));
-// }
-
-// public static Double invCosine(double n1){
-// return (Math.acos(n1));
-// }
-
-
+ 

MathMethodsTest.java

@@ -63,8 +63,25 @@ public class MathMethodsTest
     {
         assertEquals(-0.26237485370392877, MathMethods.sin(50), 0.1);
     }
+
+    @Test
+    public void testDegToRad()
+    {
+        assertEquals(0.3490658503988659, MathMethods.degToRad(20), 0.1);
+    }
+
+    @Test
+    public void testRadToDeg()
+    {
+        assertEquals(57.2957791308232, MathMethods.radToDeg(1), 0.1);
+    }
+
+    
 }
 
 
 
 
+
+
+

package.bluej

@@ -5,18 +5,18 @@ dependency1.type=UsesDependency
 dependency2.from=MathMethodsTest
 dependency2.to=MathMethods
 dependency2.type=UsesDependency
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=615
+editor.fx.0.y=114
 objectbench.height=80
 objectbench.width=480
 package.divider.horizontal=0.5997536945812808
 package.divider.vertical=0.8838451268357811
 package.editor.height=655
 package.editor.width=706
-package.editor.x=10
-package.editor.y=23
+package.editor.x=100
+package.editor.y=26
 package.frame.height=807
 package.frame.width=832
 package.numDependencies=2