diff --git a/README.md b/README.md index a1a52cca3243f26b6f0c66c5803fc1f5010a78fa..0d9df4a170a11890af736ac4d06b8cff443cb837 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Flowchart I coded : ## part 3 -- unit test done for class dealer +- unit test done for class dealer and BlackJackHand - Quentin said one class with unit test was enough; - ai for cpu is done - they make the correct choice diff --git a/part_3/src/main/java/org/openjfx/App.java b/part_3/src/main/java/org/openjfx/App.java index 549a3b6eae7e94f32364fd43f58928b04bc8f369..7c3f17e3cafe989d45f741dc4b28412011ff22bc 100644 --- a/part_3/src/main/java/org/openjfx/App.java +++ b/part_3/src/main/java/org/openjfx/App.java @@ -127,7 +127,7 @@ public class App extends Application { if (numberOfCpu != 0) { gameManager = new GameManager(Integer.parseInt(moneyPlayer.getText()), 6, 52); gameManager.addCpu(numberOfCpu, dumb); - // gameManager.shuffleDeck(); + gameManager.shuffleDeck(); stage.setScene(sceneInGame); //maj argent value for next scene argentValue.setText(String.valueOf(gameManager.human.getMoney())); diff --git a/part_3/src/test/java/org/openjfx/BlackJackHandTest.java b/part_3/src/test/java/org/openjfx/BlackJackHandTest.java new file mode 100644 index 0000000000000000000000000000000000000000..cce18580776be0e6b5bbed7b18a47d3fd7a781aa --- /dev/null +++ b/part_3/src/test/java/org/openjfx/BlackJackHandTest.java @@ -0,0 +1,93 @@ +package org.openjfx; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.ArrayList; + +import org.junit.Test; + +public class BlackJackHandTest { + @Test + public void ConstructorTest() { + BlackJackHand hand = new BlackJackHand(); + // a hand is returned + assertNotNull("returned BlackJackHand is NULL", hand); + // returned object is a dealer + assertEquals("didn't return a BlackJackHand", BlackJackHand.class, hand.getClass()); + //bet = 0 + assertEquals("bet is not 0", 0, hand.getBet()); + //stayed = false + assertFalse("stayed is not false", hand.getStayed()); + //acesplited = false + assertFalse("aceSplited is not false", hand.getAceSplited()); + } + + @Test + public void getBetTest(){ + BlackJackHand hand = new BlackJackHand(); + hand.addBet(5); + int bet = hand.getBet(); + //returns 5 + assertEquals("didn't return the good value", 5, bet); + } + + @Test + public void addBetTest(){ + BlackJackHand hand = new BlackJackHand(); + hand.addBet(5); + int bet = hand.getBet(); + //returns 5 + assertEquals("didn't return the good value", 5, bet); + } + + @Test + public void getCardsTest(){ + BlackJackHand hand = new BlackJackHand(); + Card card = new Card(COLOR.carreau, 5); + hand.cards.add(card); + ArrayList<Card> array = hand.getCards(); + //returns an arraylist + assertEquals("didnt return Arraylist", ArrayList.class, array.getClass()); + } + + @Test + public void scoreTest(){ + BlackJackHand hand = new BlackJackHand(); + Card card = new Card(COLOR.carreau, 5); + Card card2 = new Card(COLOR.carreau, 5); + hand.cards.add(card); + hand.cards.add(card2); + int score = hand.score(); + //return 10 + assertEquals("didn't return the good value", 10, score); + + hand = new BlackJackHand(); + card = new Card(COLOR.carreau, 1); + card2 = new Card(COLOR.carreau, 5); + hand.cards.add(card); + hand.cards.add(card2); + score = hand.score(); + //return 16 + assertEquals("didn't return the good value", 16, score); + + hand = new BlackJackHand(); + card = new Card(COLOR.carreau, 1); + card2 = new Card(COLOR.carreau, 1); + hand.cards.add(card); + hand.cards.add(card2); + score = hand.score(); + //return 12 + assertEquals("didn't return the good value", 12, score); + + hand = new BlackJackHand(); + card = new Card(COLOR.carreau, 1); + card2 = new Card(COLOR.carreau, 11); + hand.cards.add(card); + hand.cards.add(card2); + score = hand.score(); + //return 999 + assertEquals("didn't return the good value", 999, score); + } +} diff --git a/part_3/target/classes/org/openjfx/App.class b/part_3/target/classes/org/openjfx/App.class index 4df9e80a96cffae9912cbb063ca85206ea5a143e..e7c103b8236f02a365fe66a495aaee58f09691a2 100644 Binary files a/part_3/target/classes/org/openjfx/App.class and b/part_3/target/classes/org/openjfx/App.class differ diff --git a/part_3/target/libs/hamcrest-core-1.3.jar b/part_3/target/libs/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16e3dd37ebe79a36f61f5d0e1a69a653a8a..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/hamcrest-core-1.3.jar and /dev/null differ diff --git a/part_3/target/libs/javafx-base-21.0.2-linux.jar b/part_3/target/libs/javafx-base-21.0.2-linux.jar deleted file mode 100644 index eee9b57981213263ab56454eb15c48a82d910906..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/javafx-base-21.0.2-linux.jar and /dev/null differ diff --git a/part_3/target/libs/javafx-base-21.0.2.jar b/part_3/target/libs/javafx-base-21.0.2.jar deleted file mode 100644 index 2b217d5cf7998e6a790a186fb0bb6cc6cdee9e5f..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/javafx-base-21.0.2.jar and /dev/null differ diff --git a/part_3/target/libs/javafx-controls-21.0.2-linux.jar b/part_3/target/libs/javafx-controls-21.0.2-linux.jar deleted file mode 100644 index 66ae7801d63c2e2db2a78ced1ae7393f8cdf57fb..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/javafx-controls-21.0.2-linux.jar and /dev/null differ diff --git a/part_3/target/libs/javafx-controls-21.0.2.jar b/part_3/target/libs/javafx-controls-21.0.2.jar deleted file mode 100644 index 822d8b4bbd3193f1dffb1ec9ac5d5d16866daf66..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/javafx-controls-21.0.2.jar and /dev/null differ diff --git a/part_3/target/libs/javafx-graphics-21.0.2-linux.jar b/part_3/target/libs/javafx-graphics-21.0.2-linux.jar deleted file mode 100644 index 5af0cc334cc323eb4e10fbebe66332cd168061b9..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/javafx-graphics-21.0.2-linux.jar and /dev/null differ diff --git a/part_3/target/libs/javafx-graphics-21.0.2.jar b/part_3/target/libs/javafx-graphics-21.0.2.jar deleted file mode 100644 index 884499b7048b645c7263acb4da0d429775ad07c2..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/javafx-graphics-21.0.2.jar and /dev/null differ diff --git a/part_3/target/libs/junit-4.11.jar b/part_3/target/libs/junit-4.11.jar deleted file mode 100644 index aaf74448492932e95902b40a70c7a4da5bad4744..0000000000000000000000000000000000000000 Binary files a/part_3/target/libs/junit-4.11.jar and /dev/null differ diff --git a/part_3/target/maven-archiver/pom.properties b/part_3/target/maven-archiver/pom.properties deleted file mode 100644 index 5d36a3dbf1de0b59b12af7e6718dca8cf8eacfee..0000000000000000000000000000000000000000 --- a/part_3/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=sample -groupId=org.openjfx -version=1.0.0 diff --git a/part_3/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/part_3/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 0e1537d05540ae11bf2528926334ca42838eaf18..0000000000000000000000000000000000000000 --- a/part_3/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -org/openjfx/DealetTest.class diff --git a/part_3/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/part_3/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index cb88fd000b33182f4de96146bbcd9459c6013399..0000000000000000000000000000000000000000 --- a/part_3/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -/home/rampfun/hepia/2eme/1_poo/project_object/part_3/src/test/java/org/openjfx/DealetTest.java diff --git a/part_3/target/sample-1.0.0.jar b/part_3/target/sample-1.0.0.jar deleted file mode 100644 index 5091d69aa31ce04ecda7169002770da30ce5fe2a..0000000000000000000000000000000000000000 Binary files a/part_3/target/sample-1.0.0.jar and /dev/null differ diff --git a/part_3/target/surefire-reports/TEST-org.openjfx.DealetTest.xml b/part_3/target/surefire-reports/TEST-org.openjfx.DealetTest.xml deleted file mode 100644 index 03372fce5d6ce62bfcdc34ce987c5a3c71a3b1bb..0000000000000000000000000000000000000000 --- a/part_3/target/surefire-reports/TEST-org.openjfx.DealetTest.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="org.openjfx.DealetTest" time="0.03" tests="7" errors="0" skipped="0" failures="0"> - <properties> - <property name="java.specification.version" value="21"/> - <property name="sun.jnu.encoding" value="UTF-8"/> - <property name="java.class.path" value="/home/rampfun/hepia/2eme/1_poo/project_object/part_3/target/test-classes:/home/rampfun/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/rampfun/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-controls/21.0.2/javafx-controls-21.0.2.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-graphics/21.0.2/javafx-graphics-21.0.2.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-base/21.0.2/javafx-base-21.0.2.jar:"/> - <property name="java.vm.vendor" value="Oracle Corporation"/> - <property name="sun.arch.data.model" value="64"/> - <property name="java.vendor.url" value="https://java.oracle.com/"/> - <property name="os.name" value="Linux"/> - <property name="java.vm.specification.version" value="21"/> - <property name="sun.java.launcher" value="SUN_STANDARD"/> - <property name="user.country" value="US"/> - <property name="sun.boot.library.path" value="/usr/local/jdk-21/lib"/> - <property name="sun.java.command" value="org.apache.maven.surefire.booter.ForkedBooter /home/rampfun/hepia/2eme/1_poo/project_object/part_3/target/surefire 2024-02-02T22-01-22_553-jvmRun1 surefire12859069346639590549tmp surefire_0933894748556831800tmp"/> - <property name="jdk.debug" value="release"/> - <property name="surefire.test.class.path" value="/home/rampfun/hepia/2eme/1_poo/project_object/part_3/target/test-classes:/home/rampfun/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/rampfun/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-controls/21.0.2/javafx-controls-21.0.2.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-graphics/21.0.2/javafx-graphics-21.0.2.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-base/21.0.2/javafx-base-21.0.2.jar:"/> - <property name="sun.cpu.endian" value="little"/> - <property name="user.home" value="/home/rampfun"/> - <property name="user.language" value="en"/> - <property name="java.specification.vendor" value="Oracle Corporation"/> - <property name="jdk.module.path" value="/home/rampfun/hepia/2eme/1_poo/project_object/part_3/target/classes:/home/rampfun/.m2/repository/org/openjfx/javafx-controls/21.0.2/javafx-controls-21.0.2-linux.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-graphics/21.0.2/javafx-graphics-21.0.2-linux.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-base/21.0.2/javafx-base-21.0.2-linux.jar"/> - <property name="java.version.date" value="2023-09-19"/> - <property name="java.home" value="/usr/local/jdk-21"/> - <property name="file.separator" value="/"/> - <property name="basedir" value="/home/rampfun/hepia/2eme/1_poo/project_object/part_3"/> - <property name="java.vm.compressedOopsMode" value="Zero based"/> - <property name="line.separator" value=" "/> - <property name="java.specification.name" value="Java Platform API Specification"/> - <property name="java.vm.specification.vendor" value="Oracle Corporation"/> - <property name="surefire.real.class.path" value="/home/rampfun/.m2/repository/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.jar:/home/rampfun/.m2/repository/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.jar:/home/rampfun/.m2/repository/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.jar:/home/rampfun/hepia/2eme/1_poo/project_object/part_3/target/test-classes:/home/rampfun/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/rampfun/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-controls/21.0.2/javafx-controls-21.0.2.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-graphics/21.0.2/javafx-graphics-21.0.2.jar:/home/rampfun/.m2/repository/org/openjfx/javafx-base/21.0.2/javafx-base-21.0.2.jar:/home/rampfun/.m2/repository/org/apache/maven/surefire/surefire-junit4/2.22.1/surefire-junit4-2.22.1.jar"/> - <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/> - <property name="java.runtime.version" value="21+35-2513"/> - <property name="user.name" value="rampfun"/> - <property name="stdout.encoding" value="UTF-8"/> - <property name="path.separator" value=":"/> - <property name="os.version" value="6.5.0-15-generic"/> - <property name="java.runtime.name" value="OpenJDK Runtime Environment"/> - <property name="file.encoding" value="UTF-8"/> - <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/> - <property name="localRepository" value="/home/rampfun/.m2/repository"/> - <property name="java.vendor.url.bug" value="https://bugreport.java.com/bugreport/"/> - <property name="java.io.tmpdir" value="/tmp"/> - <property name="java.version" value="21"/> - <property name="user.dir" value="/home/rampfun/hepia/2eme/1_poo/project_object/part_3"/> - <property name="os.arch" value="amd64"/> - <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> - <property name="native.encoding" value="UTF-8"/> - <property name="java.library.path" value="/usr/java/packages/lib:/usr/lib64:/lib64:/lib:/usr/lib"/> - <property name="java.vm.info" value="mixed mode"/> - <property name="stderr.encoding" value="UTF-8"/> - <property name="java.vendor" value="Oracle Corporation"/> - <property name="java.vm.version" value="21+35-2513"/> - <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> - <property name="java.class.version" value="65.0"/> - </properties> - <testcase name="drawTest" classname="org.openjfx.DealetTest" time="0.005"/> - <testcase name="getFirstCardTest" classname="org.openjfx.DealetTest" time="0"/> - <testcase name="ConstructorTest" classname="org.openjfx.DealetTest" time="0"/> - <testcase name="compareHandTest" classname="org.openjfx.DealetTest" time="0"/> - <testcase name="resetTest" classname="org.openjfx.DealetTest" time="0"/> - <testcase name="getHandTest" classname="org.openjfx.DealetTest" time="0"/> - <testcase name="scoreTest" classname="org.openjfx.DealetTest" time="0"/> -</testsuite> \ No newline at end of file diff --git a/part_3/target/surefire-reports/org.openjfx.DealetTest.txt b/part_3/target/surefire-reports/org.openjfx.DealetTest.txt deleted file mode 100644 index f06a4c45164f7415c41baf3afb67e219f823fe22..0000000000000000000000000000000000000000 --- a/part_3/target/surefire-reports/org.openjfx.DealetTest.txt +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------------------- -Test set: org.openjfx.DealetTest -------------------------------------------------------------------------------- -Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 s - in org.openjfx.DealetTest diff --git a/part_3/target/test-classes/META-INF/jpms.args b/part_3/target/test-classes/META-INF/jpms.args deleted file mode 100644 index 6254de67504b0abfdf54cf19cc387f54e526c592..0000000000000000000000000000000000000000 --- a/part_3/target/test-classes/META-INF/jpms.args +++ /dev/null @@ -1,4 +0,0 @@ ---patch-module -org.openjfx=_ ---add-reads -org.openjfx=ALL-UNNAMED diff --git a/part_3/target/test-classes/org/openjfx/DealetTest.class b/part_3/target/test-classes/org/openjfx/DealetTest.class deleted file mode 100644 index 1f3e8d6d9f2d709918e906b48f3653968a9129f1..0000000000000000000000000000000000000000 Binary files a/part_3/target/test-classes/org/openjfx/DealetTest.class and /dev/null differ