Update privacy grade so a score of 2 or 3 is now a C

Also add unit tests for letter grade now that the mapping contains logic (score is already tested)

Author: subsymbolic

app/src/androidTest/java/com/duckduckgo/app/privacymonitor/model/PrivacyGradeTest.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.privacymonitor.model
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class PrivacyGradeTest {
+
+    @Test
+    fun whenScoreIs0ThenGradeIsA() {
+        assertEquals(PrivacyGrade.A, PrivacyGrade.gradeForScore(0))
+    }
+
+    @Test
+    fun whenScoreIs1ThenGradeIsB() {
+        assertEquals(PrivacyGrade.B, PrivacyGrade.gradeForScore(1))
+    }
+
+    @Test
+    fun whenScoreIs2ThenGradeIsC() {
+        assertEquals(PrivacyGrade.C, PrivacyGrade.gradeForScore(2))
+    }
+
+    @Test
+    fun whenScoreIs3ThenGradeIsC() {
+        assertEquals(PrivacyGrade.C, PrivacyGrade.gradeForScore(3))
+    }
+
+    @Test
+    fun whenScoreIs4ThenGradeIsD() {
+        assertEquals(PrivacyGrade.D, PrivacyGrade.gradeForScore(4))
+    }
+
+    @Test
+    fun whenScoreIsAbove4ThenGradeIsD() {
+        assertEquals(PrivacyGrade.D, PrivacyGrade.gradeForScore(5))
+    }
+
+}

app/src/androidTest/java/com/duckduckgo/app/privacymonitor/renderer/HttpsStatusRendererExtenstionTest.kt renamed to app/src/androidTest/java/com/duckduckgo/app/privacymonitor/renderer/HttpsStatusRendererExtensionTest.kt

@@ -23,7 +23,7 @@ import com.duckduckgo.app.privacymonitor.model.HttpsStatus
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-class HttpsStatusRendererExtenstionTest {
+class HttpsStatusRendererExtensionTest {
 
     private val context: Context = InstrumentationRegistry.getTargetContext()
 

app/src/main/java/com/duckduckgo/app/global/view/StringHtmlExtenstion.kt renamed to app/src/main/java/com/duckduckgo/app/global/view/StringHtmlExtension.kt

@@ -22,5 +22,18 @@ enum class PrivacyGrade {
     B,
     C,
     D,
-    UNKNOWN
+    UNKNOWN;
+
+    companion object {
+
+        fun gradeForScore(score: Int): PrivacyGrade {
+            return when (score) {
+                0 -> PrivacyGrade.A
+                1 -> PrivacyGrade.B
+                2, 3 -> PrivacyGrade.C
+                else -> PrivacyGrade.D
+            }
+        }
+
+    }
 }

app/src/main/java/com/duckduckgo/app/privacymonitor/model/PrivacyGrade.kt

@@ -56,20 +56,10 @@ val PrivacyMonitor.improvedScore: Int
     }
 
 val PrivacyMonitor.grade: PrivacyGrade
-    get() = calculateGrade(score)
+    get() = PrivacyGrade.gradeForScore(score)
 
 val PrivacyMonitor.improvedGrade: PrivacyGrade
-    get() = calculateGrade(improvedScore)
-
-
-private fun calculateGrade(score: Int): PrivacyGrade {
-    return when {
-        score <= 0 -> PrivacyGrade.A
-        score == 1 -> PrivacyGrade.B
-        score == 2 -> PrivacyGrade.C
-        else -> PrivacyGrade.D
-    }
-}
+    get() = PrivacyGrade.gradeForScore(improvedScore)
 
 val TermsOfService.gradingScore: Int
     get() {