diff --git a/pom.xml b/pom.xml index 9f9c28804e99ae1f18d8f0e84f212f9bd37a58c9..3b50089d57a05c48b2dd68568ed4285f08e14c8a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,43 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> + + <junit.version>5.7.1</junit.version> + <junitplatform.version>1.7.1</junitplatform.version> + <jqwik.version>1.5.0</jqwik.version> + </properties> <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-commons</artifactId> + <version>${junitplatform.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.jqwik</groupId> + <artifactId>jqwik</artifactId> + <version>${jqwik.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.openjfx</groupId> <artifactId>javafx-controls</artifactId> @@ -23,6 +58,15 @@ </dependencies> <build> <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M5</version> + </plugin> + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <version>3.0.0-M5</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> diff --git a/src/main/java/simon/App.java b/src/main/java/simon/App.java index f7d4c1f4d534ebd8e3713a23bcc7d6f4696a51c5..670a9fa085d0ccc7a2e261e53cdccb5a9332de43 100644 --- a/src/main/java/simon/App.java +++ b/src/main/java/simon/App.java @@ -25,7 +25,30 @@ import javafx.stage.Stage; import java.util.Random; import java.io.IOException; +class ColouredCircle{ + double x; + double y; + double r; + Color c; + + ColouredCircle(double x, double y, double r, Color c){ + this.x = x; + this.y = y; + this.r = r; + this.c = c; + } + + static ColouredCircle[] circles = new ColouredCircle[]{ + new ColouredCircle(60,50,50, Color.RED), + + new ColouredCircle(165,50,50, Color.YELLOW), + new ColouredCircle(270,50,50, Color.DODGERBLUE), + + new ColouredCircle(375,50,50, Color.ORANGE) + }; +} + public class App extends Application { @@ -33,6 +56,7 @@ public class App extends Application { Label score = new Label("0"); private static Scene scene; int counter = 0; + @Override public void start(Stage stage) throws IOException { @@ -40,6 +64,11 @@ public class App extends Application { stage.setWidth(465); stage.setHeight(300); + for (ColouredCircle c : ColouredCircle.circles){ + Circle red = new Circle(c.x,c.y,c.r, c.c); + red.setStroke(Color.BLACK); + } + Circle red = new Circle(60,50,50, Color.RED); red.setStroke(Color.BLACK); diff --git a/src/test/java/simon/test.java b/src/test/java/simon/test.java new file mode 100644 index 0000000000000000000000000000000000000000..f176097f3d1605f459b2128d30c80d2db31a64d7 --- /dev/null +++ b/src/test/java/simon/test.java @@ -0,0 +1,15 @@ +package simon; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class test { + @Test + void testX(){ + System.out.println("AAAAAAAAAAAA"); + for (ColouredCircle c : ColouredCircle.circles){ + assertEquals(52, c.r); + } + } +} diff --git a/target/classes/simon/App$1.class b/target/classes/simon/App$1.class index c7fbc14926de2d27167df73bca49d209d40acfde..d2815de302d8441e3246a13e6b6f204d557e9413 100644 Binary files a/target/classes/simon/App$1.class and b/target/classes/simon/App$1.class differ diff --git a/target/classes/simon/App$2.class b/target/classes/simon/App$2.class index 96df85934210ef4a1c41985cc28a744c5befcfb0..72f54275e619fe17112c3ac0036c2de8cdb8563c 100644 Binary files a/target/classes/simon/App$2.class and b/target/classes/simon/App$2.class differ diff --git a/target/classes/simon/App$3.class b/target/classes/simon/App$3.class index 3c137ae54be578ae73b2acf616fdd98ce1b9e325..d0b69dda384e18cf8544d6c9f28780718809efb9 100644 Binary files a/target/classes/simon/App$3.class and b/target/classes/simon/App$3.class differ diff --git a/target/classes/simon/App$4.class b/target/classes/simon/App$4.class index 9bad7f1d4564a5fd049ad5f24987429abf2d8654..5900cc30b0eabcd4943a806188b9044926e4f2bb 100644 Binary files a/target/classes/simon/App$4.class and b/target/classes/simon/App$4.class differ diff --git a/target/classes/simon/App$5.class b/target/classes/simon/App$5.class index 114eb787e991f689c63fb4a64ddda4862472cfd8..6facf92a8867f13cb3bcd3821e506a9c40eda9b2 100644 Binary files a/target/classes/simon/App$5.class and b/target/classes/simon/App$5.class differ diff --git a/target/classes/simon/App$6.class b/target/classes/simon/App$6.class index dfdaa792fcceaee53afc9f5318520b048b715fed..3bdb964d7ca33319bcfbe94e974f853a33f9ba1d 100644 Binary files a/target/classes/simon/App$6.class and b/target/classes/simon/App$6.class differ diff --git a/target/classes/simon/App$7.class b/target/classes/simon/App$7.class index 7e5253814bab7cc66050ba48dcc21f0c92f57d52..436ad69695ca972a2f0a271f46582f60292ef8dc 100644 Binary files a/target/classes/simon/App$7.class and b/target/classes/simon/App$7.class differ diff --git a/target/classes/simon/App.class b/target/classes/simon/App.class index 37bf28930281fc669afbbb6562938ba28ad25e1e..edb9012989c78801b922b3513ab5d6da3fbe48db 100644 Binary files a/target/classes/simon/App.class and b/target/classes/simon/App.class differ diff --git a/target/classes/simon/ColouredCircle.class b/target/classes/simon/ColouredCircle.class new file mode 100644 index 0000000000000000000000000000000000000000..0ce4351492287fe30db454a63c90c1dc930e2ec1 Binary files /dev/null and b/target/classes/simon/ColouredCircle.class differ diff --git a/target/test-classes/simon/test.class b/target/test-classes/simon/test.class new file mode 100644 index 0000000000000000000000000000000000000000..dba9ba1f944ccad2bfd62d94f0ff70e0eb6ab781 Binary files /dev/null and b/target/test-classes/simon/test.class differ