From 90d2a01619c5ebeacbd7e743980fcfaa22e1b597 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Wed, 24 May 2023 13:23:15 +0200
Subject: [PATCH] Replace `ChromeJavascriptBrowser` annotation with
 `JavascriptBrowser` (#20535)

---
 .../util/ChromeJavascriptBrowser.java         | 34 -------------------
 .../example/cors/CorsExampleAdapterTest.java  | 10 +++---
 .../base/src/test/resources/arquillian.xml    |  7 ----
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ChromeJavascriptBrowser.java

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ChromeJavascriptBrowser.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ChromeJavascriptBrowser.java
deleted file mode 100644
index 51bab1e258..0000000000
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ChromeJavascriptBrowser.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.testsuite.util;
-
-import org.jboss.arquillian.drone.api.annotation.Qualifier;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author <a href="mailto:mabartos@redhat.com">Martin Bartos</a>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.PARAMETER})
-@Qualifier
-public @interface ChromeJavascriptBrowser {
-}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java
index dab673aa87..87f9fafff7 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java
@@ -32,7 +32,7 @@ import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest;
 import org.keycloak.testsuite.adapter.page.AngularCorsProductTestApp;
 import org.keycloak.testsuite.adapter.page.CorsDatabaseServiceTestApp;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
-import org.keycloak.testsuite.util.ChromeJavascriptBrowser;
+import org.keycloak.testsuite.util.JavascriptBrowser;
 import org.keycloak.testsuite.utils.arquillian.ContainerConstants;
 import org.keycloak.testsuite.auth.page.account.Account;
 import org.keycloak.testsuite.auth.page.login.OIDCLogin;
@@ -75,19 +75,19 @@ public class CorsExampleAdapterTest extends AbstractExampleAdapterTest {
 
     // Javascript browser needed, but not PhantomJS
     @Drone
-    @ChromeJavascriptBrowser
+    @JavascriptBrowser
     protected WebDriver jsDriver;
 
     @Page
-    @ChromeJavascriptBrowser
+    @JavascriptBrowser
     protected OIDCLogin jsDriverTestRealmLoginPage;
 
     @Page
-    @ChromeJavascriptBrowser
+    @JavascriptBrowser
     private AngularCorsProductTestApp jsDriverAngularCorsProductPage;
 
     @Page
-    @ChromeJavascriptBrowser
+    @JavascriptBrowser
     private Account jsDriverTestRealmAccount;
 
     @Deployment(name = AngularCorsProductTestApp.DEPLOYMENT_NAME, managed = false)
diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index 956e0616e1..2f744fa0d1 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -98,13 +98,6 @@
         <property name="downloadBinaries">${webdriverDownloadBinaries}</property>
     </extension>
 
-    <extension qualifier="webdriver-chromejavascriptbrowser">
-        <property name="browser">chrome</property>
-        <property name="chromeBinary">${chromeBinary}</property>
-        <property name="chromeArguments">${js.chromeArguments}</property>
-        <property name="chromeDriverVersion">${chromeDriverVersion}</property>
-    </extension>
-
     <extension qualifier="graphene-secondbrowser">
         <property name="browser">${browser}</property>
         <property name="firefoxBinary">${firefox_binary}</property>