Update to 6.0.1
This commit is contained in:
Jaromir Capik
Alexander Kurtakov
parent
9649bd111c
commit
a1ad30592e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
testng-5.11.zip
|
testng-5.11.zip
|
||||||
|
/testng-6.0.1.tar.xz
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
||||||
Date: Fri, 27 Nov 2009 14:46:16 +0100
|
|
||||||
Subject: [PATCH 2/4] Disable DTDDoc target
|
|
||||||
|
|
||||||
We do not ship DTDDoc yet.
|
|
||||||
---
|
|
||||||
build.xml | 8 ++++----
|
|
||||||
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/build.xml b/build.xml
|
|
||||||
index 832b36b..71af78b 100644
|
|
||||||
--- a/build.xml
|
|
||||||
+++ b/build.xml
|
|
||||||
@@ -371,17 +371,17 @@
|
|
||||||
<copy file="${jdk15.testng.jar}" tofile="${jdk15.jar}" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
- <taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
|
|
||||||
- classpath="lib/DTDDoc.jar"/>
|
|
||||||
+ <!--taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
|
|
||||||
+ classpath="lib/DTDDoc.jar"/-->
|
|
||||||
|
|
||||||
<target name="dtd">
|
|
||||||
- <DTDDoc showHiddenTags="false"
|
|
||||||
+ <!--DTDDoc showHiddenTags="false"
|
|
||||||
showFixmeTags="false"
|
|
||||||
sourceDir="src/main"
|
|
||||||
destDir="dtd"
|
|
||||||
docTitle="TestNG DTD">
|
|
||||||
<include name="testng-1.0.dtd"/>
|
|
||||||
- </DTDDoc>
|
|
||||||
+ </DTDDoc-->
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="ftp">
|
|
||||||
--
|
|
||||||
1.6.5.2
|
|
||||||
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
||||||
Date: Fri, 27 Nov 2009 14:46:15 +0100
|
|
||||||
Subject: [PATCH 1/4] Do not bundle prebuilt jar-s
|
|
||||||
|
|
||||||
---
|
|
||||||
build.xml | 12 ++++++------
|
|
||||||
1 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/build.xml b/build.xml
|
|
||||||
index 683100d..832b36b 100644
|
|
||||||
--- a/build.xml
|
|
||||||
+++ b/build.xml
|
|
||||||
@@ -243,21 +243,21 @@
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="extract-beanshell-jar">
|
|
||||||
- <unjar src="3rdparty/${beanshell.jar}"
|
|
||||||
+ <!--unjar src="3rdparty/${beanshell.jar}"
|
|
||||||
dest="${build.3rdparty.dir}"
|
|
||||||
- overwrite="true" />
|
|
||||||
+ overwrite="true" /-->
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="extract-qdox-jar">
|
|
||||||
- <unjar src="3rdparty/${qdox.jar}"
|
|
||||||
+ <!--unjar src="3rdparty/${qdox.jar}"
|
|
||||||
dest="${build.3rdparty.dir}"
|
|
||||||
- overwrite="true" />
|
|
||||||
+ overwrite="true" /-->
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="extract-concurrent-jar">
|
|
||||||
- <unjar src="3rdparty/${concurrent.jar}"
|
|
||||||
+ <!--unjar src="3rdparty/${concurrent.jar}"
|
|
||||||
dest="${build.3rdparty.dir}"
|
|
||||||
- overwrite="true" />
|
|
||||||
+ overwrite="true" /-->
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="dist-15" depends="compile-15, dist-15-bsh">
|
|
||||||
--
|
|
||||||
1.6.5.2
|
|
||||||
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
||||||
Date: Fri, 27 Nov 2009 14:46:16 +0100
|
|
||||||
Subject: [PATCH 3/4] Port to QDoc 1.9
|
|
||||||
|
|
||||||
---
|
|
||||||
.../testng/internal/AnnotationTestConverter.java | 6 +++---
|
|
||||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java
|
|
||||||
index 539592b..d024e9f 100644
|
|
||||||
--- a/src/main/org/testng/internal/AnnotationTestConverter.java
|
|
||||||
+++ b/src/main/org/testng/internal/AnnotationTestConverter.java
|
|
||||||
@@ -115,7 +115,7 @@ public class AnnotationTestConverter {
|
|
||||||
Class<IAnnotation> annotationClass= m_annotationMap.get(tag.getName());
|
|
||||||
if(annotationClass == null) {
|
|
||||||
ppp("Found unknown testng annotation " + tag.getName() + " in file "
|
|
||||||
- + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
|
|
||||||
+ + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
|
|
||||||
+ tag.getLineNumber());
|
|
||||||
|
|
||||||
// preserve the information - but it looks like an invalid tag
|
|
||||||
@@ -128,7 +128,7 @@ public class AnnotationTestConverter {
|
|
||||||
}
|
|
||||||
catch(Exception e) {
|
|
||||||
ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file "
|
|
||||||
- + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
|
|
||||||
+ + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
|
|
||||||
+ tag.getLineNumber());
|
|
||||||
|
|
||||||
// preserve the information - but it looks like an invalid parameter
|
|
||||||
@@ -279,7 +279,7 @@ public class AnnotationTestConverter {
|
|
||||||
|
|
||||||
if(finalLines.size() > lineCount) {
|
|
||||||
ppp("Writing file " + file.getAbsolutePath());
|
|
||||||
- writeFile(file, source.getPackage(), finalLines);
|
|
||||||
+ writeFile(file, source.getPackage().getName(), finalLines);
|
|
||||||
converted++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.6.5.2
|
|
||||||
|
|
||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
2c3539788100b56ddec1e78c6d5b73d8 testng-5.11.zip
|
a861651088aa47a7a350bdfaf0a824ae testng-6.0.1.tar.xz
|
||||||
|
|||||||
@ -1,58 +0,0 @@
|
|||||||
<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">
|
|
||||||
<!--
|
|
||||||
This POM cannot be used to build TestNG; it should only be used as part of a Maven
|
|
||||||
repository upload bundle.
|
|
||||||
|
|
||||||
See the guide to creating a bundle here:
|
|
||||||
http://maven.apache.org/guides/mini/guide-central-repository-upload.html
|
|
||||||
-->
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>org.testng</groupId>
|
|
||||||
<artifactId>testng</artifactId>
|
|
||||||
<name>TestNG</name>
|
|
||||||
<version>5.11</version>
|
|
||||||
<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.</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:http://testng.googlecode.com/svn/trunk/</connection>
|
|
||||||
<developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
|
|
||||||
<url>http://testng.googlecode.com/svn/trunk</url>
|
|
||||||
</scm>
|
|
||||||
|
|
||||||
<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>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
12
testng-test-fails-workaround.patch
Normal file
12
testng-test-fails-workaround.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -Naur testng-6.0.1.orig/src/test/java/test/junit/Suite2.java testng-6.0.1/src/test/java/test/junit/Suite2.java
|
||||||
|
--- testng-6.0.1.orig/src/test/java/test/junit/Suite2.java 2011-03-24 21:09:34.000000000 +0100
|
||||||
|
+++ testng-6.0.1/src/test/java/test/junit/Suite2.java 2011-06-01 18:50:24.260159540 +0200
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
TestSuite suite = new TestSuite("Suite2");
|
||||||
|
suite.addTestSuite(TestAc.class);
|
||||||
|
suite.addTestSuite(TestAd.class);
|
||||||
|
- suite.addTestSuite(Suite3.class);
|
||||||
|
+// suite.addTestSuite(Suite3.class);
|
||||||
|
return suite;
|
||||||
|
}
|
||||||
|
}
|
||||||
12
testng.depmap
Normal file
12
testng.depmap
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<maven>
|
||||||
|
<groupId>com.google.gdata</groupId>
|
||||||
|
<artifactId>gdata-core</artifactId>
|
||||||
|
</maven>
|
||||||
|
<jpp>
|
||||||
|
<groupId>JPP</groupId>
|
||||||
|
<artifactId>gdata/gdata-core</artifactId>
|
||||||
|
</jpp>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
159
testng.spec
159
testng.spec
@ -1,111 +1,128 @@
|
|||||||
|
|
||||||
|
%global group_id org.testng
|
||||||
|
|
||||||
Name: testng
|
Name: testng
|
||||||
Version: 5.11
|
Version: 6.0.1
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Java-based testing framework
|
Summary: Java-based testing framework
|
||||||
|
|
||||||
Group: Development/Tools
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
Group: Development/Libraries
|
||||||
URL: http://testng.org/
|
URL: http://testng.org/
|
||||||
Source0: http://testng.org/%{name}-%{version}.zip
|
# git clone git://github.com/cbeust/testng.git
|
||||||
Source1: http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
|
# cd testng
|
||||||
Patch0: 0001-Do-not-bundle-prebuilt-jar-s.patch
|
# git archive --prefix="testng-6.0.1/" --format=tar testng-6.0.1 | xz > testng-6.0.1.tar.xz
|
||||||
Patch1: 0001-Disable-DTDDoc-target.patch
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Patch2: 0001-Port-to-QDoc-1.9.patch
|
Source1: %{name}.depmap
|
||||||
|
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
Patch0: %{name}-test-fails-workaround.patch
|
||||||
|
|
||||||
BuildRequires: ant
|
|
||||||
BuildRequires: unzip
|
|
||||||
BuildRequires: jpackage-utils
|
|
||||||
BuildRequires: java-devel-openjdk
|
|
||||||
BuildRequires: bsh
|
|
||||||
BuildRequires: qdox
|
|
||||||
BuildRequires: junit
|
|
||||||
Requires: jpackage-utils
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
BuildRequires: java-devel
|
||||||
|
BuildRequires: jpackage-utils
|
||||||
|
BuildRequires: maven
|
||||||
|
BuildRequires: beust-jcommander
|
||||||
|
BuildRequires: snakeyaml
|
||||||
|
|
||||||
|
Requires: beust-jcommander
|
||||||
|
Requires: snakeyaml
|
||||||
|
Requires: java
|
||||||
|
Requires: jpackage-utils
|
||||||
|
Requires(post): jpackage-utils
|
||||||
|
Requires(postun): jpackage-utils
|
||||||
|
|
||||||
%description
|
%description
|
||||||
TestNG is a testing framework inspired from JUnit and NUnit but introducing
|
TestNG is a testing framework inspired from JUnit and NUnit but introducing
|
||||||
some new functionality, including flexible test configuration, and
|
some new functionality, including flexible test configuration, and
|
||||||
distributed test running. It is designed to cover unit tests as well as
|
distributed test running. It is designed to cover unit tests as well as
|
||||||
functional, end-to-end, integration, etc.
|
functional, end-to-end, integration, etc.
|
||||||
|
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: API Documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
Group: Development/Tools
|
Group: Documentation
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
JavaDoc documentation for %{name}
|
This package contains the API documentation for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .nobundle
|
|
||||||
%patch1 -p1 -b .dtddoc
|
|
||||||
%patch2 -p1 -b .qdoc19
|
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
# remove bundled stuff
|
||||||
|
rm -rf spring
|
||||||
|
rm -rf 3rdparty
|
||||||
|
rm -rf doc
|
||||||
|
rm -rf lib-supplied
|
||||||
|
rm -rf gigaspaces
|
||||||
|
rm -rf sandbox
|
||||||
|
rm -rf examples
|
||||||
|
rm -f *.jar
|
||||||
|
|
||||||
|
|
||||||
|
# fix the ant group_id ... ant -> org.apache.ant
|
||||||
|
sed -i 's/<groupId>ant/<groupId>org.apache.ant/g' pom.xml
|
||||||
|
|
||||||
|
# replace CR+LF with LF
|
||||||
|
sed -i 's/\r//g' README
|
||||||
|
|
||||||
|
# convert to UTF8
|
||||||
|
|
||||||
|
#$ enca CHANGES.txt
|
||||||
|
#Unrecognized encoding
|
||||||
|
#$ enca ANNOUNCEMENT.txt
|
||||||
|
#Unrecognized encoding
|
||||||
|
|
||||||
|
#$ chardet-file ANNOUNCEMENT.txt
|
||||||
|
#{'confidence': 0.8484260688832136, 'encoding': 'ISO-8859-2'}
|
||||||
|
#$ chardet-file CHANGES.txt
|
||||||
|
#{'confidence': 0.7833420201466339, 'encoding': 'ISO-8859-2'}
|
||||||
|
|
||||||
|
iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8
|
||||||
|
mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt
|
||||||
|
iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8
|
||||||
|
mv -f CHANGES.txt.utf8 CHANGES.txt
|
||||||
|
|
||||||
%build
|
%build
|
||||||
find -name '*.jar' -delete
|
# gdata-java has no maven support -> depmap file needed
|
||||||
CLASSPATH=$(build-classpath bsh qdox junit) \
|
# http://code.google.com/p/gdata-java-client/issues/detail?id=328
|
||||||
ant dist-15 javadocs
|
mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" -Dgpg.skip=true install javadoc:aggregate
|
||||||
|
|
||||||
# Convert CP/M line encoding to UNIX one
|
|
||||||
sed 's/\r//' <README >README.unix
|
|
||||||
touch -r README README.unix
|
|
||||||
mv README.unix README
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
# jars
|
||||||
|
install -d -m 755 %{buildroot}%{_javadir}
|
||||||
|
install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
|
|
||||||
# Code
|
# pom
|
||||||
install -d $RPM_BUILD_ROOT%{_javadir}
|
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||||
install -pm644 %{name}-%{version}-jdk15.jar \
|
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name}
|
||||||
ln -s %{name}-%{version}.jar \
|
|
||||||
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
|
||||||
|
|
||||||
# API documentation
|
|
||||||
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|
||||||
cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|
||||||
|
|
||||||
# Maven stuff
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
|
|
||||||
install -pm 644 %{SOURCE1} \
|
|
||||||
$RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
|
|
||||||
%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name}
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_javadir}/*
|
|
||||||
%{_sysconfdir}/maven/fragments
|
|
||||||
%{_datadir}/maven2
|
|
||||||
%doc CHANGES.txt README LICENSE.txt
|
|
||||||
|
|
||||||
|
|
||||||
%files javadoc
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_javadocdir}/*
|
|
||||||
|
|
||||||
|
# javadoc
|
||||||
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%update_maven_depmap
|
%update_maven_depmap
|
||||||
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%update_maven_depmap
|
%update_maven_depmap
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README
|
||||||
|
%{_javadir}/%{name}.jar
|
||||||
|
%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
|
%{_mavendepmapfragdir}/%{name}
|
||||||
|
|
||||||
|
%files javadoc
|
||||||
|
%doc LICENSE.txt
|
||||||
|
%doc %{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 12 2011 Jaromir Capik <jcapik@redhat.com> - 6.0.1-1
|
||||||
|
- Update to 6.0.1
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-4
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user