commit

Scrabble.java

@@ -2,39 +2,39 @@ import java.io.*;
 
 class Scrabble
 {
-// A class to give you the scrabble score of a word
+    // A class to give you the scrabble score of a word
 
- public static void main(String[] args) throws IOException
- {
-  BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-  System.out.print("Enter a word: ");
-  String word=in.readLine();
-  System.out.println("Scrabble score is: "+score(word));
- }
+    public static void main(String[] args) throws IOException
+    {
+        BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+        System.out.print("Enter a word: ");
+        String word=in.readLine();
+        System.out.println("Scrabble score is: "+score(word));
+    }
 
- public static int score(String word)
- {
-  String uword=word.toUpperCase();
-  int score=0;
-  for(int i=0;i<uword.length();i++)
-     switch(uword.charAt(i))
-       {
-        case 'Q': case 'Z':
-          score+=10; break;
-        case 'J': case 'X':
-          score+=8; break;
-        case 'K':
-          score+=5; break;
-        case 'F': case 'H': case 'V': case 'W': case 'Y':
-          score+=4; break;
-        case 'B': case 'C': case 'M': case 'P':
-          score+=3; break;
-        case 'D': case 'G':
-          score+=2;break;
-        default:
-          score+=1;break;
-      } 
-  return score;
- }
+    public static int score(String word)
+    {
+        String uword=word.toUpperCase();
+        int score=0;
+        for(int i=0;i<uword.length();i++)
+            switch(uword.charAt(i))
+            {
+                case 'Q': case 'Z':
+                score+=10; break;
+                case 'J': case 'X':
+                score+=8; break;
+                case 'K':
+                score+=5; break;
+                case 'F': case 'H': case 'V': case 'W': case 'Y':
+                score+=4; break;
+                case 'B': case 'C': case 'M': case 'P':
+                score+=3; break;
+                case 'D': case 'G':
+                score+=2;break;
+                default:
+                score+=1;break;
+            } 
+        return score;
+    }
 
 }

ScrabbleTest.java

@@ -0,0 +1,62 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import java.io.*;
+
+/**
+ * The test class ScrabbleTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class ScrabbleTest
+{
+    Scrabble scrabble;
+    /**
+     * Default constructor for test class ScrabbleTest
+     */
+    public ScrabbleTest()
+    {
+        
+    }
+    
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+        scrabble = new Scrabble();
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+    
+    @Test
+    public void score(){
+        //Given, When, Then 
+        
+       int expected = 9;
+        
+       String word;
+       word = "worm";
+
+       int actual = scrabble.score(word);
+       
+        assertEquals(expected, actual);
+
+    }
+}

Squares.java

@@ -4,10 +4,10 @@ class Squares
 
  static final int LIMIT=150;
 
- public void display(int limit)
+ public void display(int LIMIT)
  {
   int i;
-  for(i=1;i*i<limit;i++)
+  for(i=1;i*i<LIMIT;i++)
      {
       System.out.print("The square of "+i);
       System.out.println(" is "+i*i);

TriangleTwoTest.java

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

package.bluej

@@ -1,26 +1,44 @@
 #BlueJ package file
-dependency1.from=Account
-dependency1.to=AccountException
+dependency1.from=Calendar1
+dependency1.to=CalendarGraphic
 dependency1.type=UsesDependency
-dependency2.from=DepositAccount
-dependency2.to=AccountException
+dependency2.from=Calendar1
+dependency2.to=DateException
 dependency2.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=114
-editor.fx.0.y=175
+dependency3.from=Account
+dependency3.to=AccountException
+dependency3.type=UsesDependency
+dependency4.from=Calendar
+dependency4.to=DateException
+dependency4.type=UsesDependency
+dependency5.from=Date
+dependency5.to=DateException
+dependency5.type=UsesDependency
+dependency6.from=DepositAccount
+dependency6.to=AccountException
+dependency6.type=UsesDependency
+dependency7.from=ScrabbleTest
+dependency7.to=Scrabble
+dependency7.type=UsesDependency
+dependency8.from=TriangleTwoTest
+dependency8.to=TriangleTwo
+dependency8.type=UsesDependency
+editor.fx.0.height=667
+editor.fx.0.width=870
+editor.fx.0.x=267
+editor.fx.0.y=23
 objectbench.height=101
-objectbench.width=461
+objectbench.width=776
 package.divider.horizontal=0.6
 package.divider.vertical=0.8007380073800738
 package.editor.height=427
 package.editor.width=674
-package.editor.x=1006
-package.editor.y=133
+package.editor.x=134
+package.editor.y=31
 package.frame.height=600
 package.frame.width=800
-package.numDependencies=2
-package.numTargets=13
+package.numDependencies=8
+package.numTargets=15
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -37,40 +55,56 @@ target1.width=130
 target1.x=450
 target1.y=190
 target10.height=50
-target10.name=Scrabble
+target10.name=ScrabbleTest
 target10.showInterface=false
-target10.type=ClassTarget
+target10.type=UnitTestTargetJunit4
 target10.width=80
-target10.x=10
-target10.y=250
+target10.x=40
+target10.y=220
+target11.association=ScrabbleTest
 target11.height=50
-target11.name=TriangleTwo
+target11.name=Scrabble
 target11.showInterface=false
 target11.type=ClassTarget
-target11.width=100
-target11.x=120
-target11.y=310
+target11.width=80
+target11.x=10
+target11.y=250
 target12.height=50
-target12.name=AccountException
+target12.name=DepositAccount
 target12.showInterface=false
 target12.type=ClassTarget
-target12.width=140
-target12.x=190
-target12.y=30
+target12.width=120
+target12.x=170
+target12.y=120
+target13.association=TriangleTwoTest
 target13.height=50
-target13.name=DateException
+target13.name=TriangleTwo
 target13.showInterface=false
 target13.type=ClassTarget
-target13.width=120
-target13.x=470
-target13.y=340
+target13.width=100
+target13.x=120
+target13.y=310
+target14.height=50
+target14.name=AccountException
+target14.showInterface=false
+target14.type=ClassTarget
+target14.width=140
+target14.x=190
+target14.y=30
+target15.height=50
+target15.name=DateException
+target15.showInterface=false
+target15.type=ClassTarget
+target15.width=120
+target15.x=470
+target15.y=340
 target2.height=50
-target2.name=Account
+target2.name=TriangleTwoTest
 target2.showInterface=false
-target2.type=ClassTarget
-target2.width=80
-target2.x=50
-target2.y=110
+target2.type=UnitTestTargetJunit4
+target2.width=100
+target2.x=150
+target2.y=280
 target3.height=50
 target3.name=Calendar1
 target3.showInterface=false
@@ -79,44 +113,44 @@ target3.width=90
 target3.x=330
 target3.y=220
 target4.height=50
-target4.name=Squares
+target4.name=Account
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=80
-target4.x=100
-target4.y=250
+target4.x=50
+target4.y=110
 target5.height=50
-target5.name=Calendar
+target5.name=Squares
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=80
-target5.x=490
-target5.y=270
+target5.x=100
+target5.y=250
 target6.height=50
-target6.name=TriangleOne
+target6.name=Calendar
 target6.showInterface=false
 target6.type=ClassTarget
-target6.width=100
-target6.x=10
-target6.y=310
+target6.width=80
+target6.x=490
+target6.y=270
 target7.height=50
-target7.name=TextIO
+target7.name=TriangleOne
 target7.showInterface=false
 target7.type=ClassTarget
-target7.width=80
-target7.x=490
-target7.y=40
+target7.width=100
+target7.x=10
+target7.y=310
 target8.height=50
-target8.name=Date
+target8.name=TextIO
 target8.showInterface=false
 target8.type=ClassTarget
 target8.width=80
-target8.x=350
-target8.y=290
+target8.x=490
+target8.y=40
 target9.height=50
-target9.name=DepositAccount
+target9.name=Date
 target9.showInterface=false
 target9.type=ClassTarget
-target9.width=120
-target9.x=170
-target9.y=120
+target9.width=80
+target9.x=350
+target9.y=290