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 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index d31b37a..5372e92 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ 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..1b717f9 100644 --- a/src/main/java/edu/bristol/IMDBRating.java +++ b/src/main/java/edu/bristol/IMDBRating.java @@ -7,10 +7,11 @@ public class IMDBRating public float addNewRating(int newRating) { - int previousTotal = (int) (currentAverage * ratingCount); - int newTotal = previousTotal + newRating; + float previousTotal = (currentAverage * ratingCount); + float newTotal = previousTotal + newRating; ratingCount++; currentAverage = newTotal / ratingCount; + System.out.println(currentAverage); return currentAverage; } } diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java index 76a9e9c..af5e232 100644 --- a/src/test/java/edu/bristol/IMDBRatingTest.java +++ b/src/test/java/edu/bristol/IMDBRatingTest.java @@ -16,5 +16,11 @@ 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, "Adding 3rd rating: average should be 4"); + + averageRating = rater.addNewRating(4); + assertTrue(averageRating == 4, "Adding 2nd rating: average should be 4"); } } diff --git a/target/classes/edu/bristol/IMDBRating.class b/target/classes/edu/bristol/IMDBRating.class new file mode 100644 index 0000000..9c28253 Binary files /dev/null and b/target/classes/edu/bristol/IMDBRating.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..066862e --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +edu/bristol/IMDBRating.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..d813d0e --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/Users/amiromar/Desktop/IMDBRating/src/main/java/edu/bristol/IMDBRating.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..9e4e3e9 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +edu/bristol/IMDBRatingTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..0645edc --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/Users/amiromar/Desktop/IMDBRating/src/test/java/edu/bristol/IMDBRatingTest.java diff --git a/target/surefire-reports/TEST-edu.bristol.IMDBRatingTest.xml b/target/surefire-reports/TEST-edu.bristol.IMDBRatingTest.xml new file mode 100644 index 0000000..b14be3c --- /dev/null +++ b/target/surefire-reports/TEST-edu.bristol.IMDBRatingTest.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/edu.bristol.IMDBRatingTest.txt b/target/surefire-reports/edu.bristol.IMDBRatingTest.txt new file mode 100644 index 0000000..e9a2cbc --- /dev/null +++ b/target/surefire-reports/edu.bristol.IMDBRatingTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: edu.bristol.IMDBRatingTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec diff --git a/target/test-classes/edu/bristol/IMDBRatingTest.class b/target/test-classes/edu/bristol/IMDBRatingTest.class new file mode 100644 index 0000000..f749321 Binary files /dev/null and b/target/test-classes/edu/bristol/IMDBRatingTest.class differ