fix(test): further Kotlin and execution changes

zanata · Aug 29, 2018 · bb39e38 · bb39e38
1 parent 1d0cee0
commit bb39e38
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 171 deletions.
diff --git a/server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.kt b/server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.kt
@@ -129,11 +129,15 @@ class ServerSettingsTest : ZanataTestCase() {
 
     @Test
     fun unsetTermsOfUseURL() {
-        val registerPage = LoginWorkFlow().signIn("admin", "admin")
+        val registerPage = LoginWorkFlow()
+                .signIn("admin", "admin")
                 .goToAdministration()
                 .goToServerConfigPage()
                 .inputTermsOfUseURL("http://www.test.com")
                 .save()
+                .goToHomePage()
+                .goToAdministration()
+                .goToServerConfigPage()
                 .inputTermsOfUseURL("")
                 .save()
                 .logout()

diff --git a/server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.kt b/server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.kt
@@ -48,9 +48,8 @@ class LanguageCTest : ZanataTestCase() {
     }
 
     @Trace(summary = "Translator can search for language",
-            testPlanIds = intArrayOf(5681), testCaseIds = intArrayOf(5786))
+            testPlanIds = [5681], testCaseIds = [5786])
     @Test
-    @Throws(Exception::class)
     fun searchLanguage() {
         val language = "fr"
         val languagesPage = BasicWorkFlow()

diff --git a/server/functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.kt b/server/functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.kt
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.DisplayName
 import org.joda.time.DateTime
 import org.joda.time.Duration
 import org.joda.time.format.PeriodFormatterBuilder
-import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.ExtendWith
+import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.zanata.page.WebDriverFactory
 import org.zanata.util.AllowAnonymousExtension
@@ -43,12 +43,17 @@ import org.zanata.util.ZanataRestCaller
  * @author Damian Jansen [djansen@redhat.com](mailto:djansen@redhat.com)
  */
 @ExtendWith(LoggingExtension::class,
-        SampleDataExtension::class,
         AllowAnonymousExtension::class,
-        EnsureLogoutExtension::class)
+        EnsureLogoutExtension::class,
+        SampleDataExtension::class)
 @DisplayName("Zanata Functional Test")
 open class ZanataTestCase {
 
+    // Alternative method
+    // @JvmField
+    // @RegisterExtension
+    // val sampleDataExtension = SampleDataExtension()
+
     private var testFunctionStart = DateTime()
     var zanataRestCaller = ZanataRestCaller()
 

diff --git a/.../zanata/util/AllowAnonymousExtension.java → ...rg/zanata/util/AllowAnonymousExtension.kt b/.../zanata/util/AllowAnonymousExtension.java → ...rg/zanata/util/AllowAnonymousExtension.kt
@@ -18,33 +18,30 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
  * site: http://www.fsf.org.
  */
-package org.zanata.util;
+package org.zanata.util
 
-import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
-import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
-import static org.zanata.util.SampleDataResourceClient.allowAnonymousUser;
-import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback
+import org.junit.jupiter.api.extension.BeforeTestExecutionCallback
+import org.zanata.util.SampleDataResourceClient.allowAnonymousUser
+import org.junit.jupiter.api.extension.ExtensionContext
 
 /**
  * This will allow anonymous user to access Zanata read only resources.
- * @author Patrick Huang <a
- *         href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
+ * @author Patrick Huang [pahuang@redhat.com](mailto:pahuang@redhat.com)
  */
-public class AllowAnonymousExtension implements BeforeTestExecutionCallback,
-        AfterTestExecutionCallback {
+class AllowAnonymousExtension : BeforeTestExecutionCallback, AfterTestExecutionCallback {
 
 
-    @Override
-    public void beforeTestExecution(ExtensionContext context) {
-        allowAnonymousUser(true);
+    override fun beforeTestExecution(context: ExtensionContext) {
+        SampleDataResourceClient.allowAnonymousUser(true)
     }
 
-    @Override
-    public void afterTestExecution(ExtensionContext context) {
+    override fun afterTestExecution(context: ExtensionContext) {
         try {
-            allowAnonymousUser(false);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+            SampleDataResourceClient.allowAnonymousUser(false)
+        } catch (e: Exception) {
+            throw RuntimeException(e)
         }
+
     }
 }
diff --git a/server/functional-test/src/test/java/org/zanata/util/EnsureLogoutExtension.kt b/server/functional-test/src/test/java/org/zanata/util/EnsureLogoutExtension.kt
@@ -31,11 +31,9 @@ import org.zanata.workflow.BasicWorkFlow
  * @author Damian Jansen [djansen@redhat.com](mailto:djansen@redhat.com)
  * @author Patrick Huang [pahuang@redhat.com](mailto:pahuang@redhat.com)
  */
-class EnsureLogoutExtension : BeforeTestExecutionCallback, AfterTestExecutionCallback {
-
-    override fun beforeTestExecution(context: ExtensionContext) {
-        println("LOG OUT IF LOGGED IN\n\n")
+class EnsureLogoutExtension : BeforeEachCallback, AfterTestExecutionCallback {
 
+    override fun beforeEach(context: ExtensionContext) {
         logoutIfLoggedIn()
     }
 

diff --git a/server/functional-test/src/test/java/org/zanata/util/SampleDataExtension.kt b/server/functional-test/src/test/java/org/zanata/util/SampleDataExtension.kt
@@ -20,7 +20,7 @@
  */
 package org.zanata.util
 
-import org.junit.jupiter.api.extension.BeforeTestExecutionCallback
+import org.junit.jupiter.api.extension.BeforeEachCallback
 import org.junit.jupiter.api.extension.ExtensionContext
 import org.zanata.util.SampleDataResourceClient.deleteExceptEssentialData
 import org.zanata.util.SampleDataResourceClient.makeSampleLanguages
@@ -37,9 +37,9 @@ import org.zanata.util.SampleDataResourceClient.userJoinsLanguageTeam
  * @author Patrick Huang [pahuang@redhat.com](mailto:pahuang@redhat.com)
  * @author Damian Jansen [djansen@redhat.com](mailto:djansen@redhat.com)
  */
-class SampleDataExtension : BeforeTestExecutionCallback {
+class SampleDataExtension : BeforeEachCallback {
 
-    override fun beforeTestExecution(context: ExtensionContext) {
+    override fun beforeEach(context: ExtensionContext?) {
         deleteExceptEssentialData()
         makeSampleUsers()
         makeSampleLanguages()

diff --git a/server/functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java b/server/functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java