From 286aeffb94fa2b4a37659dce67cbc5d5fdab387a Mon Sep 17 00:00:00 2001
From: ROWAN-Windows <WindowsPowerShell>
Date: Tue, 22 Feb 2022 19:10:00 +0000
Subject: [PATCH 1/6] rowan-w

---
 .idea/compiler.xml                            |   1 +
 .idea/misc.xml                                |   2 +-
 src/main/java/edu/bristol/IMDBRating.java     |  10 +++++--
 src/test/java/edu/bristol/IMDBRatingTest.java |  26 ++++++++++++++++++
 target/classes/edu/bristol/IMDBRating.class   | Bin 0 -> 636 bytes
 .../edu/bristol/IMDBRatingTest.class          | Bin 0 -> 1265 bytes
 6 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 target/classes/edu/bristol/IMDBRating.class
 create mode 100644 target/test-classes/edu/bristol/IMDBRatingTest.class

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9a536f5..e0991c0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,6 +7,7 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="IMDB" />
+        <module name="IMDBRating" />
       </profile>
     </annotationProcessing>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d31b37a..8c1e2b0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/src/main/java/edu/bristol/IMDBRating.java b/src/main/java/edu/bristol/IMDBRating.java
index 6021d63..20eaadf 100644
--- a/src/main/java/edu/bristol/IMDBRating.java
+++ b/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;
     }
 }
diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java
index 76a9e9c..994940a 100644
--- a/src/test/java/edu/bristol/IMDBRatingTest.java
+++ b/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,29 @@ 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);
+
+    }
+
 }
diff --git a/target/classes/edu/bristol/IMDBRating.class b/target/classes/edu/bristol/IMDBRating.class
new file mode 100644
index 0000000000000000000000000000000000000000..f90a3bf6f1558088dde3a2452172678341b437a0
GIT binary patch
literal 636
zcmZuu%Wl&^6g^`*apKsCDX&6W3LDgVL3V7KRw_l2BBe#5RV8+vIHTZT>}q0%Kj?<P
zKx{!mYK6pt58$H^XN*xdXyp4mcg~sXU%!9+1h9uk9xT`{93Krd1;T|~$w4Z!`QX)b
zq2fZIIZU#o*cY(3ch1^qq3y!+(Sa{;PtD4~R42<KPY2_pmoHw+BFW|g-MG|RWyQft
zX*pK{Vq`|UK6(fRI=aFg=4D0(F&1zR^BG~iNs_7K^8HllQ#nmpS)1gsOwXiFOkNkA
z;%%}NSfBi#e^<blv)Qrw@K2AkJ>D4!w6mL1aG}*I$;;(wUdU9S#a<l-CxwjP9m$KD
z&O6CV9jj4d1odv-`OIt!Pxvs4+q8JNl`7&ZD=*AiA#jV?0sDf!7k!6_I@fR``x?Qw
z3b;nwg-vV2;ZU1nx0(5WM{oysnQ`N|Utjm7LIS&e=Mx&vupfG#(G0y|bj6#m5L_-k
z?rrqX_oFvVoO4n|o0nB1Gu%Xdt>_H(Qxbw-10GzG20S7E)duZjs*fn<IYk&r5e1UA
fmSm!Jq6D#9c)-ZwL>~_s+4LaVa$8m3>}c~3`~z|N

literal 0
HcmV?d00001

diff --git a/target/test-classes/edu/bristol/IMDBRatingTest.class b/target/test-classes/edu/bristol/IMDBRatingTest.class
new file mode 100644
index 0000000000000000000000000000000000000000..28b62201c09ca2e8f3eb6187baca2cbae3e09ea1
GIT binary patch
literal 1265
zcmaKrO>YuW6o%gm!we#=K(U`hr=_Vt5n8Ap{mh_<X#zEAkwkX`Goe%IP=}ei^$&Dy
z;?{+0H@4Blr3-(LTaD+=KuKfUAvyP+d*+;Z-g^$e{(k!bU=v#*_~4fygb{$q5IInf
z)qF=a+xZvG1HEN4h#Q7!*jo(#RJtJ{$S|&JPQGawJ-ge<Z`aCCc2(Oj+aXBsb8|C{
zFh&@{s;2Ge@4P63klIdHM1{V~pCF<PsgkBqro7y<Wy>wHCacG~rM7jsx8HR-n%vao
zLT)L9F~lX@4r3e>406|M=MNm>B70=mx|LUtjC`rr(=FTRnmvY)>N<7H(TO<qx;j+0
zXIu2q^>jm2f&-YDAxy#4u7N4$mP92oNV_{sD_Ym3t#}${!<a*oUyV!m?5(4A2sV%^
zmpP8$)fJVvw-J>00N0-3d5iqTN`-gfKEw3oU8w6lYMSu0tC8+oRm0SGoWrJW)zxN)
zPGZ$=OYJmN%iw<hP_Xw6qDWM)F1gMSwW)N;>&~F3BmHg-d{!Yw>ZEQlOkPorN{#H<
zYU@o+J?aBY?K-Ay9O@0DXAoA&G`lv9gWJeN_3~zOp;RjNA60>xzt?rFmR>Qq<gww1
z@|+wW1k55!lg}SN2pJ;T9C>+K8LffLDcBd<_~;03n9uAI?Ze&+SVn<7h9X6MZt_nE
zR1SFg9nz~)+^A&(UlA%NPvRK;@DY;m8G=6+IYTTf4FZ$Hz%&m;#6cu6jNG9Jhw-~G
za|8m6l8um!l9n;tLmX@L=O|$UbxgUSvIo-#9mR93-~j;#QNu$#BIw6dCkpWoW_%JP
zg-s}IQejx7V}2oPv@)!p>-*H#SGuT=)Fn^OAZK0lIOaVs65&eXSm?XIxf@F*&yXHo
zY=*`gxI;`bX_+MjNhB~&zXdFksv^>ak%2<};+OAfDxGU8o@-j|Yq|)(K{-Bb{sS^a
B1}y*p

literal 0
HcmV?d00001


From 77891463218d441dd737959354a7ac3dd84477ec Mon Sep 17 00:00:00 2001
From: ROWAN-W <79567802+ROWAN-W@users.noreply.github.com>
Date: Tue, 22 Feb 2022 21:28:49 +0000
Subject: [PATCH 2/6] Create maven.yml

---
 .github/workflows/maven.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..2566386
--- /dev/null
+++ b/.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 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

From 84e12afef12b1549367e520704837fb37df76d40 Mon Sep 17 00:00:00 2001
From: ROWAN-W <79567802+ROWAN-W@users.noreply.github.com>
Date: Tue, 22 Feb 2022 21:33:35 +0000
Subject: [PATCH 3/6] maven-workflow

---
 .github/workflows/maven-workflow.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/maven-workflow.yml

diff --git a/.github/workflows/maven-workflow.yml b/.github/workflows/maven-workflow.yml
new file mode 100644
index 0000000..3384681
--- /dev/null
+++ b/.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

From 601a57f9a2651f64e0863aa236e298855ee79a03 Mon Sep 17 00:00:00 2001
From: ROWAN-Windows <WindowsPowerShell>
Date: Tue, 22 Feb 2022 21:46:17 +0000
Subject: [PATCH 4/6] test-workflow

---
 src/test/java/edu/bristol/IMDBRatingTest.java |   2 ++
 .../edu/bristol/IMDBRatingTest.class          | Bin 1265 -> 1296 bytes
 2 files changed, 2 insertions(+)

diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java
index 994940a..a50efd0 100644
--- a/src/test/java/edu/bristol/IMDBRatingTest.java
+++ b/src/test/java/edu/bristol/IMDBRatingTest.java
@@ -41,6 +41,8 @@ public void testAverageRating2()
         averageRating = rater.addNewRating(-12);
         assertEquals( 4, averageRating);
 
+        averageRating = rater.addNewRating(4);
+        assertEquals( 4.3, averageRating);
     }
 
 }
diff --git a/target/test-classes/edu/bristol/IMDBRatingTest.class b/target/test-classes/edu/bristol/IMDBRatingTest.class
index 28b62201c09ca2e8f3eb6187baca2cbae3e09ea1..c61d4407b67b1ac907d347786296c541d36bc389 100644
GIT binary patch
delta 333
zcmY+9O-ch%5QM*;naso?C;^FLHUSqBiTO4DYn~`(rE#HKm)<6z%t?a8U+@54!Bcnu
z#hOWo_!iaOuj^IS`<lCp<By-$ci<2=ipRDPx?(3g5e;MIzE^tqw5na!@x%fjBS$D~
zYHFyOYHs}r8>#VV3DY&?X$uPz0v$Fr8C`8Xn#q-aYpvwXU%N?J6$!)jlr>MEEw;tZ
zbIuOCda<W{k?@<c7ZEvIa<=S@eO;$^2dbuDWa8>y2r|h*;sRH$MUTX%i_}(!&s6?`
jwkagTpn7t~1{c(`z>_G0S(M{hl>Rizf6pVidGvk(qwFO0

delta 286
zcmY+8yG{aO5QV?__l6raF(g8ufx-|Cf`Z(IES0gawA9k)A^9HxUtnWsEU2h_5?dcY
z!tAnHLNk|h&YUxg@b4u2*?zBqDYH0Si63w)RBYW;zJBFOicO5N;2?PTT3fc}TsGQ@
zB^wmD(|VfD9`|%~6S~S8)xJ3&(zY9?@t&w^>I1Kt>YOJY=&8EE3w;K9F;xBn|DUP}
z2qGy(QjUa?!b#j%yD-_C>%7EGE$8;xjm~0449ROZg!a?Do*Y8wd1yBe9c7`%?vJU<
FbO#8=9nk;)


From 2f63444d5f434a6633e5dd7cad7caf92828f683f Mon Sep 17 00:00:00 2001
From: ROWAN-W <79567802+ROWAN-W@users.noreply.github.com>
Date: Tue, 22 Feb 2022 21:51:59 +0000
Subject: [PATCH 5/6] Update maven.yml

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2566386..3384681 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

From 1c40e1274b152d1a472a16afb5a2bcb5d252cd03 Mon Sep 17 00:00:00 2001
From: ROWAN-Windows <WindowsPowerShell>
Date: Tue, 22 Feb 2022 21:53:31 +0000
Subject: [PATCH 6/6] test-workflow2

---
 src/test/java/edu/bristol/IMDBRatingTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java
index a50efd0..c92def1 100644
--- a/src/test/java/edu/bristol/IMDBRatingTest.java
+++ b/src/test/java/edu/bristol/IMDBRatingTest.java
@@ -42,7 +42,7 @@ public void testAverageRating2()
         assertEquals( 4, averageRating);
 
         averageRating = rater.addNewRating(4);
-        assertEquals( 4.3, averageRating);
+        assertEquals( 4.0, averageRating);
     }
 
 }