Skip to content

Commit bec6f0d

Browse files
hermannakoshermannakos
committed
fix tests
1 parent 870e1b6 commit bec6f0d

10 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎apps/parent/src/test/java/com/instructure/parentapp/features/webview/SimpleWebViewRepositoryTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ class SimpleWebViewRepositoryTest {
3939
fun `Get authenticated session successfully returns data`() = runTest {
4040
val expected = "sessionUrl"
4141

42-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(AuthenticatedSession(sessionUrl = expected))
42+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(AuthenticatedSession(sessionUrl = expected))
4343

4444
val result = repository.getAuthenticatedSession("url")
4545
Assert.assertEquals(expected, result)
4646
}
4747

4848
@Test(expected = IllegalStateException::class)
4949
fun `Get authenticated session fails throws exception`() = runTest {
50-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
50+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
5151

5252
repository.getAuthenticatedSession("url")
5353
}

‎apps/parent/src/test/java/com/instructure/parentapp/login/routevalidator/RouteValidatorViewModelTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class RouteValidatorViewModelTest {
153153
every { apiPrefs.getValidToken() } returns ""
154154
every { qrLogin.verifySSOLoginUri(any()) } returns true
155155
coEvery { qrLogin.performSSOLogin(any(), any(), any()) } returns OAuthTokenResponse()
156-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(AuthenticatedSession("sessionUrl"))
156+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(AuthenticatedSession("sessionUrl"))
157157

158158
createViewModel()
159159

@@ -177,7 +177,7 @@ class RouteValidatorViewModelTest {
177177
realUser = TokenUser(1, "", ""),
178178
user = TokenUser(1, "", "")
179179
)
180-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(AuthenticatedSession("sessionUrl"))
180+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(AuthenticatedSession("sessionUrl"))
181181

182182
createViewModel()
183183

‎apps/student/src/test/java/com/instructure/student/features/discussion/details/datasource/DiscussionDetailsNetworkDataSourceTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class DiscussionDetailsNetworkDataSourceTest {
5656
fun `Get authenticatedSession on successful call`() = runTest {
5757
val expectedUrl = AuthenticatedSession("testUrl")
5858

59-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(expectedUrl)
59+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(expectedUrl)
6060

6161
val result = dataSource.getAuthenticatedSession("").dataOrNull
6262

@@ -65,7 +65,7 @@ class DiscussionDetailsNetworkDataSourceTest {
6565

6666
@Test
6767
fun `Get authenticatedSession on failed call`() = runTest {
68-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Fail(null, null)
68+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail(null, null)
6969

7070
val result = dataSource.getAuthenticatedSession("").dataOrNull
7171

‎apps/student/src/test/java/com/instructure/student/test/conferences/conference_details/ConferenceDetailsNetworkDataSourceTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class ConferenceDetailsNetworkDataSourceTest {
112112
@Test
113113
fun `Return authenticated session api model`() = runTest {
114114
val expected = AuthenticatedSession("url")
115-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(expected)
115+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(expected)
116116

117117
val result = networkDataSource.getAuthenticatedSession("targetUrl")
118118

@@ -122,7 +122,7 @@ class ConferenceDetailsNetworkDataSourceTest {
122122

123123
@Test(expected = IllegalStateException::class)
124124
fun `Throws exception if authenticated session call fails`() = runTest {
125-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
125+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
126126

127127
networkDataSource.getAuthenticatedSession("targetUrl")
128128
}

‎apps/student/src/test/java/com/instructure/student/test/conferences/conference_list/ConferenceListNetworkDataSourceTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class ConferenceListNetworkDataSourceTest {
112112
@Test
113113
fun `Return authenticated session api model`() = runTest {
114114
val expected = AuthenticatedSession("url")
115-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(expected)
115+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(expected)
116116

117117
val result = networkDataSource.getAuthenticatedSession("targetUrl")
118118

@@ -122,7 +122,7 @@ class ConferenceListNetworkDataSourceTest {
122122

123123
@Test(expected = IllegalStateException::class)
124124
fun `Throws exception if authenticated session call fails`() = runTest {
125-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
125+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
126126

127127
networkDataSource.getAuthenticatedSession("targetUrl")
128128
}

‎libs/horizon/src/test/java/com/instructure/horizon/features/moduleitemsequence/content/assessment/AssessmentRepositoryTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ class AssessmentRepositoryTest {
9595
fun `authenticateUrl returns authenticated URL for LTI tool`() = runTest {
9696
val session = AuthenticatedSession(sessionUrl = "https://authenticated.lti.url")
9797
coEvery { launchDefinitionsApi.getLtiFromAuthenticationUrl(any(), any()) } returns DataResult.Success(testLTITool)
98-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Success(session)
98+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(session)
9999

100100
val result = repository.authenticateUrl("https://example.com/quiz")
101101

102102
assertEquals("https://authenticated.lti.url", result)
103103
coVerify { launchDefinitionsApi.getLtiFromAuthenticationUrl("https://example.com/quiz", any()) }
104-
coVerify { oAuthInterface.getAuthenticatedSession("https://lti.example.com/tool", any()) }
104+
coVerify { oAuthInterface.getAuthenticatedSession("https://lti.example.com/tool", any(), any()) }
105105
}
106106

107107
@Test
@@ -118,7 +118,7 @@ class AssessmentRepositoryTest {
118118
fun `authenticateUrl returns original URL when session URL is null`() = runTest {
119119
val session = AuthenticatedSession(sessionUrl = "https://example.com/quiz/authenticated")
120120
coEvery { launchDefinitionsApi.getLtiFromAuthenticationUrl(any(), any()) } returns DataResult.Success(testLTITool)
121-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Success(session)
121+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(session)
122122

123123
val result = repository.authenticateUrl("https://example.com/quiz")
124124

@@ -128,7 +128,7 @@ class AssessmentRepositoryTest {
128128
@Test
129129
fun `authenticateUrl returns original URL when authentication fails`() = runTest {
130130
coEvery { launchDefinitionsApi.getLtiFromAuthenticationUrl(any(), any()) } returns DataResult.Success(testLTITool)
131-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
131+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
132132

133133
val result = repository.authenticateUrl("https://example.com/quiz")
134134

@@ -139,12 +139,12 @@ class AssessmentRepositoryTest {
139139
fun `authenticateUrl always uses forceNetwork`() = runTest {
140140
val session = AuthenticatedSession(sessionUrl = "https://authenticated.url")
141141
coEvery { launchDefinitionsApi.getLtiFromAuthenticationUrl(any(), any()) } returns DataResult.Success(testLTITool)
142-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Success(session)
142+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(session)
143143

144144
repository.authenticateUrl("https://example.com")
145145

146146
coVerify { launchDefinitionsApi.getLtiFromAuthenticationUrl(any(), match { it.isForceReadFromNetwork }) }
147-
coVerify { oAuthInterface.getAuthenticatedSession(any(), match { it.isForceReadFromNetwork }) }
147+
coVerify { oAuthInterface.getAuthenticatedSession(any(), match { it.isForceReadFromNetwork }, any()) }
148148
}
149149

150150
@Test

‎libs/horizon/src/test/java/com/instructure/horizon/features/moduleitemsequence/content/assignment/AssignmentDetailsRepositoryTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class AssignmentDetailsRepositoryTest {
7474
val authenticatedUrl = "https://example.com/file?session=xyz"
7575
val session = AuthenticatedSession(sessionUrl = authenticatedUrl)
7676

77-
coEvery { oAuthInterface.getAuthenticatedSession(originalUrl, any()) } returns
77+
coEvery { oAuthInterface.getAuthenticatedSession(originalUrl, any(), any()) } returns
7878
DataResult.Success(session)
7979

8080
val result = getRepository().authenticateUrl(originalUrl)
@@ -85,7 +85,7 @@ class AssignmentDetailsRepositoryTest {
8585
@Test
8686
fun `Test URL authentication fallback on failure`() = runTest {
8787
val originalUrl = "https://example.com/file"
88-
coEvery { oAuthInterface.getAuthenticatedSession(originalUrl, any()) } returns DataResult.Fail()
88+
coEvery { oAuthInterface.getAuthenticatedSession(originalUrl, any(), any()) } returns DataResult.Fail()
8989

9090
val result = getRepository().authenticateUrl(originalUrl)
9191

@@ -95,7 +95,7 @@ class AssignmentDetailsRepositoryTest {
9595
@Test
9696
fun `Test URL authentication fallback on null session`() = runTest {
9797
val originalUrl = "https://example.com/file"
98-
coEvery { oAuthInterface.getAuthenticatedSession(originalUrl, any()) } returns DataResult.Fail()
98+
coEvery { oAuthInterface.getAuthenticatedSession(originalUrl, any(), any()) } returns DataResult.Fail()
9999

100100
val result = getRepository().authenticateUrl(originalUrl)
101101

‎libs/horizon/src/test/java/com/instructure/horizon/features/moduleitemsequence/content/page/PageDetailsRepositoryTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,17 @@ class PageDetailsRepositoryTest {
133133
@Test
134134
fun `authenticateUrl returns authenticated URL`() = runTest {
135135
val session = AuthenticatedSession(sessionUrl = "https://authenticated.url")
136-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Success(session)
136+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(session)
137137

138138
val result = repository.authenticateUrl("https://example.com/page")
139139

140140
assertEquals("https://authenticated.url", result)
141-
coVerify { oAuthInterface.getAuthenticatedSession("https://example.com/page", any()) }
141+
coVerify { oAuthInterface.getAuthenticatedSession("https://example.com/page", any(), any()) }
142142
}
143143

144144
@Test
145145
fun `authenticateUrl returns original URL on failure`() = runTest {
146-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
146+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
147147

148148
val result = repository.authenticateUrl("https://example.com/page")
149149

@@ -153,7 +153,7 @@ class PageDetailsRepositoryTest {
153153
@Test
154154
fun `authenticateUrl returns original URL when session URL is null`() = runTest {
155155
val session = AuthenticatedSession(sessionUrl = "https://example.com/page/authenticated")
156-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Success(session)
156+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(session)
157157

158158
val result = repository.authenticateUrl("https://example.com/page")
159159

@@ -200,10 +200,10 @@ class PageDetailsRepositoryTest {
200200
@Test
201201
fun `authenticateUrl always uses forceNetwork`() = runTest {
202202
val session = AuthenticatedSession(sessionUrl = "https://authenticated.url")
203-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Success(session)
203+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Success(session)
204204

205205
repository.authenticateUrl("https://example.com")
206206

207-
coVerify { oAuthInterface.getAuthenticatedSession(any(), match { it.isForceReadFromNetwork }) }
207+
coVerify { oAuthInterface.getAuthenticatedSession(any(), match { it.isForceReadFromNetwork }, any()) }
208208
}
209209
}

‎libs/pandautils/src/test/java/com/instructure/pandautils/features/lti/LtiLaunchRepositoryTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class LtiLaunchRepositoryTest {
4545
@Before
4646
fun setup() {
4747
val urlCaptor = slot<String>()
48-
coEvery { oAuthInterface.getAuthenticatedSession(capture(urlCaptor), any()) } answers {
48+
coEvery { oAuthInterface.getAuthenticatedSession(capture(urlCaptor), any(), any()) } answers {
4949
DataResult.Success(AuthenticatedSession(sessionUrl = urlCaptor.captured))
5050
}
5151
}
@@ -117,7 +117,7 @@ class LtiLaunchRepositoryTest {
117117
@Test
118118
fun `Get authenticated url returns data when successful`() = runTest {
119119
val urlCaptor = slot<String>()
120-
coEvery { oAuthInterface.getAuthenticatedSession(capture(urlCaptor), any()) } answers {
120+
coEvery { oAuthInterface.getAuthenticatedSession(capture(urlCaptor), any(), any()) } answers {
121121
DataResult.Success(AuthenticatedSession(sessionUrl = urlCaptor.captured + "/authenticated"))
122122
}
123123

@@ -130,7 +130,7 @@ class LtiLaunchRepositoryTest {
130130

131131
@Test
132132
fun `Get authenticated url returns original url if request fails`() = runTest {
133-
coEvery { oAuthInterface.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
133+
coEvery { oAuthInterface.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
134134

135135
val url = "https://www.instructure.com"
136136

‎libs/pandautils/src/test/java/com/instructure/pandautils/utils/WebViewAuthenticatorTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ class WebViewAuthenticatorTest {
3535
@Test
3636
fun `Authenticate webviews when timestamp is older than an hour`() = runTest {
3737
every { apiPrefs.webViewAuthenticationTimestamp } returns System.currentTimeMillis() - 1000 * 60 * 61
38-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
38+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
3939

4040
webViewAuthenticator.authenticateWebViews(this, mockk())
4141
this.testScheduler.advanceUntilIdle()
4242

43-
coVerify { oAuthApi.getAuthenticatedSession(any(), any()) }
43+
coVerify { oAuthApi.getAuthenticatedSession(any(), any(), any()) }
4444
}
4545

4646
@Test
4747
fun `Do not authenticate webviews when timestamp is not older than an hour`() = runTest {
4848
every { apiPrefs.webViewAuthenticationTimestamp } returns System.currentTimeMillis()
49-
coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Fail()
49+
coEvery { oAuthApi.getAuthenticatedSession(any(), any(), any()) } returns DataResult.Fail()
5050

5151
webViewAuthenticator.authenticateWebViews(this, mockk())
5252

53-
coVerify(exactly = 0) { oAuthApi.getAuthenticatedSession(any(), any()) }
53+
coVerify(exactly = 0) { oAuthApi.getAuthenticatedSession(any(), any(), any()) }
5454
}
5555
}

0 commit comments

Comments
 (0)