Fixed test bug, setting ai strength

jberclaz · Jul 14, 2024 · 5822672 · 5822672
1 parent 1cc998a
commit 5822672
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/com/leflat/jass/server/ArtificialPlayer.java b/src/main/java/com/leflat/jass/server/ArtificialPlayer.java
@@ -21,12 +21,18 @@ public class ArtificialPlayer extends AbstractRemotePlayer {
     private int ourScore = 0;
     private int theirScore = 0;
     private int numberOfPliesWonByOwnTeam;
+    private int strength = 1000;
 
     public ArtificialPlayer(int id, String name) {
         super(id);
         setName(name);
     }
 
+    public ArtificialPlayer(int id, String name, int strength) {
+        this(id, name);
+        this.strength = strength;
+    }
+
     @Override
     public void setPlayerInfo(BasePlayer player) {
         var relativePosition = getInitialRelativePosition(player);
@@ -246,7 +252,7 @@ private Card chooseBestCard() {
         Card bestCard = null;
         float bestScore = -1000;
         for (Card validCard : validCards) {
-            var score = evaluateMoveReward(hand, validCard, 10000);
+            var score = evaluateMoveReward(hand, validCard, strength * 10);
             if (score > bestScore) {
                 bestScore = score;
                 bestCard = validCard;
@@ -350,7 +356,7 @@ int chooseBestAtout(boolean canPass) {
             }
             float maxScore = -10000;
             for (var card : hand) {
-                float score = evaluateMoveReward(hand, card, 1000);
+                float score = evaluateMoveReward(hand, card, strength);
                 if (score > maxScore) {
                     maxScore = score;
                 }

diff --git a/src/main/java/com/leflat/jass/test/MockNetworkFactory.java b/src/main/java/com/leflat/jass/test/MockNetworkFactory.java
@@ -4,7 +4,7 @@
 import com.leflat.jass.common.IClientNetworkFactory;
 
 public class MockNetworkFactory implements IClientNetworkFactory {
-    private static int nbrPlayers = 0;
+    private int nbrPlayers = 0;
 
     public MockNetworkFactory() {
 

diff --git a/src/test/java/FunctionalTest.java b/src/test/java/FunctionalTest.java
@@ -4,9 +4,11 @@
 import com.leflat.jass.server.PlayerLeftExpection;
 import com.leflat.jass.test.MockNetworkFactory;
 import com.leflat.jass.test.MockUiFactory;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 public class FunctionalTest {
     @Test
@@ -29,11 +31,11 @@ void functional_test() throws PlayerLeftExpection {
         game.addPlayer(player3);
         game.addPlayer(player4);
 
-        assertTrue(game.isGameFull());
+        Assertions.assertTrue(game.isGameFull());
 
         game.setNoWait(true);
 
-        game.run();
+        assertDoesNotThrow(() -> {game.run();});
     }
 
     @Test
@@ -48,17 +50,17 @@ void functional_test_with_artificial_player() throws PlayerLeftExpection {
         player2.setName("GC");
         var player3 = new JassPlayer(clientNetworkFactory, new MockUiFactory());
         player3.setName("Pischus");
-        var player4 = new ArtificialPlayer(3, "Wein");
+        var player4 = new ArtificialPlayer(3, "Wein", 20);
 
         game.addPlayer(player1);
         game.addPlayer(player2);
         game.addPlayer(player3);
         game.addPlayer(player4);
 
-        assertTrue(game.isGameFull());
+        Assertions.assertTrue(game.isGameFull());
 
         game.setNoWait(true);
 
-        game.run();
+        assertDoesNotThrow(() -> {game.run();});
     }
 }