summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-03-02 18:39:07 +0000
committerOlivier Lamy <olamy@apache.org>2012-03-02 18:39:07 +0000
commit4e87cdb7c5feb2635acbcb3b19e2f9768d8b5a1c (patch)
treed695b3e6917ab630a57e308a61f393a7cf11c11e
parentfe746a16a908d7d4085206f57264af3302fbac44 (diff)
downloadarchiva-4e87cdb7c5feb2635acbcb3b19e2f9768d8b5a1c.tar.gz
archiva-4e87cdb7c5feb2635acbcb3b19e2f9768d8b5a1c.zip
rename rule class
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1296374 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java6
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java (renamed from archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ScreenshotCaptureRule.java)2
3 files changed, 4 insertions, 6 deletions
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
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
{