Completed the lab & all test pass

WriteIFs.java

@@ -12,7 +12,17 @@ public class WriteIFs
    int tt_s;
    int oo1, oo2;
    String ss;
-
+   
+   public WriteIFs()
+  {
+      // initialise instance variables
+      x = 0;
+      tt_t = 0;
+      tt_s = 1;
+      ss = "";
+      oo1 = 61;
+      oo2 = 49;
+  }
  
     public void playerDied(boolean player1) {
         // Write an IF statement that checks “player1.isAlive()” 
@@ -40,7 +50,7 @@ public class WriteIFs
         // AND 
         // “insideTemp()” is less than 62, 
         // calls “startAFire(fireplace1)”
-        if(outsideTemp() < 50 && insideTemp() < 62){
+        if(outsideTemp() < 50 || insideTemp() < 62){
             startAFire(fireplace1);
         }
     }
@@ -70,16 +80,6 @@ public class WriteIFs
 
    * Constructor for objects of class WriteIFs
    */
-  public WriteIFs()
-  {
-      // initialise instance variables
-      x = 0;
-      tt_t = 0;
-      tt_s = 1;
-      ss = "";
-      oo1 = 61;
-      oo2 = 49;
-  }
 
     // associated routines
     public boolean isAlive(boolean p) {
@@ -94,7 +94,6 @@ public class WriteIFs
     private void coolOn() {
         this.ss = "cooling";
     }
- 
     private int insideTemp() {
         return oo1;
     }

WriteIFsTest.java

@@ -54,7 +54,7 @@ public class WriteIFsTest
     {
         WriteIFs writeIFs1 = new WriteIFs();
         writeIFs1.playerDied(true);
-        assertEquals("Game Over!", writeIFs1);
+        assertEquals("Game Over!", writeIFs1.ss);
     }
 
 
@@ -75,14 +75,14 @@ public class WriteIFsTest
     {
         WriteIFs writeIFs1 = new WriteIFs();
         writeIFs1.checkFuel(_0_5);
-        assertEquals(0, writeIFs1);
+        assertEquals(0, writeIFs1.x);
     }
     @Test
     public void TestCheckFuel2()
     {
         WriteIFs writeIFs1 = new WriteIFs();
         writeIFs1.checkFuel(_0_04);
-        assertEquals(99, writeIFs1);
+        assertEquals(99, writeIFs1.x);
     }
     @Test
     public void TestFireControl()

WriteLoops.java

@@ -70,8 +70,8 @@ public class WriteLoops {
 
         // Write a FOR loop from 0 to 32 by 2s.
         // calling
-        for(int i = 0; i <= 17; i +=2){
-            w = w + 0;
+        for(int i = 0; i <= 32; i +=2){
+            w = w + 1;
         }
         // each time through the loop
         return w;

WriteLoopsTest.java

@@ -71,7 +71,7 @@ public class WriteLoopsTest
     public void Test2to32()
     {
         WriteLoops writeLoo1 = new WriteLoops();
-        assertEquals(0, writeLoo1.byTwoTo32());
+        assertEquals(17, writeLoo1.byTwoTo32());
     }
 
     @Test

package.bluej

@@ -6,19 +6,19 @@ dependency2.from=WriteIFsTest
 dependency2.to=WriteIFs
 dependency2.type=UsesDependency
 editor.fx.0.height=711
-editor.fx.0.width=829
-editor.fx.0.x=451
+editor.fx.0.width=800
+editor.fx.0.x=480
 editor.fx.0.y=23
 objectbench.height=91
-objectbench.width=720
+objectbench.width=455
 package.divider.horizontal=0.6
 package.divider.vertical=0.8499234303215927
 package.editor.height=548
-package.editor.width=618
+package.editor.width=353
 package.editor.x=0
 package.editor.y=23
 package.frame.height=711
-package.frame.width=744
+package.frame.width=479
 package.numDependencies=2
 package.numTargets=4
 package.showExtends=true