Fix tests for type change

NDLANO · Apr 17, 2024 · 6d3b9e8 · 6d3b9e8
1 parent 66040f8
commit 6d3b9e8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/article-api/src/test/scala/no/ndla/articleapi/service/ReadServiceTest.scala b/article-api/src/test/scala/no/ndla/articleapi/service/ReadServiceTest.scala
@@ -202,7 +202,7 @@ class ReadServiceTest extends UnitSuite with TestEnvironment {
     val article1    = TestData.sampleDomainArticle.copy(id = Some(1), availability = Availability.everyone)
     val article2    = TestData.sampleDomainArticle.copy(id = Some(2), availability = Availability.everyone)
     val article3    = TestData.sampleDomainArticle.copy(id = Some(3), availability = Availability.teacher)
-    val teacherUser = FeideExtendedUserInfo("", eduPersonAffiliation = Seq("employee"), None, "", Seq.empty)
+    val teacherUser = FeideExtendedUserInfo("", eduPersonAffiliation = Seq("employee"), None, "", None)
 
     when(feideApiClient.getFeideExtendedUser(any)).thenReturn(Success(teacherUser))
     when(articleRepository.withIds(any, any, any)(any))
@@ -229,7 +229,7 @@ class ReadServiceTest extends UnitSuite with TestEnvironment {
     val article1    = TestData.sampleDomainArticle.copy(id = Some(1), availability = Availability.everyone)
     val article2    = TestData.sampleDomainArticle.copy(id = Some(2), availability = Availability.everyone)
     val article3    = TestData.sampleDomainArticle.copy(id = Some(3), availability = Availability.teacher)
-    val teacherUser = FeideExtendedUserInfo("", eduPersonAffiliation = Seq("student"), None, "", Seq.empty)
+    val teacherUser = FeideExtendedUserInfo("", eduPersonAffiliation = Seq("student"), None, "", None)
 
     when(feideApiClient.getFeideExtendedUser(any)).thenReturn(Success(teacherUser))
     when(articleRepository.withIds(any, any, any)(any))

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/ArenaTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/ArenaTest.scala
@@ -71,7 +71,9 @@ class ArenaTest
       when(feideApiClient.getFeideAccessTokenOrFail(any)).thenReturn(Success("notimportante"))
       when(feideApiClient.getFeideGroups(any)).thenReturn(Success(Seq.empty))
       when(feideApiClient.getFeideExtendedUser(any))
-        .thenReturn(Success(FeideExtendedUserInfo("", Seq("employee"), None, "[email protected]", Seq("[email protected]"))))
+        .thenReturn(
+          Success(FeideExtendedUserInfo("", Seq("employee"), None, "[email protected]", Some(Seq("[email protected]"))))
+        )
       when(feideApiClient.getOrganization(any)).thenReturn(Success("zxc"))
       when(configService.getMyNDLAEnabledOrgs).thenReturn(Success(List("zxc")))
       when(clock.now()).thenReturn(someDate)

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala
@@ -71,7 +71,9 @@ class CloneFolderTest
       when(feideApiClient.getFeideGroups(any)).thenReturn(Success(Seq.empty))
       when(feideApiClient.getFeideExtendedUser(any))
         .thenReturn(
-          Success(FeideExtendedUserInfo("", Seq("employee"), Some("employee"), "[email protected]", Seq("[email protected]")))
+          Success(
+            FeideExtendedUserInfo("", Seq("employee"), Some("employee"), "[email protected]", Some(Seq("[email protected]")))
+          )
         )
       when(feideApiClient.getOrganization(any)).thenReturn(Success("zxc"))
       when(clock.now()).thenReturn(NDLADate.of(2017, 1, 1, 1, 59))

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/service/UserServiceTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/service/UserServiceTest.scala
@@ -202,7 +202,7 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       eduPersonAffiliation = Seq("student"),
       None,
       eduPersonPrincipalName = "[email protected]",
-      mail = Seq("[email protected]")
+      mail = Some(Seq("[email protected]"))
     )
 
     when(configService.getMyNDLAEnabledOrgs).thenReturn(Success(List.empty))
@@ -332,7 +332,7 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       eduPersonAffiliation = Seq.empty,
       None,
       eduPersonPrincipalName = "[email protected]",
-      mail = Seq("[email protected]")
+      mail = Some(Seq("[email protected]"))
     )
     val apiUserData = api.MyNDLAUser(
       id = 42,

diff --git a/network/src/test/scala/no/ndla/network/clients/FeideApiClientTest.scala b/network/src/test/scala/no/ndla/network/clients/FeideApiClientTest.scala
@@ -13,7 +13,7 @@ import no.ndla.network.UnitSuite
 class FeideApiClientTest extends UnitSuite {
 
   test("testFeideExtendedUserInfo roles") {
-    val user = FeideExtendedUserInfo("", Seq.empty, None, "", Seq(""))
+    val user = FeideExtendedUserInfo("", Seq.empty, None, "", None)
     assert(!user.isTeacher)
 
     val member = user.copy(eduPersonAffiliation = Seq("member"))

diff --git a/search-api/src/test/scala/no/ndla/searchapi/controller/SearchControllerTest.scala b/search-api/src/test/scala/no/ndla/searchapi/controller/SearchControllerTest.scala
@@ -249,7 +249,7 @@ class SearchControllerTest extends UnitSuite with TestEnvironment with TapirCont
       eduPersonAffiliation = Seq("employee", "staff"),
       eduPersonPrimaryAffiliation = None,
       eduPersonPrincipalName = "[email protected]",
-      mail = Seq("[email protected]")
+      mail = Some(Seq("[email protected]"))
     )
     val multiResult = domain.SearchResult(0, None, 10, "nn", Seq.empty, Seq.empty, Seq.empty, None)
     when(feideApiClient.getFeideExtendedUser(any)).thenReturn(Success(teacheruser))