Removed unused react test utils methods

Author: viktor-podzigun

test/src/main/scala/scommons/react/test/util/RendererUtils.scala

@@ -1,6 +1,5 @@
 package scommons.react.test.util
 
-import io.github.shogowada.scalajs.reactjs.classes.ReactClass
 import io.github.shogowada.scalajs.reactjs.elements.ReactElement
 import org.scalactic.source.Position
 import org.scalatest.{Assertion, Matchers, Succeeded}
@@ -32,20 +31,21 @@ sealed trait RendererUtils[Instance <: RenderedInstance] extends Matchers {
   }
 
   def findProps[T](renderedComp: Instance, searchComp: UiComponent[T]): List[T] = {
-    findComponents(renderedComp, searchComp.apply()).map(getComponentProps[T])
+    def getComponentProps(component: Instance): T = {
+      component.props.wrapped.asInstanceOf[T]
+    }
+    
+    findComponents(renderedComp, searchComp.apply()).map(getComponentProps)
   }
 
-  def getComponentProps[T](component: Instance): T = component.props.wrapped.asInstanceOf[T]
-
-  def findComponents(component: Instance,
-                     componentClass: ReactClass): List[Instance] = {
+  def findComponents(component: Instance, componentType: Any): List[Instance] = {
 
     def search(components: List[Instance],
                result: ListBuffer[Instance]): Unit = components match {
 
       case Nil =>
       case head :: tail =>
-        if (head.`type` == componentClass) {
+        if (head.`type` == componentType) {
           result += head
         }
 

test/src/main/scala/scommons/react/test/util/ShallowRendererUtils.scala

@@ -1,6 +1,5 @@
 package scommons.react.test.util
 
-import io.github.shogowada.scalajs.reactjs.classes.ReactClass
 import io.github.shogowada.scalajs.reactjs.elements.ReactElement
 import org.scalactic.source.Position
 import org.scalatest.Assertion
@@ -13,14 +12,11 @@ trait ShallowRendererUtils {
   def createRenderer(): ShallowRenderer = new ShallowRenderer
 
   def shallowRender(element: ReactElement): ShallowInstance = {
-    shallowRender(createRenderer(), element)
-  }
-  
-  def shallowRender(renderer: ShallowRenderer, element: ReactElement): ShallowInstance = {
+    val renderer = createRenderer()
     renderer.render(element)
     renderer.getRenderOutput()
   }
-
+  
   def findComponentProps[T](renderedComp: ShallowInstance,
                             searchComp: UiComponent[T])(implicit pos: Position): T = {
 
@@ -31,12 +27,8 @@ trait ShallowRendererUtils {
     utils.findProps(renderedComp, searchComp)
   }
 
-  def getComponentProps[T](component: ShallowInstance): T = {
-    utils.getComponentProps(component)
-  }
-
-  def findComponents(component: ShallowInstance, componentClass: ReactClass): List[ShallowInstance] = {
-    utils.findComponents(component, componentClass)
+  def findComponents(component: ShallowInstance, componentType: Any): List[ShallowInstance] = {
+    utils.findComponents(component, componentType)
   }
 
   def assertComponent[T](result: ShallowInstance, expectedComp: UiComponent[T])

test/src/main/scala/scommons/react/test/util/TestRendererUtils.scala

@@ -1,6 +1,5 @@
 package scommons.react.test.util
 
-import io.github.shogowada.scalajs.reactjs.classes.ReactClass
 import io.github.shogowada.scalajs.reactjs.elements.ReactElement
 import org.scalactic.source.Position
 import org.scalatest.{Assertion, Succeeded}
@@ -47,12 +46,8 @@ trait TestRendererUtils {
     utils.findProps(renderedComp, searchComp)
   }
 
-  def getComponentProps[T](component: TestInstance): T = {
-    utils.getComponentProps(component)
-  }
-
-  def findComponents(component: TestInstance, componentClass: ReactClass): List[TestInstance] = {
-    utils.findComponents(component, componentClass)
+  def findComponents(component: TestInstance, componentType: Any): List[TestInstance] = {
+    utils.findComponents(component, componentType)
   }
 
   def assertTestComponent[T](result: TestInstance, expectedComp: UiComponent[T])

test/src/test/scala/scommons/react/test/util/RendererUtilsSpec.scala

@@ -18,8 +18,7 @@ abstract class RendererUtilsSpec[Instance <: RenderedInstance] extends TestSpec
 
   def findComponentProps[T](renderedComp: Instance, searchComp: UiComponent[T])(implicit pos: Position): T
   def findProps[T](renderedComp: Instance, searchComp: UiComponent[T]): List[T]
-  def getComponentProps[T](component: Instance): T
-  def findComponents(component: Instance, componentClass: ReactClass): List[Instance]
+  def findComponents(component: Instance, componentType: Any): List[Instance]
   def assertNativeComponent(result: Instance, expectedElement: ReactElement)(implicit pos: Position): Assertion
 
   it should "fail if comp not found when findComponentProps" in {
@@ -78,7 +77,9 @@ abstract class RendererUtilsSpec[Instance <: RenderedInstance] extends TestSpec
     val results = findComponents(comp, TestComp())
 
     //then
-    results.map(getComponentProps[Comp1Props]) shouldBe List(Comp1Props(1), Comp1Props(2))
+    results.map(p => p.props.wrapped.asInstanceOf[Comp1Props]) shouldBe {
+      List(Comp1Props(1), Comp1Props(2))
+    }
   }
 
   it should "fail if array attribute doesn't match when assertNativeComponent" in {

test/src/test/scala/scommons/react/test/util/TestRendererUtilsSpec.scala

@@ -56,18 +56,6 @@ class TestRendererUtilsSpec extends RendererUtilsSpec[TestInstance]
     })
   }
 
-  it should "return wrapped props when getComponentProps" in {
-    //given
-    val props = Comp1Props(1)
-    val root = createTestRenderer(<(TestComp())(^.wrapped := props)("test1 child")).root
-    
-    //when
-    val result = getComponentProps[Comp1Props](root)
-
-    //then
-    result shouldBe props
-  }
-
   it should "not fail if non-empty when assertTestComponent" in {
     //given
     val comp = testRender(<(comp2Class)(^.wrapped := Comp2Props(true))())