From: Olivier Lamy Date: Fri, 2 Mar 2012 13:15:30 +0000 (+0000) Subject: missed to add tooling class around junit for screenshot capture X-Git-Tag: archiva-1.4-M3~1134 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=54777fc53bb8c5a88341763d6d0b5e9b9fb75066;p=archiva.git missed to add tooling class around junit for screenshot capture git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1296189 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/AfterSeleniumFailure.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/AfterSeleniumFailure.java new file mode 100644 index 000000000..a461be4d0 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/AfterSeleniumFailure.java @@ -0,0 +1,38 @@ +package org.apache.archiva.web.test.tools; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +/** + * @author Olivier Lamy + */ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation to mark a method being called after a failure + * + */ +@Retention( RetentionPolicy.RUNTIME) +@Target( ElementType.METHOD) +public @interface AfterSeleniumFailure +{ +} diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumRunner.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumRunner.java new file mode 100644 index 000000000..e3d81bbe6 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumRunner.java @@ -0,0 +1,60 @@ +package org.apache.archiva.web.test.tools; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import org.junit.runners.BlockJUnit4ClassRunner; +import org.junit.runners.model.FrameworkMethod; +import org.junit.runners.model.InitializationError; +import org.junit.runners.model.Statement; + +import java.util.List; + +/** + * @author Olivier Lamy + */ +public class ArchivaSeleniumRunner + extends BlockJUnit4ClassRunner +{ + + /** + * @param clazz Test class + * @throws InitializationError if the test class is malformed. + */ + public ArchivaSeleniumRunner( Class clazz ) + throws InitializationError + { + super( clazz ); + } + + /* + * FIXME move that to a Rule. + */ + @Override + protected Statement withAfters( FrameworkMethod method, Object target, Statement statement ) + { + statement = super.withAfters( method, target, statement ); + return withAfterFailures( method, target, statement ); + } + + protected Statement withAfterFailures( FrameworkMethod method, Object target, Statement statement ) + { + List failures = getTestClass().getAnnotatedMethods( AfterSeleniumFailure.class ); + return new RunAfterSeleniumFailures( statement, failures, target ); + } +} diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/RunAfterSeleniumFailures.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/RunAfterSeleniumFailures.java new file mode 100644 index 000000000..a817876ba --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/RunAfterSeleniumFailures.java @@ -0,0 +1,85 @@ +package org.apache.archiva.web.test.tools; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + + +import org.junit.runners.model.FrameworkMethod; +import org.junit.runners.model.MultipleFailureException; +import org.junit.runners.model.Statement; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Olivier Lamy + */ +public class RunAfterSeleniumFailures + extends Statement +{ + + private final Statement next; + + private final Object target; + + private final List afterFailures; + + public RunAfterSeleniumFailures( Statement next, List afterFailures, Object target ) + { + this.next = next; + this.afterFailures = afterFailures; + this.target = target; + } + + @Override + public void evaluate() + throws Throwable + { + List errors = new ArrayList(); + errors.clear(); + try + { + next.evaluate(); + } + catch ( Throwable t ) + { + errors.add( t ); + for ( FrameworkMethod each : afterFailures ) + { + try + { + each.invokeExplosively( target, t ); + } + catch ( Throwable t2 ) + { + errors.add( t2 ); + } + } + } + if ( errors.isEmpty() ) + { + return; + } + if ( errors.size() == 1 ) + { + throw errors.get( 0 ); + } + throw new MultipleFailureException( errors ); + } + +}