From ac2f3a4e7b761736f49fb76a31cf609f586d1c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Kr=C3=A4hemann?= <joel.kraehemann@frentix.com>
Date: Mon, 3 Jun 2013 11:38:54 +0200
Subject: [PATCH] non-jira: removed experimental drone configuration files
---
.../course/nodes/feed/FunctionalBlogTest.java | 12 --
.../org/olat/test/ArquillianDeployments.java | 2 +-
.../arquillian/DroneStudentExtension.java | 36 ------
.../olat/util/browser/arquillian/Student.java | 38 ------
.../arquillian/StudentConfiguration.java | 118 ------------------
.../browser/arquillian/StudentFactory.java | 76 -----------
...boss.arquillian.core.spi.LoadableExtension | 1 -
...rg.jboss.arquillian.drone.spi.Configurator | 1 -
.../org.jboss.arquillian.drone.spi.Destructor | 1 -
...ss.arquillian.drone.spi.DroneConfiguration | 1 -
...rg.jboss.arquillian.drone.spi.Instantiator | 1 -
11 files changed, 1 insertion(+), 286 deletions(-)
delete mode 100644 src/test/java/org/olat/util/browser/arquillian/DroneStudentExtension.java
delete mode 100644 src/test/java/org/olat/util/browser/arquillian/Student.java
delete mode 100644 src/test/java/org/olat/util/browser/arquillian/StudentConfiguration.java
delete mode 100644 src/test/java/org/olat/util/browser/arquillian/StudentFactory.java
delete mode 100644 src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
delete mode 100644 src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Configurator
delete mode 100644 src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Destructor
delete mode 100644 src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.DroneConfiguration
delete mode 100644 src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Instantiator
diff --git a/src/test/java/org/olat/course/nodes/feed/FunctionalBlogTest.java b/src/test/java/org/olat/course/nodes/feed/FunctionalBlogTest.java
index 4612950f82b..0f46f171a0e 100644
--- a/src/test/java/org/olat/course/nodes/feed/FunctionalBlogTest.java
+++ b/src/test/java/org/olat/course/nodes/feed/FunctionalBlogTest.java
@@ -23,20 +23,13 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
-import java.util.UUID;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.lang.ArrayUtils;
-import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.drone.impl.DroneConfigurator;
-import org.jboss.arquillian.drone.selenium.configuration.SeleniumConfiguration;
-import org.jboss.arquillian.drone.selenium.factory.DefaultSeleniumFactory;
-import org.jboss.arquillian.drone.spi.DroneConfiguration;
-import org.jboss.arquillian.drone.spi.Instantiator;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -61,13 +54,8 @@ import org.olat.util.browser.Student1;
import org.olat.util.browser.Student2;
import org.olat.util.browser.Tutor1;
import org.olat.util.browser.Tutor2;
-import org.olat.util.browser.arquillian.Student;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import com.thoughtworks.selenium.DefaultSelenium;
-import com.thoughtworks.selenium.HttpCommandProcessor;
import com.thoughtworks.selenium.Selenium;
/**
diff --git a/src/test/java/org/olat/test/ArquillianDeployments.java b/src/test/java/org/olat/test/ArquillianDeployments.java
index 9df2649d647..380bf79579b 100644
--- a/src/test/java/org/olat/test/ArquillianDeployments.java
+++ b/src/test/java/org/olat/test/ArquillianDeployments.java
@@ -36,7 +36,7 @@ public class ArquillianDeployments {
public static final String WEBINF = "src/main/webapp/WEB-INF";
public static final String WEBINF_TOMCAT = "src/main/webapp-tomcat/WEB-INF";
public static final String TEST_RSRC = "src/test/resources";
- public static final String LIB_DIR = "target/openolat-lms-8.4-SNAPSHOT/WEB-INF/lib";
+ public static final String LIB_DIR = "target/openolat-lms-9.0-SNAPSHOT/WEB-INF/lib";
public static WebArchive createDeployment() {
diff --git a/src/test/java/org/olat/util/browser/arquillian/DroneStudentExtension.java b/src/test/java/org/olat/util/browser/arquillian/DroneStudentExtension.java
deleted file mode 100644
index 8bec5307b96..00000000000
--- a/src/test/java/org/olat/util/browser/arquillian/DroneStudentExtension.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.util.browser.arquillian;
-
-import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.jboss.arquillian.drone.spi.Configurator;
-import org.jboss.arquillian.drone.spi.Destructor;
-import org.jboss.arquillian.drone.spi.Instantiator;
-
-public class DroneStudentExtension implements LoadableExtension {
-
- @Override
- public void register(ExtensionBuilder builder) {
- builder.service(Instantiator.class, StudentFactory.class);
- builder.service(Destructor.class, StudentFactory.class);
- builder.service(Configurator.class, StudentFactory.class);
- }
-
-}
diff --git a/src/test/java/org/olat/util/browser/arquillian/Student.java b/src/test/java/org/olat/util/browser/arquillian/Student.java
deleted file mode 100644
index 8166f19da6e..00000000000
--- a/src/test/java/org/olat/util/browser/arquillian/Student.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.util.browser.arquillian;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.jboss.arquillian.drone.api.annotation.Qualifier;
-
-/**
- *
- * @author jkraehemann, joel.kraehemann@frentix.com, frentix.com
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.PARAMETER })
-@Qualifier
-public @interface Student {
-
-}
diff --git a/src/test/java/org/olat/util/browser/arquillian/StudentConfiguration.java b/src/test/java/org/olat/util/browser/arquillian/StudentConfiguration.java
deleted file mode 100644
index 0a189076773..00000000000
--- a/src/test/java/org/olat/util/browser/arquillian/StudentConfiguration.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.util.browser.arquillian;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
-import org.jboss.arquillian.drone.configuration.ConfigurationMapper;
-import org.jboss.arquillian.drone.selenium.configuration.SeleniumConfiguration;
-import org.jboss.arquillian.drone.spi.DroneConfiguration;
-
-public class StudentConfiguration implements DroneConfiguration<StudentConfiguration> {
- public static final String CONFIGURATION_NAME = "student";
-
- private int serverPort = 14444;
-
- private String serverHost = "localhost";
-
- private String url = "http://localhost:8080";
-
- private int timeout = 60000;
-
- private int speed = 0;
-
- private String browser = "*firefox";
-
- private int count = 2;
-
- public StudentConfiguration(){
- }
-
- public String getConfigurationName() {
- return CONFIGURATION_NAME;
- }
-
- @Override
- public StudentConfiguration configure(ArquillianDescriptor descriptor,
- Class<? extends Annotation> qualifier) {
- ConfigurationMapper.fromArquillianDescriptor(descriptor, this, qualifier);
- return ConfigurationMapper.fromSystemConfiguration(this, qualifier);
- }
-
- public int getServerPort() {
- return serverPort;
- }
-
- public void setServerPort(int serverPort) {
- this.serverPort = serverPort;
- }
-
- public String getServerHost() {
- return serverHost;
- }
-
- public void setServerHost(String serverHost) {
- this.serverHost = serverHost;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public int getTimeout() {
- return timeout;
- }
-
- public void setTimeout(int timeout) {
- this.timeout = timeout;
- }
-
- public int getSpeed() {
- return speed;
- }
-
- public void setSpeed(int speed) {
- this.speed = speed;
- }
-
- public String getBrowser() {
- return browser;
- }
-
- public void setBrowser(String browser) {
- this.browser = browser;
- }
-
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
-
-}
diff --git a/src/test/java/org/olat/util/browser/arquillian/StudentFactory.java b/src/test/java/org/olat/util/browser/arquillian/StudentFactory.java
deleted file mode 100644
index 67f9b3e3c41..00000000000
--- a/src/test/java/org/olat/util/browser/arquillian/StudentFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.util.browser.arquillian;
-
-import java.lang.annotation.Annotation;
-
-import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
-import org.jboss.arquillian.drone.spi.Configurator;
-import org.jboss.arquillian.drone.spi.Destructor;
-import org.jboss.arquillian.drone.spi.Instantiator;
-
-import com.thoughtworks.selenium.DefaultSelenium;
-
-public class StudentFactory
- implements Configurator<DefaultSelenium[],StudentConfiguration>,
- Instantiator<DefaultSelenium[],StudentConfiguration>,
- Destructor<DefaultSelenium[]>
-{
-
- @Override
- public int getPrecedence() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public DefaultSelenium[] createInstance(StudentConfiguration configuration) {
-
- DefaultSelenium[] seleniumArray = new DefaultSelenium[configuration.getCount()];
-
- for(int i = 0; i < configuration.getCount(); i++){
- DefaultSelenium selenium =
- seleniumArray[i] = new DefaultSelenium(configuration.getServerHost(),
- configuration.getServerPort(),
- configuration.getBrowser(),
- configuration.getUrl());
- selenium.start();
- selenium.setSpeed(String.valueOf(configuration.getSpeed()));
- selenium.setTimeout(String.valueOf(configuration.getTimeout()));
- }
-
- return(seleniumArray);
- }
-
- @Override
- public void destroyInstance(DefaultSelenium[] instance) {
- for(DefaultSelenium currentInstance: instance){
- currentInstance.close();
- currentInstance.stop();
- }
- }
-
- @Override
- public StudentConfiguration createConfiguration(
- ArquillianDescriptor descriptor,
- Class<? extends Annotation> qualifier) {
- return new StudentConfiguration().configure(descriptor, qualifier);
- }
-}
diff --git a/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
deleted file mode 100644
index 2bc81684b99..00000000000
--- a/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
+++ /dev/null
@@ -1 +0,0 @@
-org.olat.util.browser.arquillian.DroneStudentExtension
\ No newline at end of file
diff --git a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Configurator b/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Configurator
deleted file mode 100644
index 18bd3038d9b..00000000000
--- a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Configurator
+++ /dev/null
@@ -1 +0,0 @@
-org.olat.util.browser.arquillian.StudentFactory
diff --git a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Destructor b/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Destructor
deleted file mode 100644
index 18bd3038d9b..00000000000
--- a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Destructor
+++ /dev/null
@@ -1 +0,0 @@
-org.olat.util.browser.arquillian.StudentFactory
diff --git a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.DroneConfiguration b/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.DroneConfiguration
deleted file mode 100644
index 873f199adff..00000000000
--- a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.DroneConfiguration
+++ /dev/null
@@ -1 +0,0 @@
-org.olat.util.browser.arquillian.StudentConfiguration
diff --git a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Instantiator b/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Instantiator
deleted file mode 100644
index 18bd3038d9b..00000000000
--- a/src/test/resources/META-INF/services/org.jboss.arquillian.drone.spi.Instantiator
+++ /dev/null
@@ -1 +0,0 @@
-org.olat.util.browser.arquillian.StudentFactory
--
GitLab