Convert ViewModelBrick to kotlin (#237)

Fixes #234
wayfair · Feb 5, 2021 · 144a19c · 144a19c
1 parent 21923c3
commit 144a19c
Show file tree

Hide file tree

Showing 3 changed files with 189 additions and 334 deletions.
diff --git a/BrickKit/bricks/src/androidTest/java/com/wayfair/brickkit/brick/ViewModelBrickTest.kt b/BrickKit/bricks/src/androidTest/java/com/wayfair/brickkit/brick/ViewModelBrickTest.kt
@@ -1,6 +1,5 @@
 package com.wayfair.brickkit.brick
 
-import android.util.SparseArray
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import androidx.databinding.Bindable
@@ -100,22 +99,7 @@ class ViewModelBrickTest {
 
         viewModelBrick.addViewModel(BR.text, TextViewModel(TextDataModel(TEXT_2)))
 
-        assertEquals(2, viewModelBrick.getViewModels().size())
-    }
-
-    @Test
-    fun testSetViewModels() {
-        val viewModelBrick = ViewModelBrick.Builder(R.layout.text_brick_vm)
-            .addViewModel(BR.viewModel, TextViewModel(TextDataModel(TEXT)))
-            .build()
-
-        viewModelBrick.setViewModels(
-            SparseArray<ViewModel<*>>().apply {
-                put(BR.text, TextViewModel(TextDataModel(TEXT_2)))
-            }
-        )
-
-        assertEquals(1, viewModelBrick.getViewModels().size())
+        assertEquals(2, viewModelBrick.viewModels.size())
     }
 
     @Test
@@ -199,17 +183,6 @@ class ViewModelBrickTest {
         assertEquals(viewModel, viewModelBrick.viewModels[BR.viewModel])
     }
 
-    @Test
-    fun testBuilder_setViewModels() {
-        val viewModel = mock<ViewModel<DataModel>>()
-
-        val viewModelBrick = ViewModelBrick.Builder(R.layout.text_brick_vm)
-            .setViewModels(SparseArray<ViewModel<DataModel>>().apply { put(BR.viewModel, viewModel) })
-            .build()
-
-        assertEquals(viewModel, viewModelBrick.viewModels[BR.viewModel])
-    }
-
     @Test
     fun testBuilder_addNullViewModel() {
         val viewModelBrick = ViewModelBrick.Builder(R.layout.text_brick_vm)

diff --git a/BrickKit/bricks/src/main/java/com/wayfair/brickkit/brick/ViewModelBrick.java b/BrickKit/bricks/src/main/java/com/wayfair/brickkit/brick/ViewModelBrick.java