radians and degrees methods combined into one class

ScientificDegrees.java

@@ -1,76 +0,0 @@
-
-/**
- * Write a description of class ScientificDegrees here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class ScientificDegrees
-{
-    // instance variables - replace the example below with your own
-    private int x;
-
-    /**
-     * Constructor for objects of class ScientificDegrees
-     */
-    public ScientificDegrees()
-    {
-        // initialise instance variables
-        x = 0;
-    }
-
-    public static double sine(double angle)
-    {
-        
-
-        return Math.sin(angle) ;
-    }
-
-    public static double cosine(double angle)
-    {
-        
-
-        return Math.cos(angle) ;
-    }
-
-    public static double tangent(double angle)
-    {
-        
-
-        return Math.tan(angle) ;
-    }
-
-    public static double inverseSin(double angle)
-    {   
-
-        return Math.asin(angle) ;
-
-    }
-
-    public static double inverseCosine(double angle)
-    {
-        
-
-        return Math.acos(angle) ;
-    }
-
-    public static double inverseTangent(double angle)
-    {
-        
-
-        return Math.atan(angle) ;
-    }
-
-    /*public static BigInteger factorial(double number) {
-        double result = double.ValueOf(1);
-
-        for (double factor = 2; factor <= number.longValue(); factor++) {
-            result = result.multiply(double.valueOf(factor));
-        }
-
-        return result;
-    }*/
-}
-
-
-

ScientificDegreesTest.java

@@ -1,47 +0,0 @@
-
-
-import static org.junit.Assert.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-/**
- * The test class ScientificDegreesTest.
- *
- * @author  (your name)
- * @version (a version number or a date)
- */
-public class ScientificDegreesTest
-{
-    private Scientific test;
-    public ScientificDegreesTest(){
-    }
-
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
-    @Before
-    public void setUp()
-    {
-        Scientific test = new Scientific();
-    }
-
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @Test
-    public void testSine()
-    {
-        //expected
-        double expected = 1.0;
-        //actual
-        
-        double actual = test.sine(90.0,0);
-        //assertion
-        assertEquals(expected, actual, 0.1);
-    }
-    }
-

ScientificTest.java

@@ -34,14 +34,23 @@ public class ScientificTest
      * Called after every test case method.
      */
     @Test
-    public void testSine()
+    public void testSineDegrees()
     {
         //expected
-        double expected = 0.8;
+        double expected = 1.0;
         //actual
-        
-        double actual = Math.toRadians(90);
-        double actualSine = test.sine(actual);
+
+        double actualSine = test.sine(90.0,0);
+        //assertion
+        assertEquals(expected, actualSine, 0.1);
+    }
+    @Test
+    public void testSineRadians()
+    {
+        //expected
+        double expected = 0.5;
+        //actual
+        double actualSine = test.sine(0.52359877559,1);
         //assertion
         assertEquals(expected, actualSine, 0.1);
     }

package.bluej

@@ -8,7 +8,7 @@ dependency10.type=UsesDependency
 dependency11.from=Calculator
 dependency11.to=Scientific
 dependency11.type=UsesDependency
-dependency12.from=ScientificDegreesTest
+dependency12.from=ScientificTest
 dependency12.to=Scientific
 dependency12.type=UsesDependency
 dependency2.from=MainApplication
@@ -50,7 +50,7 @@ package.editor.y=70
 package.frame.height=759
 package.frame.width=1160
 package.numDependencies=12
-package.numTargets=17
+package.numTargets=15
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -60,127 +60,113 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=ScientificDegrees
+target1.name=ScientificTest
 target1.showInterface=false
-target1.type=ClassTarget
-target1.width=140
-target1.x=780
-target1.y=270
+target1.type=UnitTestTargetJunit4
+target1.width=80
+target1.x=810
+target1.y=230
+target10.association=ConversionTest
 target10.height=50
-target10.name=CoreTest
+target10.name=DisplayMode
 target10.showInterface=false
-target10.type=UnitTestTargetJunit4
-target10.width=80
-target10.x=740
-target10.y=20
+target10.type=ClassTarget
+target10.width=110
+target10.x=180
+target10.y=390
 target11.height=50
-target11.name=MemoryTest
+target11.name=Calculator
 target11.showInterface=false
-target11.type=UnitTestTargetJunit4
-target11.width=80
-target11.x=140
-target11.y=230
-target12.association=ConversionTest
+target11.type=ClassTarget
+target11.width=90
+target11.x=510
+target11.y=180
 target12.height=50
-target12.name=DisplayMode
+target12.name=Console
 target12.showInterface=false
 target12.type=ClassTarget
-target12.width=110
-target12.x=110
-target12.y=380
+target12.width=80
+target12.x=450
+target12.y=470
 target13.height=50
-target13.name=Calculator
+target13.name=MainApplication
 target13.showInterface=false
 target13.type=ClassTarget
-target13.width=90
-target13.x=440
-target13.y=170
+target13.width=120
+target13.x=370
+target13.y=60
+target14.association=CoreTest
 target14.height=50
-target14.name=Console
+target14.name=Core
 target14.showInterface=false
 target14.type=ClassTarget
 target14.width=80
-target14.x=380
-target14.y=460
+target14.x=780
+target14.y=130
+target15.association=DisplayTest
 target15.height=50
-target15.name=MainApplication
+target15.name=Display
 target15.showInterface=false
 target15.type=ClassTarget
-target15.width=120
-target15.x=300
-target15.y=50
-target16.association=CoreTest
-target16.height=50
-target16.name=Core
-target16.showInterface=false
-target16.type=ClassTarget
-target16.width=80
-target16.x=710
-target16.y=50
-target17.association=DisplayTest
-target17.height=50
-target17.name=Display
-target17.showInterface=false
-target17.type=ClassTarget
-target17.width=80
-target17.x=30
-target17.y=120
+target15.width=80
+target15.x=100
+target15.y=130
+target2.association=MemoryTest
 target2.height=50
-target2.name=ScientificTest
+target2.name=Memory
 target2.showInterface=false
-target2.type=UnitTestTargetJunit4
+target2.type=ClassTarget
 target2.width=80
-target2.x=740
-target2.y=140
+target2.x=180
+target2.y=260
+target3.association=ScientificTest
 target3.height=50
-target3.name=ScientificDegreesTest
+target3.name=Scientific
 target3.showInterface=false
-target3.type=UnitTestTargetJunit4
-target3.width=160
-target3.x=800
-target3.y=240
-target4.association=MemoryTest
+target3.type=ClassTarget
+target3.width=80
+target3.x=780
+target3.y=260
 target4.height=50
-target4.name=Memory
+target4.name=CustomTest
 target4.showInterface=false
-target4.type=ClassTarget
+target4.type=UnitTestTargetJunit4
 target4.width=80
-target4.x=110
-target4.y=260
-target5.association=ScientificTest
+target4.x=810
+target4.y=360
+target5.association=CustomTest
 target5.height=50
-target5.name=Scientific
+target5.name=Custom
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=80
-target5.x=710
-target5.y=170
+target5.x=780
+target5.y=390
 target6.height=50
-target6.name=CustomTest
+target6.name=ConversionTest
 target6.showInterface=false
 target6.type=UnitTestTargetJunit4
-target6.width=80
-target6.x=740
-target6.y=350
-target7.association=CustomTest
+target6.width=110
+target6.x=210
+target6.y=360
 target7.height=50
-target7.name=Custom
+target7.name=DisplayTest
 target7.showInterface=false
-target7.type=ClassTarget
+target7.type=UnitTestTargetJunit4
 target7.width=80
-target7.x=710
-target7.y=380
+target7.x=130
+target7.y=100
 target8.height=50
-target8.name=ConversionTest
+target8.name=CoreTest
 target8.showInterface=false
 target8.type=UnitTestTargetJunit4
-target8.width=110
-target8.x=140
-target8.y=350
+target8.width=80
+target8.x=810
+target8.y=100
 target9.height=50
-target9.name=DisplayTest
+target9.name=MemoryTest
 target9.showInterface=false
 target9.type=UnitTestTargetJunit4
 target9.width=80
-target9.x=60
-target9.y=90
+target9.x=210
+target9.y=230