From: Brett Porter <brett@apache.org>
Date: Fri, 12 Feb 2010 11:57:15 +0000 (+0000)
Subject: move to using a non-suite-xml as it's the only way to run the exclusion without makin... 
X-Git-Tag: archiva-1.4-M1~1017^2~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b8cee9b0eff7df7a8b7d5e1887bfa3cb9805ea57;p=archiva.git

move to using a non-suite-xml as it's the only way to run the exclusion without making multiple copies


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909372 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 8c4be3177..a1548bb1d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -150,12 +150,11 @@
         <configuration>
           <properties>
             <!--
-              Use this instead of suiteXmlFiles so that we can add the exclusion, as it is only accepted if you use
-              the 'all command line parameters' mode.
+              Use this instead of suiteXmlFiles so that we can add the exclusion, as it is only accepted without suiteXmlFiles
             -->
             <property>
-              <name>suitename</name>
-              <value>${basedir}/src/test/testng/config/testng.xml</value>
+              <name>listener</name>
+              <value>org.apache.archiva.web.test.listener.CaptureScreenShotsListener</value>
             </property>
             <property>
               <name>excludegroups</name>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
deleted file mode 100644
index d0095c1ba..000000000
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<!--
-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.
--->
-
-<suite name="ArchivaTest" verbose="1">
-	<listeners>
-	        <listener class-name="org.apache.archiva.web.test.listener.CaptureScreenShotsListener"/>
-	</listeners>
-	
-	<test name="AdminTest" enabled="true">
-		<groups>
-			<run>
-				<include name="about" />
-				<include name= "login" />
-				<include name= "userroles" />
-				<include name= "reposcan" />
-				<include name= "artifactmanagement" />
-				<include name= "search" />
-				<include name= "auditlogsreport" />
-				<include name= "browse" />
-				<include name= "reports" />
-				<include name= "virtualrepository" />
-				<include name= "networkproxies" />
-				<include name= "repository" />
-				<include name= "appearance" />
-				<include name= "findartifact" />
-				<include name= "legacysupport" />
-			</run>
-		</groups>
-		<packages>
-			<package name="org.apache.archiva.web.test" />
-		</packages>
-	</test>
-</suite>