From 4e87cdb7c5feb2635acbcb3b19e2f9768d8b5a1c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 2 Mar 2012 18:39:07 +0000 Subject: [PATCH] rename rule class git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1296374 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/web/test/parent/AbstractArchivaTest.java | 2 -- .../archiva/web/test/parent/AbstractSeleniumTest.java | 6 +++--- ...otCaptureRule.java => ArchivaSeleniumExecutionRule.java} | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) rename archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/{ScreenshotCaptureRule.java => ArchivaSeleniumExecutionRule.java} (98%) diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java index b06bcb256..42d9895b4 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java @@ -1,7 +1,5 @@ package org.apache.archiva.web.test.parent; -import org.apache.archiva.web.test.tools.ScreenshotCaptureRule; -import org.junit.Rule; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java index 786be69e0..25325b7d5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.web.test.parent; import com.thoughtworks.selenium.DefaultSelenium; import com.thoughtworks.selenium.Selenium; -import org.apache.archiva.web.test.tools.ScreenshotCaptureRule; +import org.apache.archiva.web.test.tools.ArchivaSeleniumExecutionRule; import org.junit.Assert; import org.junit.Rule; @@ -44,7 +44,7 @@ public abstract class AbstractSeleniumTest { @Rule - public ScreenshotCaptureRule screenshotCaptureRule = new ScreenshotCaptureRule(); + public ArchivaSeleniumExecutionRule archivaSeleniumExecutionRule = new ArchivaSeleniumExecutionRule(); public String browser = System.getProperty( "browser" ); @@ -70,7 +70,7 @@ public abstract class AbstractSeleniumTest p = new Properties(); p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" ) ); open( baseUrl, browser, seleniumHost, seleniumPort, maxWaitTimeInMs ); - screenshotCaptureRule.selenium = selenium; + archivaSeleniumExecutionRule.selenium = selenium; assertAdminCreated(); } diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ScreenshotCaptureRule.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ScreenshotCaptureRule.java rename to archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java index c96bc2ca8..f7a7eb681 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ScreenshotCaptureRule.java +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java @@ -28,7 +28,7 @@ import org.junit.runners.model.Statement; /** * @author Olivier Lamy */ -public class ScreenshotCaptureRule +public class ArchivaSeleniumExecutionRule implements MethodRule //TestRule { -- 2.39.5