Passing Actions tests

HamzaEzzRa · May 30, 2021 · 5345398 · 5345398
1 parent 68767d6
commit 5345398
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 21 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: JUnit Testing
+name: tests
 
 on:
   push:
@@ -8,8 +8,25 @@ on:
 
 jobs:
   run_tests:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
+      - name: Audio device
+        run: Get-CimInstance Win32_SoundDevice | fl *
+      - name: Install Scream
+        shell: powershell
+        run: |
+          Start-Service audio*
+          Invoke-WebRequest https://github.com/duncanthrax/scream/releases/download/3.6/Scream3.6.zip -OutFile C:\Scream3.6.zip
+          Extract-7Zip -Path C:\Scream3.6.zip -DestinationPath C:\Scream
+          $cert = (Get-AuthenticodeSignature C:\Scream\Install\driver\Scream.sys).SignerCertificate
+          $store = [System.Security.Cryptography.X509Certificates.X509Store]::new("TrustedPublisher", "LocalMachine")
+          $store.Open("ReadWrite")
+          $store.Add($cert)
+          $store.Close()
+          cd C:\Scream\Install\driver
+          C:\Scream\Install\helpers\devcon install Scream.inf *Scream
+      - name: Audio device
+        run: Get-CimInstance Win32_SoundDevice | fl *
       - name: Checkout the repository
         uses: actions/checkout@v2
       - name: Set up JDK 8

diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@ This is a Super Mario 2D Clone written in java.
 
 Originally forked from [Super-Mario-Java-2D-Game](https://github.com/mtala3t/Super-Mario-Java-2D-Game).
 
+The project has been fully migrated to Maven.
+
 We're implementing a better gameplay and user experience as part of our Agile development school project.
 
 ### Planned features
@@ -20,7 +22,7 @@ We're implementing a better gameplay and user experience as part of our Agile de
 - [x] Improve the animation system and the game graphics.
 - [x] An audio system.
 - [ ] Add a shop system where you can spend your collected coins.
-- [ ] Hitbox visualization and adjustment.
+- [ ] Hit-box visualization and adjustment.
 
 ### Screenshots
 

diff --git a/dist/SuperMarioClone-1.1.jar → dist/SuperMarioClone-1.1.2.jar b/dist/SuperMarioClone-1.1.jar → dist/SuperMarioClone-1.1.2.jar
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.TETOSOFT</groupId>
     <artifactId>SuperMarioClone</artifactId>
-    <version>1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/com/TETOSOFT/graphics/Animation.java b/src/main/java/com/TETOSOFT/graphics/Animation.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 
 public class Animation {
-    private ArrayList frames;
+    private ArrayList<AnimFrame> frames;
     private int currFrameIndex;
     private long animTime;
     private long totalDuration;
@@ -14,10 +14,10 @@ public int getSize() {
     }
 
     public Animation() {
-        this(new ArrayList(), 0);
+        this(new ArrayList<AnimFrame>(), 0);
     }
 
-    private Animation(ArrayList frames, long totalDuration) {
+    private Animation(ArrayList<AnimFrame> frames, long totalDuration) {
         this.frames = frames;
         this.totalDuration = totalDuration;
         start();

diff --git a/src/main/java/com/TETOSOFT/input/InputManager.java b/src/main/java/com/TETOSOFT/input/InputManager.java
@@ -106,7 +106,7 @@ public void clearMap(GameAction gameAction) {
     }
 
     public List getMaps(GameAction gameCode) {
-        ArrayList list = new ArrayList();
+        ArrayList<String> list = new ArrayList<>();
 
         for (int i=0; i<keyActions.length; i++) {
             if (keyActions[i] == gameCode) {

diff --git a/src/main/java/com/TETOSOFT/tilegame/MapLoader.java b/src/main/java/com/TETOSOFT/tilegame/MapLoader.java
@@ -20,7 +20,7 @@
     "host" Sprites.
 */
 public class MapLoader {
-    private ArrayList tiles;
+    private ArrayList<Image> tiles;
     public int currentMap;
     private GraphicsConfiguration gc;
 
@@ -114,7 +114,7 @@ public TileMap reloadMap() {
     }
 
     private TileMap loadMap(String filename) throws IOException {
-        ArrayList lines = new ArrayList();
+        ArrayList<String> lines = new ArrayList<>();
         int width = 0;
         int height = 0;
 
@@ -202,7 +202,7 @@ private void addSprite(TileMap map,
     public void loadTileImages() {
         // keep looking for tile A,B,C, etc. this makes it
         // easy to drop new tiles in the images/ directory
-        tiles = new ArrayList();
+        tiles = new ArrayList<>();
         char ch = 'A';
 
         while (true) {

diff --git a/src/main/java/com/TETOSOFT/tilegame/TileMap.java b/src/main/java/com/TETOSOFT/tilegame/TileMap.java
@@ -15,7 +15,7 @@
 public class TileMap {
 
     private Image[][] tiles;
-    private LinkedList sprites;
+    private LinkedList<Sprite> sprites;
     private Sprite player;
 
     /**
@@ -24,7 +24,7 @@ public class TileMap {
     */
     public TileMap(int width, int height) {
         tiles = new Image[width][height];
-        sprites = new LinkedList();
+        sprites = new LinkedList<>();
     }
 
 

diff --git a/target/classes/.netbeans_automatic_build b/target/classes/.netbeans_automatic_build
diff --git a/target/classes/com/TETOSOFT/graphics/Animation.class b/target/classes/com/TETOSOFT/graphics/Animation.class
diff --git a/target/classes/com/TETOSOFT/input/InputManager.class b/target/classes/com/TETOSOFT/input/InputManager.class
diff --git a/target/classes/com/TETOSOFT/tilegame/MapLoader.class b/target/classes/com/TETOSOFT/tilegame/MapLoader.class
diff --git a/target/classes/com/TETOSOFT/tilegame/TileMap.class b/target/classes/com/TETOSOFT/tilegame/TileMap.class
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -1,3 +1,3 @@
-version=1.1
+version=1.1.2
 groupId=com.TETOSOFT
 artifactId=SuperMarioClone
diff --git a/target/surefire-reports/AudioTest.txt b/target/surefire-reports/AudioTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: AudioTest
 -------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.627 sec
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.548 sec
diff --git a/target/surefire-reports/InputTest.txt b/target/surefire-reports/InputTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: InputTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.189 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.075 sec
diff --git a/target/surefire-reports/TEST-AudioTest.xml b/target/surefire-reports/TEST-AudioTest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="2" failures="0" name="AudioTest" time="3.599" errors="0" skipped="0">
+<testsuite tests="2" failures="0" name="AudioTest" time="3.527" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.8.0_271\jre\bin"/>
@@ -64,6 +64,6 @@
     <property name="sun.desktop" value="windows"/>
     <property name="sun.cpu.isalist" value="amd64"/>
   </properties>
-  <testcase classname="AudioTest" name="testMP3" time="0.924"/>
-  <testcase classname="AudioTest" name="testWAV" time="2.675"/>
+  <testcase classname="AudioTest" name="testMP3" time="0.862"/>
+  <testcase classname="AudioTest" name="testWAV" time="2.665"/>
 </testsuite>
diff --git a/target/surefire-reports/TEST-InputTest.xml b/target/surefire-reports/TEST-InputTest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="InputTest" time="1.189" errors="0" skipped="0">
+<testsuite tests="1" failures="0" name="InputTest" time="1.075" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.8.0_271\jre\bin"/>
@@ -64,5 +64,5 @@
     <property name="sun.desktop" value="windows"/>
     <property name="sun.cpu.isalist" value="amd64"/>
   </properties>
-  <testcase classname="InputTest" name="testActionKeys" time="1.189"/>
+  <testcase classname="InputTest" name="testActionKeys" time="1.075"/>
 </testsuite>
diff --git a/target/test-classes/.netbeans_automatic_build b/target/test-classes/.netbeans_automatic_build
diff --git a/target/test-classes/AudioTest.class b/target/test-classes/AudioTest.class
diff --git a/target/test-classes/InputTest.class b/target/test-classes/InputTest.class