Convert core-web tests to kotlin and remove mockito/mockito-kotlin, a…

…ssertj

CHANGELOG.asciidoc

@@ -71,6 +71,7 @@ NOTE: References to user stories are in the form Iteration/Story-Number.
 
 .Removed
 - apache-io, commons-lang3, commons-collections4, jool
+- {url-issues}177[#177] Removed mockito, mockito-kotlin, assertj. Converted all tests to kotlin.
 
 .Fixed
 

buildSrc/src/main/kotlin/Lib.kt

@@ -139,15 +139,6 @@ object Lib {
 
     fun junit5(module: String = "") = Dep("org.junit.jupiter", "junit-jupiter${if (module.isNotBlank()) "-$module" else ""}", junit5Version)
 
-    @Deprecated("Replace with mockk")
-    fun mockito3(module: String) = Dep("org.mockito", "mockito-$module", mockitoVersion)
-
-    @Deprecated("Replace with mockk")
-    fun mockitoKotlin() = Dep("com.nhaarman.mockitokotlin2", "mockito-kotlin", mockitoKotlinVersion)
-
-    @Deprecated("Replace with kluent")
-    fun assertj() = Dep("org.assertj", "assertj-core")
-
     fun testcontainers(module: String) = Dep("org.testcontainers", module, testcontainersVersion)
     fun equalsverifier() = Dep("nl.jqno.equalsverifier", "equalsverifier", equalsverifierVersion)
     fun spek(module: String) = Dep("org.spekframework.spek2", "spek-$module", spekVersion)

common/common-wicket/src/main/java/ch/difty/scipamato/common/web/AbstractPage.java

@@ -64,7 +64,7 @@ protected Navbar getNavBar() {
         return navbar;
     }
 
-    @NotNull
+    @Nullable
     public NotificationPanel getFeedbackPanel() {
         return feedbackPanel;
     }

core/core-persistence-jooq/src/test/kotlin/ch/difty/scipamato/core/persistence/Extensions.kt

@@ -2,4 +2,4 @@ package ch.difty.scipamato.core.persistence
 
 import io.mockk.mockk
 
-inline fun <reified T : Any> mock(): T = mockk<T>()!!
+inline fun <reified T : Any> mock(): T = mockk<T>()

core/core-web/build.gradle.kts

@@ -79,11 +79,6 @@ dependencies {
     testImplementation(Lib.validationApi())
     testImplementation(Lib.lombok())
     testAnnotationProcessor(Lib.lombok())
-
-    testImplementation(Lib.assertj())
-    testImplementation(Lib.mockito3("core"))
-    testImplementation(Lib.mockitoKotlin())
-    testImplementation(Lib.mockito3("junit-jupiter"))
 }
 
 idea {

core/core-web/src/main/java/ch/difty/scipamato/core/web/codeclass/CodeClassEditPage.java

@@ -42,7 +42,7 @@ public class CodeClassEditPage extends DefinitionEditPage<CodeClassDefinition, C
         super(model, callingPageRef);
     }
 
-    @Nullable
+    @NotNull
     @Override
     protected CodeClassDefinition persistModel() {
         return service.saveOrUpdate(getModelObject());

core/core-web/src/main/java/ch/difty/scipamato/core/web/common/SelfUpdatingPage.java

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.common;
 
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -83,7 +84,9 @@ protected void implSpecificOnInitialize() {
      * too much information.
      */
     protected void tuneDownFeedbackMessages() {
-        getFeedbackPanel().setMaxMessages(1);
+        final NotificationPanel panel = getFeedbackPanel();
+        if (panel != null)
+            panel.setMaxMessages(1);
     }
 
     /**
@@ -92,6 +95,8 @@ protected void tuneDownFeedbackMessages() {
      * indicated to the user in full detail.
      */
     protected void resetFeedbackMessages() {
-        getFeedbackPanel().setMaxMessages(Integer.MAX_VALUE);
+        final NotificationPanel panel = getFeedbackPanel();
+        if (panel != null)
+            panel.setMaxMessages(Integer.MAX_VALUE);
     }
 }

core/core-web/src/main/java/ch/difty/scipamato/core/web/paper/search/SearchOrderSelectorPanel.kt

@@ -174,20 +174,23 @@ class SearchOrderSelectorPanel internal constructor(id: String, model: IModel<Se
     }
 
     private fun saveOrUpdate() {
-        searchOrderService.saveOrUpdate(modelObject!!)?.let {
-            form.defaultModelObject = it
+        modelObject?.let { mo ->
+            searchOrderService.saveOrUpdate(mo)?.let { saved ->
+                form.defaultModelObject = saved
+            }
         }
     }
 
     private val isModelSelected: Boolean
         get() = modelObject?.id != null
 
     private val isUserEntitled: Boolean
-        get() = modelObject != null &&
+        get() = modelObject?.let { mo ->
             if (isViewMode)
-                !modelObject!!.isGlobal && modelObject!!.owner == activeUser.id
+                !mo.isGlobal && mo.owner == activeUser.id
             else
-                modelObject!!.owner == activeUser.id
+                mo.owner == activeUser.id
+        } ?: false
 
     private fun hasExclusions(): Boolean =
         isModelSelected && modelObject!!.excludedPaperIds.isNotEmpty()
@@ -219,7 +222,8 @@ class SearchOrderSelectorPanel internal constructor(id: String, model: IModel<Se
         showExcluded = object : AjaxCheckBox(id) {
             override fun onConfigure() {
                 super.onConfigure()
-                if (isVisible && !hasExclusions()) modelObject = false
+                if (isVisible && !hasExclusions() && modelObject != null)
+                    modelObject = false
                 isVisible = hasExclusions()
             }
 

core/core-web/src/main/java/ch/difty/scipamato/core/web/user/ChangePasswordUser.java

@@ -63,7 +63,7 @@ public User toUser() {
         return user;
     }
 
-    @NotNull
+    @Nullable
     public Integer getId() {
         return user.getId();
     }
@@ -72,7 +72,7 @@ public void setId(Integer id) {
         user.setId(id);
     }
 
-    @NotNull
+    @Nullable
     public String getUserName() {
         return user.getUserName();
     }
@@ -81,7 +81,7 @@ public void setUserName(final String value) {
         user.setUserName(value);
     }
 
-    @NotNull
+    @Nullable
     public String getFirstName() {
         return user.getFirstName();
     }
@@ -90,7 +90,7 @@ public void setFirstName(final String value) {
         user.setFirstName(value);
     }
 
-    @NotNull
+    @Nullable
     public String getLastName() {
         return user.getLastName();
     }
@@ -99,7 +99,7 @@ public void setLastName(final String value) {
         user.setLastName(value);
     }
 
-    @NotNull
+    @Nullable
     public String getEmail() {
         return user.getEmail();
     }
@@ -142,12 +142,12 @@ public void removeRole(final Role role) {
         user.removeRole(role);
     }
 
-    @NotNull
+    @Nullable
     public String getFullName() {
         return user.getFullName();
     }
 
-    @NotNull
+    @Nullable
     public String getDisplayValue() {
         return user.getDisplayValue();
     }