fixed quiz bugs w/Jim

Author: lynnlangit

TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar

@@ -9,8 +9,8 @@
 import org.teachingextensions.logo.Colors;
 import org.teachingextensions.logo.Paintable;
 import org.teachingextensions.logo.Tortoise;
-import org.teachingextensions.logo.Turtle;
 import org.teachingextensions.logo.Wheel;
+import org.teachingextensions.logo.Turtle;
 import org.teachingextensions.logo.utils.TortoiseUtils;
 
 import com.spun.util.NumberUtils;
@@ -75,7 +75,7 @@ private boolean grade3Lime()
   {
     ColorWheel.removeAllColors();
     quiz.question3();
-    return getSafeColor() == Colors.Greens.Lime;
+    return Colors.Greens.Lime.equals(getSafeColor());
   }
   public Color getSafeColor()
   {
@@ -85,14 +85,14 @@ public Color getSafeColor()
     }
     catch (Exception e)
     {
-      return null;
+      return Colors.Yellows.Yellow;
     }
   }
   private boolean grade4Red()
   {
     ColorWheel.removeAllColors();
     quiz.question4();
-    return getSafeColor() == Colors.Reds.Red;
+    return Colors.Reds.Red.equals(getSafeColor());
   }
   public void setColors()
   {

TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/PentagonCrazyQuizGrader.java

@@ -22,7 +22,7 @@ public void questions1To4()
     //   Question 3 
     //   setNinety (recipe below) 
     //   ------------- Recipe for setNinety 
-    //       sets the angle of the current turn to 90
+    //       set the current turn angle to 90, HINT: Use angles
     //   ------------- End of setNinety recipe
     //
     //   Question 4 

TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/TreeQuiz.java

@@ -1,5 +1,6 @@
 package org.teachingkidsprogramming.section06modelviewcontroller;
 
+import org.teachingextensions.simpleparser.Parser;
 import org.teachingkidsprogramming.recipes.quizzes.graders.AdLibsQuizAdapter;
 import org.teachingkidsprogramming.recipes.quizzes.graders.AdLibsQuizGrader;
 
@@ -8,18 +9,22 @@ public class AdLibsQuiz extends AdLibsQuizAdapter
   public void question1(String letter1, String letter3)
   {
     //set current value of word1 to be letter1 + 'o' + letter3
+    word1 = letter1 + 'o' + letter3;
   }
   public void question2(String letter1)
   {
     //add the letter1 to the end of word2 
+    word2 = word2 + letter1;
   }
   public void question3(String templateText, Object model)
   {
     //use the parser to combine the template and the model as word3
+    word3 = Parser.parse(templateText, model);
   }
   public void question4(Pieces pieces)
   {
     //set template4 to the template which does'g' + pieces.middle + 'e'
+    template4 = "g{middle}e";
   }
   public static void main(String[] args)
   {

TeachingKidsProgramming/src/org/teachingkidsprogramming/section06modelviewcontroller/AdLibsQuiz.java

@@ -42,9 +42,9 @@ public void twoTortoisesAgain() throws Exception
   public void twoTortoisesYetAgain() throws Exception
   {
     Tortoise rafael = new Tortoise();
-    Tortoise michealangelo = new Tortoise();
+    Tortoise michelangelo = new Tortoise();
     Tortoise anonymousNinja = ________;
-    boolean result = michealangelo.equals(anonymousNinja);
+    boolean result = michelangelo.equals(anonymousNinja);
     Assert.assertEquals(true, result);
   }
   //Turtle Leonardo belongs to "this" 
@@ -70,12 +70,12 @@ public void explodingTurtle() throws Exception
   @Test
   public void feedTheNinja() throws Exception
   {
-    Tortoise michealangelo = new Tortoise();
-    michealangelo.likesTopping(Topping.Pepperoni);
+    Tortoise michelangelo = new Tortoise();
+    michelangelo.likesTopping(Topping.Pepperoni);
     Pizza pizza = new Pizza();
     pizza.addTopping(_________);
-    boolean likedIt = michealangelo.eatPizza(pizza);
-    Assert.assertTrue("Michealangelo barfs! Wrong pizza!", likedIt);
+    boolean likedIt = michelangelo.eatPizza(pizza);
+    Assert.assertTrue("Michelangelo barfs! Wrong pizza!", likedIt);
   }
   @Test
   public void feedTheNinjaTwo() throws Exception

TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/DeepDive07Events.java

@@ -8,22 +8,27 @@ public ManyAnimals()
   }
   //Create a container to hold your turtles HINT: Use ArrayList --#2.1
   //Create a window to show your turtles HINT: Use MultiTurtlePanel --#1.1
+  //
   private void showSomeTurtles()
   {
     //Show your panel --#1.2
     //Set the size to 100 --#5.4
+    //
     //Add your three turtles HINT: FOR loop which 'does an action' --#2.2
     //Create your turtle --#2.4
     //Add your turtles to your turtle container --#2.5
     //Repeat --#2.2
+    //
     //Add your turtles to your window HINT: Use a foreach loop --#3.1
-    //Must call addTurtle BEFORE calling other methods --INFO
+    //HINT: Must call addTurtle BEFORE calling other methods --INFO
     //Add your turtles to your window --#3.3
     //Repeat --#3.2
+    //
     //Teleport your turtles around your window HINT: Use a FOR loop and ZERO --#4.1
     //Get your turtle's current position and then set the X position to i*100 + 350 --#4.3
     //Get your turtle's current position and then set the Y position to i*100 + 100 --#4.4
     //Repeat --#4.2
+    //
     //Set some values for your turtles HINT: Use a foreach loop --#5.1
     //Set the speed of your turtles to 7 --#5.3
     //Have every turtle draw a star of the current size --#5.4

TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/ManyAnimals.java

@@ -6,6 +6,11 @@
 public class SimpleBubbleQuiz extends SimpleBubbleQuizAdapter
 {
   //**THIS QUIZ IS IN PROGRESS
+  // Grader could listen for events
+  // students wire up events, then grader listens (draws)
+  // student must click for final reward FAIL-> PASS (toggle) 
+  // Tortoise on baseball diamond - click on first base, second base
+  // click order - change from fail to pass
   public void question1(String letter1, String letter3)
   {
     //set current value of word1 to be letter1 + 'o' + letter3
@@ -26,27 +31,4 @@ public static void main(String[] args)
   {
     new SimpleBubbleQuizGrader().grade(new SimpleBubbleQuiz());
   }
-  //this is the original quiz (from SmallBasic) - need to be translated to Java
-  //Variables needed for Quiz
-  //  action[1] = 15
-  //  ball = 1
-  //  BubbleQuiz.StartQuizAt = Question2
-  //--------------------Begin Quiz --------------------
-  //Question1 - Is At the bottom of this quiz. But do it 1st!
-  //  Sub Question2
-  // Set the 1st action to 5
-  //  EndSub
-  //  Sub Question3
-  //Have the timer call Move every 100 milliseconds
-  //  EndSub
-  //  Sub Question4
-  // Set the 2nd action to -6
-  //  EndSub
-  //  Sub Question5
-  //Change the color for the next circle to be yellow
-  //Make the current ball be a circle with a 11 pixel radius
-  //  EndSub
-  //Question1
-  //Create a subroutine called Move
-  // that calls Quiz.DoMovement()
 }