rowan-w

.github/workflows/maven-workflow.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.github/workflows/maven.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

src/main/java/edu/bristol/IMDBRating.java

@@ -6,11 +6,17 @@ public class IMDBRating
     private int ratingCount = 0;
 
     public float addNewRating(int newRating)
-    {
+    {   if(newRating<1){
+          newRating =1;
+        }
+        if(newRating>10){
+            newRating=10;
+        }
         int previousTotal = (int) (currentAverage * ratingCount);
         int newTotal = previousTotal + newRating;
         ratingCount++;
-        currentAverage = newTotal / ratingCount;
+        //currentAverage = newTotal / ratingCount;
+        currentAverage = newTotal / (float)ratingCount;
         return currentAverage;
     }
 }

src/test/java/edu/bristol/IMDBRatingTest.java

@@ -1,6 +1,8 @@
 package edu.bristol;
 
 import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class IMDBRatingTest
@@ -16,5 +18,31 @@ public void testAverageRating()
 
         averageRating = rater.addNewRating(4);
         assertTrue(averageRating == 3.0, "Adding 2nd rating: average should be 3.0");
+
+        averageRating = rater.addNewRating(6);
+        assertTrue(averageRating == 4.0, "Adding 3rd rating: average should be 4.0");
+
+    }
+    @Test
+    public void testAverageRating2()
+    {
+        float averageRating;
+        IMDBRating rater = new IMDBRating();
+
+        averageRating = rater.addNewRating(2);
+        assertEquals( 2.0, averageRating);
+
+        averageRating = rater.addNewRating(3);
+        assertEquals( 2.5, averageRating);
+        //ratings greater than 10 is treated as 10
+        averageRating = rater.addNewRating(16);
+        assertEquals( 5.0, averageRating);
+        //ratings less than 1 is treated as 1
+        averageRating = rater.addNewRating(-12);
+        assertEquals( 4, averageRating);
+
+        averageRating = rater.addNewRating(4);
+        assertEquals( 4.0, averageRating);
     }
+
 }