[Jpackage-commits] dist/testng/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 testng-5.6.pom, NONE, 1.1 testng-test-14-BaseTest.patch, NONE, 1.1 testng-test-14-v4-BaseTest.patch, NONE, 1.1 testng-test-BaseTest.patch, NONE, 1.1 testng-test-v4-BaseTest.patch, NONE, 1.1 testng.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 22:09:49 CEST 2008


Update of /home/projects/jpackage/cvs/dist/testng/devel
In directory ryu.zarb.org:/tmp/cvs-serv13657/devel

Modified Files:
	.cvsignore sources 
Added Files:
	testng-5.6.pom testng-test-14-BaseTest.patch 
	testng-test-14-v4-BaseTest.patch testng-test-BaseTest.patch 
	testng-test-v4-BaseTest.patch testng.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: testng-test-v4-BaseTest.patch ---
--- test/v4/src/test/BaseTest.java.sav1	2007-12-10 15:04:24.000000000 +0100
+++ test/v4/src/test/BaseTest.java	2007-12-10 15:04:39.000000000 +0100
@@ -302,7 +302,7 @@
      * @see org.testng.ITestRunnerFactory#newTestRunner(org.testng.ISuite, org.testng.xml.XmlTest)
      */
     public TestRunner newTestRunner(ISuite suite, XmlTest test) {
-      TestRunner testRunner = new TestRunner(suite, test, false);
+      TestRunner testRunner = new TestRunner(suite, test);
       
       testRunner.addTestListener(new TestHTMLReporter());
       testRunner.addTestListener(new JUnitXMLReporter());

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/testng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 20:09:09 -0000	1.1
--- .cvsignore	28 May 2008 20:09:47 -0000	1.2
***************
*** 0 ****
--- 1,3 ----
+ testng-5.6.zip
+ testng-test-14.tar.gz
+ testng-test.tar.gz

--- NEW FILE: testng.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section free

Name:           testng
Version:        5.6
Release:        1jpp
Epoch:          0
Summary:        TestNG
License:        Apache Software License 2.0
Url:            http://testng.org
Source0:        http://testng.org/testng-5.6.zip
Source1:        testng-test.tar.gz
# svn export http://testng.googlecode.com/svn/trunk/test/
Source2:        testng-test-14.tar.gz
# svn export http://testng.googlecode.com/svn/trunk/test-14/
Source3:        %{name}-%{version}.pom

Patch0:         testng-test-BaseTest.patch
Patch1:         testng-test-v4-BaseTest.patch
Patch2:         testng-test-14-BaseTest.patch
Patch3:         testng-test-14-v4-BaseTest.patch

Group:          Development/Testing
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit
BuildRequires:  backport-util-concurrent
BuildRequires:  bsh2
BuildRequires:  qdox
BuildRequires:  xalan-j2
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif
Requires:  backport-util-concurrent
Requires:  bsh2
Requires:  qdox

%description
TestNG is a testing framework inspired from JUnit and NUnit
but introducing some new functionalities that make it more 
powerful and easier to use, such as:
- JDK 5 Annotations (JDK 1.4 is also supported with JavaDoc 
  annotations). 
- Flexible test configuration. 
- Support for data-driven testing (with @DataProvider). 
- Support for parameters. 
- Allows distribution of tests on slave machines. 
- Powerful execution model (no more TestSuite). 
- Supported by a variety of tools and plug-ins (Eclipse, 
  IDEA, Maven, etc...). 
- Embeds BeanShell for further flexibility. 
- Default JDK functions for runtime and logging 
  (no dependencies). 
- Dependent methods for application server testing. 
TestNG is designed to cover all categories of tests:  
unit, functional, end-to-end, integration, etc...



%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}.

%prep
%setup -q -c
gzip -dc %{SOURCE1} | tar xf -
gzip -dc %{SOURCE2} | tar xf -
rm test/src/test/invocationcount/DataProviderFalseFalseTest.java
rm test/src/test/invocationcount/DataProviderFalseTrueTest.java
rm test/src/test/invocationcount/DataProviderTrueFalseTest.java
rm test/src/test/invocationcount/DataProviderTrueTrueTest.java
rm test/src/test/invocationcount/FailedInvocationCountTest.java
rm test/src/test/invocationcount/FailedInvocationCount2.java
rm test/src/test/invocationcount/FirstAndLastTimeTest.java
rm test/src/test/invocationcount/InvocationCountFalseFalseTest.java
rm test/src/test/invocationcount/InvocationCountFalseTrueTest.java
rm test/src/test/invocationcount/InvocationCountTrueFalseTest.java
rm test/src/test/invocationcount/InvocationCountTrueTrueTest.java
# remove all binary libs
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done

ln -sf $(build-classpath backport-util-concurrent) 3rdparty/backport-util-concurrent-2.2.jar
ln -sf $(build-classpath bsh2/bsh) 3rdparty/bsh-2.0b4.jar
ln -sf $(build-classpath qdox) 3rdparty/qdox-1.6.1.jar
ln -sf $(build-classpath junit) 3rdparty/junit.jar

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
export CLASSPATH=$(build-classpath xalan-j2-serializer)
ant dev javadocs



%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}

install -m 644 %{name}-%{version}-jdk14.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jdk14-%{version}.jar
%add_to_maven_depmap org.testng %{name}-jdk14 %{version} JPP %{name}-jdk14
install -m 644 %{name}-%{version}-jdk15.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jdk15-%{version}.jar
%add_to_maven_depmap org.testng %{name}-jdk15 %{version} JPP %{name}-jdk15
%add_to_maven_depmap org.testng %{name} %{version} JPP %{name}-jdk15

(cd $RPM_BUILD_ROOT%{_javadir} 
for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE3} \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr javadocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%{_javadir}/%{name}*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %{_javadocdir}/%{name}

%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}

%changelog
* Fri Jan 25 2008 Ralph Apel <r.apel at r-apel.de> - 0:5.6-1jpp
- First JPP release


--- NEW FILE: testng-test-BaseTest.patch ---
--- test/src/test/BaseTest.java.sav0	2007-12-10 15:02:17.000000000 +0100
+++ test/src/test/BaseTest.java	2007-12-10 15:02:35.000000000 +0100
@@ -321,7 +321,7 @@
      * @see org.testng.ITestRunnerFactory#newTestRunner(org.testng.ISuite, org.testng.xml.XmlTest)
      */
     public TestRunner newTestRunner(ISuite suite, XmlTest test) {
-      TestRunner testRunner= new TestRunner(suite, test, false);
+      TestRunner testRunner= new TestRunner(suite, test);
 
       testRunner.addTestListener(new TestHTMLReporter());
       testRunner.addTestListener(new JUnitXMLReporter());

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/testng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 20:09:09 -0000	1.1
--- sources	28 May 2008 20:09:47 -0000	1.2
***************
*** 0 ****
--- 1,3 ----
+ e4c95146987acb3d23c2ad5840b94f16  testng-5.6.zip
+ 64d7cff8cb4e36c91abba2ff515a8b81  testng-test-14.tar.gz
+ c85ebb6f2b06950822d4a9ad71560066  testng-test.tar.gz

--- NEW FILE: testng-test-14-BaseTest.patch ---
--- test-14/src/test/BaseTest.java.sav2	2007-12-10 15:07:41.000000000 +0100
+++ test-14/src/test/BaseTest.java	2007-12-10 15:08:00.000000000 +0100
@@ -304,7 +304,7 @@
      * @see org.testng.ITestRunnerFactory#newTestRunner(org.testng.ISuite, org.testng.xml.XmlTest)
      */
     public TestRunner newTestRunner(ISuite suite, XmlTest test) {
-      TestRunner testRunner = new TestRunner(suite, test, false);
+      TestRunner testRunner = new TestRunner(suite, test);
 
       testRunner.addTestListener(new TestHTMLReporter());
       testRunner.addTestListener(new JUnitXMLReporter());

--- NEW FILE: testng-5.6.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <!--
    ~ Generously contributed by Brett Porter of maven, brett.porter at gmail.com.
    ~
    ~ The build instructions given were:
    ~
    ~ POM for test NG. Usage:
    ~
    ~ mvn clean install -P jdk14
    ~ mvn clean install -P jdk15
    ~
    ~ gotchas:
    ~
    ~    * can't build them both in one go. This would be done by having a -core, -jdk14 and -jdk15 library instead
    ~    * you end up with a testng-$version.jar as well as the per-jdk versions
    ~    * doesn't run tests
    ~    * the backport library is not a version that I can find anywhere on the web.
    ~
    ~ There are certainly better ways to do this (especially if restructuring is an option), but this
    ~ was teh most expedient to get things in the local repo.
    ~
    ~
    ~ Creating an ibiblio upload bundle(added by jesse) :
    ~
    ~  Main instructions here: http://maven.apache.org/guides/mini/guide-ibiblio-upload.html
    ~
    ~  For either jdk15/jdk14 replace the -P option with the bundle type you want to create.
    ~
    ~ mvn source:jar repository:bundle-create -P jdk15
    ~ mv target/testng-<version>-bundle.jar target/testng-<version>-<jdk15/jdk14>-bundle.jar (this step is weird, but necessary)
    ~
    ~ Repeat for jdk14. I usually run the bundle command with a 1.4 jre to be sure I've done it right.
    ~
    ~
    ~ When you are all done, open a JIRA upload request as was done here: http://jira.codehaus.org/browse/MAVENUPLOAD-1010
    -->
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.testng</groupId>
    <artifactId>testng</artifactId>
    <name>TestNG</name>
    <version>5.6</version>
    <description>TestNG is a unit testing framework.</description>
    <url>http://testng.org</url>
    <licenses>
        <license>
            <name>Apache License, Version 2.0</name>
            <url>http://apache.org/licenses/LICENSE-2.0</url>
        </license>
    </licenses>

    <scm>
        <connection>scm:svn:a${scm.url}</connection>
        <url>http://testng.googlecode.com/svn/trunk</url>
    </scm>

    <profiles>
        <profile>
            <id>jdk14</id>
            <activation>
                <jdk>1.4</jdk>
            </activation>
            <build>
                <plugins>
                    <plugin>
                        <groupId>org.codehaus.mojo</groupId>
                        <artifactId>build-helper-maven-plugin</artifactId>
                        <configuration>
                            <sources>
                                <source>src/jdk14</source>
                            </sources>
                        </configuration>
                        <executions>
                            <execution>
                                <goals>
                                    <goal>add-source</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-compiler-plugin</artifactId>
			<configuration>
                            <source>1.4</source>
                            <target>1.4</target>
                        </configuration>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-jar-plugin</artifactId>
                        <executions>
                            <execution>
                                <configuration>
                                    <classifier>jdk14</classifier>
                                </configuration>
                                <goals>
                                    <goal>jar</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                    <plugin>
                        <groupId>org.codehaus.mojo</groupId>
                        <artifactId>dependency-maven-plugin</artifactId>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>backport-util-concurrent</groupId>
                                    <artifactId>backport-util-concurrent</artifactId>
                                    <version>2.2</version>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-antrun-plugin</artifactId>
                        <executions>
                            <execution>
                                <phase>process-sources</phase>
                                <configuration>
                                    <tasks>
                                        <unzip dest="target/classes" src="3rdparty/backport-util-concurrent-2.2.jar" />
                                    </tasks>
                                </configuration>
                                <goals>
                                    <goal>run</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                </plugins>
            </build>
        </profile>
        <profile>
            <id>jdk15</id>
            <activation>
                <jdk>!1.4</jdk>
            </activation>
            <build>
                <plugins>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-jar-plugin</artifactId>
                        <executions>
                            <execution>
                                <configuration>
                                    <classifier>jdk15</classifier>
                                </configuration>
                                <goals>
                                    <goal>jar</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-compiler-plugin</artifactId>
                        <configuration>
                            <source>1.5</source>
                            <target>1.5</target>
                        </configuration>
                    </plugin>
                    <plugin>
                        <groupId>org.codehaus.mojo</groupId>
                        <artifactId>build-helper-maven-plugin</artifactId>
                        <configuration>
                            <sources>
                                <source>src/jdk15</source>
                            </sources>
                        </configuration>
                        <executions>
                            <execution>
                                <goals>
                                    <goal>add-source</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                </plugins>
            </build>
        </profile>
        <profile>
            <id>default-tools.jar</id>
            <activation>
                <property>
                    <name>java.vendor</name>
                    <value>Sun Microsystems Inc.</value>
                </property>
            </activation>
            <dependencies>
                <dependency>
                    <groupId>com.sun</groupId>
                    <artifactId>tools</artifactId>
                    <version>1.4.2</version>
                    <scope>system</scope>
                    <optional>true</optional>
                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
                </dependency>
            </dependencies>
        </profile>
    </profiles>
    <dependencies>
        <dependency>
            <groupId>ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.6.5</version>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.1</version>
        </dependency>
        <dependency>
            <groupId>qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.1</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.beanshell</groupId>
            <artifactId>bsh</artifactId>
            <version>2.0b4</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
    <build>
        <sourceDirectory>src/main</sourceDirectory>
	<resources>
	   <resource>
		<directory>src/main</directory>
		<includes>
		   <include>**/*.dtd</include>
		</includes>
	   </resource>
	</resources>
        <plugins>
            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>dependency-maven-plugin</artifactId>
                <configuration>
                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                    <artifactItems>
                        <artifactItem>
                            <groupId>qdox</groupId>
                            <artifactId>qdox</artifactId>
                            <version>1.6.1</version>
                        </artifactItem>
                        <artifactItem>
                            <groupId>org.beanshell</groupId>
                            <artifactId>bsh</artifactId>
                            <version>2.0b4</version>
                        </artifactItem>
                    </artifactItems>
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-clean-plugin</artifactId>
                <!-- <version>2.2-SNAPSHOT</version> -->
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <archive>
			<index>true</index>
			<compress>true</compress>
                        <manifest>
                            <mainClass>org.testng.TestNG</mainClass>
                        </manifest>
                    </archive>
                </configuration>
            </plugin>
	    <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-source-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>jar</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
<!--
    <distributionManagement>
        <snapshotRepository>
            <id>snapshots</id>
            <url>scp://beaver.codehaus.org/home/projects/maven/repository-staging/snapshots/maven2</url>
        </snapshotRepository>
    </distributionManagement>
-->
</project>

--- NEW FILE: testng-test-14-v4-BaseTest.patch ---
--- test-14/v4/src/test/BaseTest.java.sav3	2007-12-10 15:10:08.000000000 +0100
+++ test-14/v4/src/test/BaseTest.java	2007-12-10 15:10:20.000000000 +0100
@@ -307,7 +307,7 @@
      * @see org.testng.ITestRunnerFactory#newTestRunner(org.testng.ISuite, org.testng.xml.XmlTest)
      */
     public TestRunner newTestRunner(ISuite suite, XmlTest test) {
-      TestRunner testRunner = new TestRunner(suite, test, false);
+      TestRunner testRunner = new TestRunner(suite, test);
 
       testRunner.addTestListener(new TestHTMLReporter());
       testRunner.addTestListener(new JUnitXMLReporter());




More information about the JPackage-commits mailing list