Skip to content

Commit c36cde5

Browse files
authored
fix: test module (#2114)
* Fix import * Fix mentions test * Delete old tests that use Roboelectric or deleted classes * Run SSOTest with AndroidJUnit4 * Move SSOTest
1 parent 653ecf4 commit c36cde5

File tree

6 files changed

+9
-770
lines changed

6 files changed

+9
-770
lines changed

app/src/androidTest/scala/com/waz/background/WorkManagerSyncRequestServiceSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import android.arch.lifecycle.MutableLiveData
2424
import android.content.Context
2525
import android.support.test.InstrumentationRegistry
2626
import android.support.test.runner.{AndroidJUnit4, AndroidJUnitRunner}
27-
import androidx.work.test.WorkManagerTestInitHelper
27+
import androidx.work.testing.WorkManagerTestInitHelper
2828
import com.waz.api.{NetworkMode, SyncState}
2929
import com.waz.log.BasicLogging.LogTag.DerivedLogTag
3030
import com.waz.log.{AndroidLogOutput, InternalLog}

app/src/test/scala/com/waz/zclient/SSOTest.scala renamed to app/src/androidTest/scala/com/waz/zclient/SSOTest.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,30 @@
1717
*/
1818
package com.waz.zclient
1919

20+
import android.support.test.runner.AndroidJUnit4
2021
import com.waz.model.UserId
2122
import com.waz.sync.client.AuthenticationManager.Cookie
2223
import com.waz.zclient.appentry.SSOWebViewWrapper
2324
import org.junit.Test
24-
import org.scalatest.junit.JUnitSuite
25+
import org.junit.runner.RunWith
2526

26-
class SSOTest extends JUnitSuite {
27+
@RunWith(classOf[AndroidJUnit4])
28+
class SSOTest {
2729

2830
@Test
2931
def ignoreNonWireURls(): Unit ={
3032
val url = "https://www.wire.com"
3133
assert(SSOWebViewWrapper.parseURL(url).isEmpty)
3234
}
3335

34-
3536
@Test
3637
def parseSuccessURI(): Unit ={
3738
val url = s"${SSOWebViewWrapper.ResponseSchema}://something/?${SSOWebViewWrapper.UserIdQuery}=123&${SSOWebViewWrapper.CookieQuery}=321"
39+
3840
val result = SSOWebViewWrapper.parseURL(url)
3941
assert(result.exists{
4042
case Right((Cookie("321"), UserId("123"))) => true
41-
case _ =>false
43+
case _ => false
4244
})
4345
}
4446

app/src/test/scala/com/waz/testutils/TestUtils.scala

Lines changed: 0 additions & 74 deletions
This file was deleted.

app/src/test/scala/com/waz/zclient/camera/GlobalCameraControllerTest.scala

Lines changed: 0 additions & 238 deletions
This file was deleted.

app/src/test/scala/com/waz/zclient/messages/part/MentionsInputTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
package com.waz.zclient.messages.part
1919

2020
import com.waz.model.{Mention, UserId}
21-
import com.waz.specs.AndroidFreeSpec
2221
import com.waz.zclient.cursor.MentionUtils
2322
import com.waz.zclient.cursor.MentionUtils.Replacement
2423
import com.waz.zclient.messages.parts.TextPartView
2524
import org.junit.Test
26-
import org.scalatest.Suite
25+
import org.scalatest.junit.JUnitSuite
2726

28-
class MentionsInputTest extends AndroidFreeSpec { this: Suite =>
27+
class MentionsInputTest extends JUnitSuite {
2928

3029
@Test
3130
def testWithAtAndSelectorAtEnd(): Unit = {

0 commit comments

Comments
 (0)