Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • dev
  • main
2 results

Target

Select target project
  • mast/teaching/se1/turtle-graphics
  • bba4495/turtle-graphics
2 results
Select Git revision
  • dev
  • main
2 results
Show changes
Commits on Source (2)
Show whitespace changes
Inline Side-by-side
Turtle.java
View file @ 9e6d9be0
...@@ -69,15 +69,6 @@ public class Turtle ...@@ -69,15 +69,6 @@ public class Turtle
FARBEN.put("magenta", Color.MAGENTA); FARBEN.put("magenta", Color.MAGENTA);
FARBEN.put("pink", Color.PINK); FARBEN.put("pink", Color.PINK);
FARBEN.put("gelb", Color.YELLOW); FARBEN.put("gelb", Color.YELLOW);
FARBEN.put("schwarz", Color.BLACK);
FARBEN.put("weiss", Color.WHITE);
FARBEN.put("cyan", Color.CYAN);
FARBEN.put("grau", Color.GRAY);
FARBEN.put("blau", Color.BLUE);
FARBEN.put("orange", Color.ORANGE);
FARBEN.put("gruen", Color.GREEN);
FARBEN.put("rot", Color.RED);
FARBEN.put("dunkelgrau", Color.DARK_GRAY);
FARB_ARRAY = FARBEN.values().toArray(new Color[FARBEN.size()]); FARB_ARRAY = FARBEN.values().toArray(new Color[FARBEN.size()]);
} }
...@@ -276,6 +267,22 @@ public class Turtle ...@@ -276,6 +267,22 @@ public class Turtle
} }
} }
} }
@Override
public String toString()
{
String farbreihenfolge = "";
for(Color c : FARB_ARRAY)
{
farbreihenfolge += c + ", ";
}
return farbreihenfolge;
}
public Color[] gibFarben()
{
return FARB_ARRAY;
}
} }
/** /**
......
TurtleTest.java 0 → 100644
View file @ 9e6d9be0
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.*;
import java.awt.*;
/**
* The test class TurtleTest.
*
* @author Volodymyr Biryuk
* @version 30. November 2023
*/
public class TurtleTest
{
private Turtle _turtle;
/**
* Default constructor for test class TurtleTest
*/
public TurtleTest()
{
}
/**
* Sets up the test fixture.
*
* Called before every test case method.
*/
@BeforeEach
public void setUp()
{
_turtle = new Turtle();
}
@Test
public void farbenTest()
{
Color[] expected =
{
Color.BLACK, Color.BLUE, Color.CYAN, Color.DARK_GRAY, Color.GRAY, Color.GREEN,
Color.LIGHT_GRAY, Color.MAGENTA, Color.PINK, Color.YELLOW
};
Color[] actual = _turtle.gibFarben();
assertEquals(expected.length, actual.length);
for(int i = 0; i < actual.length; i++)
{
Color actual_ = actual[i];
Color expected_ = expected[i];
assertEquals(expected_, actual_);
}
}
/**
* Tears down the test fixture.
*
* Called after every test case method.
*/
@AfterEach
public void tearDown()
{
}
}
bluej.pkg
View file @ 9e6d9be0
...@@ -2,22 +2,25 @@ ...@@ -2,22 +2,25 @@
dependency1.from=Dompteur dependency1.from=Dompteur
dependency1.to=Turtle dependency1.to=Turtle
dependency1.type=UsesDependency dependency1.type=UsesDependency
editor.fx.0.height=722 dependency2.from=TurtleTest
editor.fx.0.width=800 dependency2.to=Turtle
editor.fx.0.x=790 dependency2.type=UsesDependency
editor.fx.0.y=102 editor.fx.0.height=875
objectbench.height=102 editor.fx.0.width=1440
objectbench.width=461 editor.fx.0.x=0
editor.fx.0.y=25
objectbench.height=158
objectbench.width=413
package.divider.horizontal=0.6 package.divider.horizontal=0.6
package.divider.vertical=0.7966417910447762 package.divider.vertical=0.7965474722564735
package.editor.height=420 package.editor.height=639
package.editor.width=661 package.editor.width=604
package.editor.x=704 package.editor.x=0
package.editor.y=449 package.editor.y=25
package.frame.height=600 package.frame.height=875
package.frame.width=800 package.frame.width=720
package.numDependencies=1 package.numDependencies=2
package.numTargets=2 package.numTargets=4
package.showExtends=true package.showExtends=true
package.showUses=true package.showUses=true
project.charset=windows-1252 project.charset=windows-1252
...@@ -34,11 +37,24 @@ target1.type=ClassTarget ...@@ -34,11 +37,24 @@ target1.type=ClassTarget
target1.width=80 target1.width=80
target1.x=170 target1.x=170
target1.y=120 target1.y=120
target2.height=50 target2.height=70
target2.name=Dompteur target2.name=TurtleTest
target2.naviview.expanded=true
target2.showInterface=false target2.showInterface=false
target2.type=ClassTarget target2.type=UnitTestTargetJunit5
target2.width=90 target2.width=120
target2.x=70 target2.x=270
target2.y=40 target2.y=220
target3.height=50
target3.name=Dompteur
target3.naviview.expanded=true
target3.showInterface=false
target3.type=ClassTarget
target3.width=90
target3.x=70
target3.y=40
target4.height=70
target4.name=README.md
target4.type=TextTarget
target4.width=120
target4.x=10
target4.y=180
package.bluej
View file @ 9e6d9be0
...@@ -2,22 +2,25 @@ ...@@ -2,22 +2,25 @@
dependency1.from=Dompteur dependency1.from=Dompteur
dependency1.to=Turtle dependency1.to=Turtle
dependency1.type=UsesDependency dependency1.type=UsesDependency
editor.fx.0.height=722 dependency2.from=TurtleTest
editor.fx.0.width=800 dependency2.to=Turtle
editor.fx.0.x=790 dependency2.type=UsesDependency
editor.fx.0.y=102 editor.fx.0.height=875
objectbench.height=102 editor.fx.0.width=1440
objectbench.width=461 editor.fx.0.x=0
editor.fx.0.y=25
objectbench.height=158
objectbench.width=413
package.divider.horizontal=0.6 package.divider.horizontal=0.6
package.divider.vertical=0.7966417910447762 package.divider.vertical=0.7965474722564735
package.editor.height=420 package.editor.height=639
package.editor.width=661 package.editor.width=604
package.editor.x=704 package.editor.x=0
package.editor.y=449 package.editor.y=25
package.frame.height=600 package.frame.height=875
package.frame.width=800 package.frame.width=720
package.numDependencies=1 package.numDependencies=2
package.numTargets=2 package.numTargets=4
package.showExtends=true package.showExtends=true
package.showUses=true package.showUses=true
project.charset=windows-1252 project.charset=windows-1252
...@@ -34,11 +37,24 @@ target1.type=ClassTarget ...@@ -34,11 +37,24 @@ target1.type=ClassTarget
target1.width=80 target1.width=80
target1.x=170 target1.x=170
target1.y=120 target1.y=120
target2.height=50 target2.height=70
target2.name=Dompteur target2.name=TurtleTest
target2.naviview.expanded=true
target2.showInterface=false target2.showInterface=false
target2.type=ClassTarget target2.type=UnitTestTargetJunit5
target2.width=90 target2.width=120
target2.x=70 target2.x=270
target2.y=40 target2.y=220
target3.height=50
target3.name=Dompteur
target3.naviview.expanded=true
target3.showInterface=false
target3.type=ClassTarget
target3.width=90
target3.x=70
target3.y=40
target4.height=70
target4.name=README.md
target4.type=TextTarget
target4.width=120
target4.x=10
target4.y=180