Skip to content

Commit d1554e7

Browse files
jamesrcountsjamesrcounts
committed
Fixup merge
1 parent 643f66a commit d1554e7

14 files changed

+28
-9
lines changed

‎src/jars/commons-collections-3.1.jar‎

-546 KB
Binary file not shown.

‎src/jars/log4j-1.2.9.jar‎

-344 KB
Binary file not shown.

‎src/jars/servlet.jar‎

-77.4 KB
Binary file not shown.

‎src/jars/velocity-1.4-p1.jar‎

-352 KB
Binary file not shown.

src/org/teachingkidsprogramming/recipes/completed/SimplePuzzle.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/SimplePuzzle.java

File renamed without changes.

‎src/test/java/org/teachingextensions/logo/tests/RecipeTests.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import org.teachingextensions.approvals.lite.Approvals;
99
import org.teachingextensions.approvals.lite.reporters.DelayedClipboardReporter;
10-
import org.teachingextensions.approvals.lite.reporters.FileLauncherReporter;
10+
import org.teachingextensions.approvals.lite.reporters.DiffReporter;
1111
import org.teachingextensions.approvals.lite.reporters.UseReporter;
1212
import org.teachingextensions.logo.PenColors;
1313
import org.teachingextensions.logo.Turtle;
1414
import org.teachingextensions.logo.Wheel;
1515

16-
@UseReporter({FileLauncherReporter.class, DelayedClipboardReporter.class})
16+
@UseReporter({DiffReporter.class, DelayedClipboardReporter.class})
1717
public class RecipeTests extends TestCase
1818
{
1919
public void testSimpleSquare() throws Exception
@@ -104,7 +104,10 @@ private void drawOctogon(Turtle turtle, Wheel<Color> palette)
104104
}
105105
private Wheel<Color> setupColors()
106106
{
107-
Color[] colors = {PenColors.Reds.Red, PenColors.Oranges.DarkOrange, PenColors.Yellows.Gold, PenColors.Yellows.Yellow};
107+
Color[] colors = {PenColors.Reds.Red,
108+
PenColors.Oranges.DarkOrange,
109+
PenColors.Yellows.Gold,
110+
PenColors.Yellows.Yellow};
108111
Wheel<Color> wheel = new Wheel<Color>();
109112
wheel.add(colors[0]);
110113
wheel.add(colors[1]);
@@ -146,8 +149,8 @@ public void testKnottedRing() throws Exception
146149
Turtle turtle = new Turtle();
147150
turtle.setSpeed(Turtle.TEST_SPEED);
148151
Wheel<Color> wheel = new Wheel<Color>(PenColors.Pinks.HotPink, PenColors.Reds.Red, PenColors.Purples.Fuchsia,
149-
PenColors.Oranges.OrangeRed, PenColors.Pinks.DeepPink, PenColors.Pinks.MediumVioletRed, PenColors.Reds.Crimson,
150-
PenColors.Oranges.Tomato);
152+
PenColors.Oranges.OrangeRed, PenColors.Pinks.DeepPink, PenColors.Pinks.MediumVioletRed,
153+
PenColors.Reds.Crimson, PenColors.Oranges.Tomato);
151154
for (int i = 0; i < 30; i++)
152155
{
153156
turtle.setPenColor(wheel.next());

‎src/test/java/org/teachingkidsprogramming/recipes/quizzes/tests/AdLibsQuizTest.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import junit.framework.TestCase;
44

55
import org.teachingextensions.approvals.lite.reporters.DelayedClipboardReporter;
6-
import org.teachingextensions.approvals.lite.reporters.FileLauncherReporter;
6+
import org.teachingextensions.approvals.lite.reporters.DiffReporter;
77
import org.teachingextensions.approvals.lite.reporters.UseReporter;
88
import org.teachingextensions.logo.Turtle;
99
import org.teachingextensions.logo.utils.TortoiseUtils;
@@ -12,26 +12,30 @@
1212
import org.teachingkidsprogramming.recipes.quizzes.graders.AdLibsQuizGrader;
1313
import org.teachingkidsprogramming.recipes.quizzes.graders.TreeQuizGrader;
1414

15-
@UseReporter({DelayedClipboardReporter.class, FileLauncherReporter.class})
15+
@UseReporter({DelayedClipboardReporter.class, DiffReporter.class})
1616
public class AdLibsQuizTest extends TestCase
1717
{
1818
public static class AdLibsCorrectQuiz extends AdLibsQuizAdapter
1919
{
20+
@Override
2021
public void question1(String letter1, String letter3)
2122
{
2223
//set current value of word1 to be letter1 + 'o' + letter3
2324
word1 = letter1 + "o" + letter3;
2425
}
26+
@Override
2527
public void question2(String letter1)
2628
{
2729
//add the letter1 to the end of word2
2830
word2 += letter1;
2931
}
32+
@Override
3033
public void question3(String templateText, Object model)
3134
{
3235
//use the parser to combine the template and the model as word3
3336
word3 = Parser.parse(templateText, model);
3437
}
38+
@Override
3539
public void question4(Pieces pieces)
3640
{
3741
//set template4 to the template which does'g' + pieces.middle + 'e'
@@ -46,15 +50,19 @@ public void testCorrect() throws Exception
4650
}
4751
public static class AdLibsIncorrectQuiz extends AdLibsQuizAdapter
4852
{
53+
@Override
4954
public void question1(String letter1, String letter3)
5055
{
5156
}
57+
@Override
5258
public void question2(String letter1)
5359
{
5460
}
61+
@Override
5562
public void question3(String templateText, Object model)
5663
{
5764
}
65+
@Override
5866
public void question4(Pieces pieces)
5967
{
6068
}

‎src/test/java/org/teachingkidsprogramming/recipes/quizzes/tests/AdLibsQuizTest.testCorrect.Mac_OS_X.approved.png‎

251 Bytes
Loading

‎src/test/java/org/teachingkidsprogramming/recipes/quizzes/tests/AdLibsQuizTest.testIncorrect.Mac_OS_X.approved.png‎

119 Bytes
Loading

‎src/test/java/org/teachingkidsprogramming/recipes/quizzes/tests/SimpleBubbleQuizTest.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import junit.framework.TestCase;
44

55
import org.teachingextensions.approvals.lite.reporters.DelayedClipboardReporter;
6-
import org.teachingextensions.approvals.lite.reporters.FileLauncherReporter;
6+
import org.teachingextensions.approvals.lite.reporters.DiffReporter;
77
import org.teachingextensions.approvals.lite.reporters.UseReporter;
88
import org.teachingextensions.logo.Turtle;
99
import org.teachingextensions.logo.utils.TortoiseUtils;
@@ -12,26 +12,30 @@
1212
import org.teachingkidsprogramming.recipes.quizzes.graders.AdLibsQuizGrader;
1313
import org.teachingkidsprogramming.recipes.quizzes.graders.TreeQuizGrader;
1414

15-
@UseReporter({DelayedClipboardReporter.class, FileLauncherReporter.class})
15+
@UseReporter({DelayedClipboardReporter.class, DiffReporter.class})
1616
public class SimpleBubbleQuizTest extends TestCase
1717
{
1818
public static class AdLibsCorrectQuiz extends AdLibsQuizAdapter
1919
{
20+
@Override
2021
public void question1(String letter1, String letter3)
2122
{
2223
//set current value of word1 to be letter1 + 'o' + letter3
2324
word1 = letter1 + "o" + letter3;
2425
}
26+
@Override
2527
public void question2(String letter1)
2628
{
2729
//add the letter1 to the end of word2
2830
word2 += letter1;
2931
}
32+
@Override
3033
public void question3(String templateText, Object model)
3134
{
3235
//use the parser to combine the template and the model as word3
3336
word3 = Parser.parse(templateText, model);
3437
}
38+
@Override
3539
public void question4(Pieces pieces)
3640
{
3741
//set template4 to the template which does'g' + pieces.middle + 'e'
@@ -46,15 +50,19 @@ public void testCorrect() throws Exception
4650
}
4751
public static class AdLibsIncorrectQuiz extends AdLibsQuizAdapter
4852
{
53+
@Override
4954
public void question1(String letter1, String letter3)
5055
{
5156
}
57+
@Override
5258
public void question2(String letter1)
5359
{
5460
}
61+
@Override
5562
public void question3(String templateText, Object model)
5663
{
5764
}
65+
@Override
5866
public void question4(Pieces pieces)
5967
{
6068
}

0 commit comments

Comments
 (0)