Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #2040: Reformating files under TextInput Package #2070

Merged
merged 7 commits into from
Nov 10, 2020
Merged

Fix #2040: Reformating files under TextInput Package #2070

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8691d8d
Fixes #2040: Reformating files under TextInput Package
Arjupta Nov 1, 2020
119a27e
Fixing for lint check
Arjupta Nov 1, 2020
2d035c5
Suggested Renaming Variables Edits
Arjupta Nov 3, 2020
16d090a
Changed Variable Names in TextInputContainsRuleClassifierProviderTest.kt
Arjupta Nov 4, 2020
14a5b17
Renaming Variables
Arjupta Nov 5, 2020
90429ae
Commit for lint issues
Arjupta Nov 5, 2020
266a485
Renaming variables in TextInputStartsWithRuleClassifierProviderTest
Arjupta Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ...domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import dagger.Component
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.oppia.android.app.model.InteractionObject
import org.oppia.android.domain.classify.InteractionObjectTestBuilder
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import javax.inject.Inject
Expand All @@ -23,9 +23,13 @@ import kotlin.test.fail
@LooperMode(LooperMode.Mode.PAUSED)
@Config(manifest = Config.NONE)
class TextInputCaseSensitiveEqualsRuleClassifierProviderTest {
private val STRING_VALUE_TEST_UPPERCASE = createString(value = "TEST")
private val STRING_VALUE_TEST_LOWERCASE = createString(value = "test")
private val STRING_VALUE_RANDOM = createString(value = "random")

private val STRING_VALUE_TEST_UPPERCASE =
InteractionObjectTestBuilder.createString(value = "TEST")
private val STRING_VALUE_TEST_LOWERCASE =
InteractionObjectTestBuilder.createString(value = "test")
private val STRING_VALUE_TEST_RANDOM =
InteractionObjectTestBuilder.createString(value = "random")

@Inject
internal lateinit var textInputCaseSensitiveEqualsRuleClassifierProvider:
Expand Down Expand Up @@ -68,7 +72,7 @@ class TextInputCaseSensitiveEqualsRuleClassifierProviderTest {

@Test
fun testUppercaseStringAnswer_stringRandomInput_differentString_bothValuesDoNotMatch() {
val inputs = mapOf("x" to STRING_VALUE_RANDOM)
val inputs = mapOf("x" to STRING_VALUE_TEST_RANDOM)

val matches =
inputCaseSensitiveEqualsRuleClassifier.matches(
Expand Down Expand Up @@ -102,10 +106,6 @@ class TextInputCaseSensitiveEqualsRuleClassifierProviderTest {
.inject(this)
}

private fun createString(value: String): InteractionObject {
return InteractionObject.newBuilder().setNormalizedString(value).build()
}

// TODO(#89): Move to a common test library.
private fun <T : Throwable> assertThrows(type: KClass<T>, operation: () -> Unit): T {
try {
Expand Down
89 changes: 50 additions & 39 deletions ...ia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import dagger.Component
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.oppia.android.app.model.InteractionObject
import org.oppia.android.domain.classify.InteractionObjectTestBuilder
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import javax.inject.Inject
Expand All @@ -24,6 +24,29 @@ import kotlin.test.fail
@Config(manifest = Config.NONE)
class TextInputContainsRuleClassifierProviderTest {

private val STRING_VALUE_TEST_CONTAINS_ANSWER =
InteractionObjectTestBuilder.createString(value = "this is a test i will break")
private val STRING_VALUE_TEST_AN_ANSWER =
InteractionObjectTestBuilder.createString(value = "an answer")
private val STRING_VALUE_TEST_A_TEST =
InteractionObjectTestBuilder.createString(value = "a test")
private val STRING_VALUE_TEST_IS_A =
InteractionObjectTestBuilder.createString(value = "is a")
private val STRING_VALUE_TEST_THIS_IS =
InteractionObjectTestBuilder.createString(value = "this is")
private val STRING_VALUE_TEST_NULL =
InteractionObjectTestBuilder.createString(value = "")
private val STRING_VALUE_TEST_ANSWER_NULL =
InteractionObjectTestBuilder.createString(value = "")
private val STRING_VALUE_TEST_ANSWER =
InteractionObjectTestBuilder.createString(value = "this is a test")
private val STRING_VALUE_TEST_EXTRA_SPACE =
InteractionObjectTestBuilder.createString(value = " this is a test ")
private val STRING_VALUE_TEST_NO_SPACE =
InteractionObjectTestBuilder.createString(value = "thisisatest")
private val NON_NEGATIVE_VALUE_TEST_1 =
InteractionObjectTestBuilder.createNonNegativeInt(value = 1)

@Inject
internal lateinit var textInputContainsRuleClassifierProvider:
TextInputContainsRuleClassifierProvider
Expand All @@ -39,10 +62,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringInput_sameString_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = "this is a test"))
val inputs = mapOf("x" to STRING_VALUE_TEST_ANSWER)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -51,20 +74,20 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testEmptyStringAnswer_emptyStringInput_answerContainsInput_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = ""))
val inputs = mapOf("x" to STRING_VALUE_TEST_NULL)

val matches =
inputContainsRuleClassifier.matches(answer = createString(value = ""), inputs = inputs)
inputContainsRuleClassifier.matches(answer = STRING_VALUE_TEST_ANSWER_NULL, inputs = inputs)

assertThat(matches).isTrue()
}

@Test
fun testNonEmptyStringAnswer_emptyStringInput_answerContainsInput_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = ""))
val inputs = mapOf("x" to STRING_VALUE_TEST_NULL)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -73,10 +96,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringInput_answerContainsInputAtBeginning_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = "this is"))
val inputs = mapOf("x" to STRING_VALUE_TEST_THIS_IS)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -85,10 +108,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringInput_answerContainsInputInMiddle_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = "is a"))
val inputs = mapOf("x" to STRING_VALUE_TEST_IS_A)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -97,10 +120,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringInput_answerContainsInputAtEnd_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = "a test"))
val inputs = mapOf("x" to STRING_VALUE_TEST_A_TEST)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -109,10 +132,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringExtraSpacesInput_answerContainsInput_bothValuesMatch() {
val inputs = mapOf("x" to createString(value = " this is a test "))
val inputs = mapOf("x" to STRING_VALUE_TEST_EXTRA_SPACE)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -121,10 +144,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringInput_inputNotInAnswer_valuesDoNotMatch() {
val inputs = mapOf("x" to createString(value = "an answer"))
val inputs = mapOf("x" to STRING_VALUE_TEST_AN_ANSWER)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -133,24 +156,20 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testEmptyStringAnswer_nonEmptyStringInput_answerDoesNotContainInput_valuesDoNotMatch() {
val inputs = mapOf("x" to createString(value = "this is a test"))
val inputs = mapOf("x" to STRING_VALUE_TEST_ANSWER)

val matches =
inputContainsRuleClassifier.matches(answer = createString(value = ""), inputs = inputs)
inputContainsRuleClassifier.matches(answer = STRING_VALUE_TEST_ANSWER_NULL, inputs = inputs)

assertThat(matches).isFalse()
}

@Test
fun testStringAnswer_stringInput_answerPartiallyContainsInput_valuesDoNotMatch() {
val inputs = mapOf(
"x" to createString(
value = "this is a test i will break"
)
)
val inputs = mapOf("x" to STRING_VALUE_TEST_CONTAINS_ANSWER)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -159,10 +178,10 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_stringNoSpacesInput_answerPartiallyContainsInput_valuesDoNotMatch() {
val inputs = mapOf("x" to createString(value = "thisisatest"))
val inputs = mapOf("x" to STRING_VALUE_TEST_NO_SPACE)

val matches = inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)

Expand All @@ -171,11 +190,11 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_missingInput_throwsException() {
val inputs = mapOf("y" to createString(value = "this is a test"))
val inputs = mapOf("y" to STRING_VALUE_TEST_ANSWER)

val exception = assertThrows(IllegalStateException::class) {
inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)
}
Expand All @@ -187,11 +206,11 @@ class TextInputContainsRuleClassifierProviderTest {

@Test
fun testStringAnswer_nonNegativeIntInput_throwsException() {
val inputs = mapOf("x" to createNonNegativeInt(value = 1))
val inputs = mapOf("x" to NON_NEGATIVE_VALUE_TEST_1)

val exception = assertThrows(IllegalStateException::class) {
inputContainsRuleClassifier.matches(
answer = createString(value = "this is a test"),
answer = STRING_VALUE_TEST_ANSWER,
inputs = inputs
)
}
Expand All @@ -201,14 +220,6 @@ class TextInputContainsRuleClassifierProviderTest {
.contains("Expected input value to be of type NORMALIZED_STRING")
}

private fun createNonNegativeInt(value: Int): InteractionObject {
return InteractionObject.newBuilder().setNonNegativeInt(value).build()
}

private fun createString(value: String): InteractionObject {
return InteractionObject.newBuilder().setNormalizedString(value).build()
}

private fun setUpTestApplicationComponent() {
DaggerTextInputContainsRuleClassifierProviderTest_TestApplicationComponent.builder()
.setApplication(ApplicationProvider.getApplicationContext())
Expand Down
Loading