From 5f0a9bc64163e17e128a4036539b58cdb25d0ee5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Dec 21 2009 21:50:00 +0000 Subject: Import testng --- diff --git a/.cvsignore b/.cvsignore index e69de29..a24dc32 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +testng-5.11.zip diff --git a/0001-Disable-DTDDoc-target.patch b/0001-Disable-DTDDoc-target.patch new file mode 100644 index 0000000..ddd0518 --- /dev/null +++ b/0001-Disable-DTDDoc-target.patch @@ -0,0 +1,39 @@ +From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +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 @@ + + + +- ++ + + +- + +- ++ + + + +-- +1.6.5.2 + diff --git a/0001-Do-not-bundle-prebuilt-jar-s.patch b/0001-Do-not-bundle-prebuilt-jar-s.patch new file mode 100644 index 0000000..b3648d5 --- /dev/null +++ b/0001-Do-not-bundle-prebuilt-jar-s.patch @@ -0,0 +1,44 @@ +From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +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 @@ + + + +- ++ overwrite="true" /--> + + + +- ++ overwrite="true" /--> + + + +- ++ overwrite="true" /--> + + + +-- +1.6.5.2 + diff --git a/0001-Port-to-QDoc-1.9.patch b/0001-Port-to-QDoc-1.9.patch new file mode 100644 index 0000000..e1ed7ba --- /dev/null +++ b/0001-Port-to-QDoc-1.9.patch @@ -0,0 +1,43 @@ +From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +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 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 + diff --git a/sources b/sources index e69de29..9d4f0c4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2c3539788100b56ddec1e78c6d5b73d8 testng-5.11.zip diff --git a/testng-5.11.pom b/testng-5.11.pom new file mode 100644 index 0000000..47196fd --- /dev/null +++ b/testng-5.11.pom @@ -0,0 +1,58 @@ + + + 4.0.0 + org.testng + testng + TestNG + 5.11 + TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. + http://testng.org + + + + Apache License, Version 2.0 + http://apache.org/licenses/LICENSE-2.0 + + + + + scm:svn:http://testng.googlecode.com/svn/trunk/ + scm:svn:http://testng.googlecode.com/svn/trunk/ + http://testng.googlecode.com/svn/trunk + + + + + ant + ant + 1.6.5 + true + + + junit + junit + 3.8.1 + + + qdox + qdox + 1.6.1 + provided + + + org.beanshell + bsh + 2.0b4 + provided + + + + diff --git a/testng.spec b/testng.spec new file mode 100644 index 0000000..ec62328 --- /dev/null +++ b/testng.spec @@ -0,0 +1,123 @@ +Name: testng +Version: 5.11 +Release: 2%{?dist} +Summary: Java-based testing framework + +Group: Development/Tools +License: ASL 2.0 +URL: http://testng.org/ +Source0: http://testng.org/%{name}-%{version}.zip +Source1: http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom +Patch0: 0001-Do-not-bundle-prebuilt-jar-s.patch +Patch1: 0001-Disable-DTDDoc-target.patch +Patch2: 0001-Port-to-QDoc-1.9.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: ant +BuildRequires: unzip +BuildRequires: jpackage-utils +BuildRequires: java-devel-openjdk +BuildRequires: bsh +BuildRequires: qdox +BuildRequires: backport-util-concurrent +BuildRequires: junit +Requires: jpackage-utils + +BuildArch: noarch + +%description +TestNG is a testing framework inspired from JUnit and NUnit but introducing +some new functionality, including flexible test configuration, and +distributed test running. It is designed to cover unit tests as well as +functional, end-to-end, integration, etc. + + +%package javadoc +Summary: API Documentation for %{name} +Group: Development/Tools +Requires: jpackage-utils + +%description javadoc +JavaDoc documentation for %{name} + + +%prep +%setup -q +%patch0 -p1 -b .nobundle +%patch1 -p1 -b .dtddoc +%patch2 -p1 -b .qdoc19 + + +%build +find -name '*.jar' -delete +CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \ + ant dist-15 javadocs + +# Convert CP/M line encoding to UNIX one +sed 's/\r//' README.unix +touch -r README README.unix +mv README.unix README + + +%install +rm -rf $RPM_BUILD_ROOT + +# Code +install -d $RPM_BUILD_ROOT%{_javadir} +install -pm644 %{name}-%{version}-jdk15.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +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}/* + + +%post +%update_maven_depmap + + +%postun +%update_maven_depmap + + +%changelog +* Mon Dec 21 2009 Lubomir Rintel - 5.11-2 +- Add POM + +* Sun Dec 20 2009 Lubomir Rintel - 5.11-1 +- Bump to 5.11 +- Add maven depmap fragments +- Fix line encoding of README + +* Wed Dec 09 2009 Lubomir Rintel - 5.10-2 +- Add javadoc +- Don't ship jdk14 jar + +* Fri Nov 27 2009 Lubomir Rintel - 5.10-1 +- Initial packaging