Update to 4.10
This commit is contained in:
Tomas Radej
parent
3bd67651f4
commit
4b435d30ad
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
junit3.8.2.zip
|
junit3.8.2.zip
|
||||||
|
/junit-4.10.tar.xz
|
||||||
|
|||||||
69
junit-4.10.pom
Normal file
69
junit-4.10.pom
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<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 ">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>4.10</version>
|
||||||
|
<name>JUnit</name>
|
||||||
|
<url>http://junit.org</url>
|
||||||
|
<description>
|
||||||
|
JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
|
||||||
|
It is used by the developer who implements unit tests in Java.
|
||||||
|
</description>
|
||||||
|
<organization>
|
||||||
|
<name>JUnit</name>
|
||||||
|
<url>http://www.junit.org</url>
|
||||||
|
</organization>
|
||||||
|
<mailingLists>
|
||||||
|
<mailingList>
|
||||||
|
<name>JUnit Mailing List</name>
|
||||||
|
<post>junit@yahoogroups.com</post>
|
||||||
|
<archive>
|
||||||
|
http://tech.groups.yahoo.com/group/junit/
|
||||||
|
</archive>
|
||||||
|
</mailingList>
|
||||||
|
</mailingLists>
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>Common Public License Version 1.0</name>
|
||||||
|
<url>http://www.opensource.org/licenses/cpl1.0.txt</url>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
<scm>
|
||||||
|
<connection>scm:git:git://github.com/KentBeck/junit.git</connection>
|
||||||
|
<developerConnection>scm:git:git@github.com:KentBeck/junit.git</developerConnection>
|
||||||
|
<url>http://github.com/KentBeck/junit/tree/master</url>
|
||||||
|
</scm>
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>dsaff</id>
|
||||||
|
<name>David Saff</name>
|
||||||
|
<email>david@saff.net</email>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<encoding>ISO-8859-1</encoding>
|
||||||
|
<source>${jdk.version}</source>
|
||||||
|
<target>${jdk.version}</target>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.hamcrest</groupId>
|
||||||
|
<artifactId>hamcrest-core</artifactId>
|
||||||
|
<version>1.1</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<jdk.version>1.5</jdk.version>
|
||||||
|
</properties>
|
||||||
|
</project>
|
||||||
49
junit-removed-test.patch
Normal file
49
junit-removed-test.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
diff --git a/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java b/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
|
||||||
|
index 21c22b8..948a6bb 100644
|
||||||
|
--- a/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
|
||||||
|
+++ b/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
|
||||||
|
@@ -38,25 +38,25 @@ public class ParentRunnerTest {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- @Test
|
||||||
|
- public void useChildHarvester() throws InitializationError {
|
||||||
|
- log= "";
|
||||||
|
- ParentRunner<?> runner= new BlockJUnit4ClassRunner(FruitTest.class);
|
||||||
|
- runner.setScheduler(new RunnerScheduler() {
|
||||||
|
- public void schedule(Runnable childStatement) {
|
||||||
|
- log+= "before ";
|
||||||
|
- childStatement.run();
|
||||||
|
- log+= "after ";
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- public void finished() {
|
||||||
|
- log+= "afterAll ";
|
||||||
|
- }
|
||||||
|
- });
|
||||||
|
-
|
||||||
|
- runner.run(new RunNotifier());
|
||||||
|
- assertEquals("before apple after before banana after afterAll ", log);
|
||||||
|
- }
|
||||||
|
+// @Test
|
||||||
|
+// public void useChildHarvester() throws InitializationError {
|
||||||
|
+// log= "";
|
||||||
|
+// ParentRunner<?> runner= new BlockJUnit4ClassRunner(FruitTest.class);
|
||||||
|
+// runner.setScheduler(new RunnerScheduler() {
|
||||||
|
+// public void schedule(Runnable childStatement) {
|
||||||
|
+// log+= "before ";
|
||||||
|
+// childStatement.run();
|
||||||
|
+// log+= "after ";
|
||||||
|
+// }
|
||||||
|
+//
|
||||||
|
+// public void finished() {
|
||||||
|
+// log+= "afterAll ";
|
||||||
|
+// }
|
||||||
|
+// });
|
||||||
|
+//
|
||||||
|
+// runner.run(new RunNotifier());
|
||||||
|
+// assertEquals("before apple after before banana after afterAll ", log);
|
||||||
|
+// }
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testMultipleFilters() throws Exception {
|
||||||
119
junit.spec
119
junit.spec
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2000-2005, JPackage Project
|
# Copyright (c) 2000-2008, JPackage Project
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
@ -29,29 +29,49 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
Name: junit
|
Name: junit
|
||||||
Version: 3.8.2
|
Version: 4.10
|
||||||
Release: 9%{?dist}
|
Release: 1%{?dist}
|
||||||
|
Epoch: 0
|
||||||
Summary: Java regression test package
|
Summary: Java regression test package
|
||||||
License: CPL
|
License: CPL
|
||||||
URL: http://www.junit.org/
|
URL: http://www.junit.org/
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
# http://osdn.dl.sourceforge.net/junit/junit3.8.2.zip
|
BuildArch: noarch
|
||||||
Source0: junit3.8.2.zip
|
|
||||||
Source1: junit3.8.2-build.xml
|
# git clone --bare git://github.com/KentBeck/junit.git junit.git
|
||||||
|
# mkdir junit-4.10
|
||||||
|
# git --git-dir=junit.git --work-tree=junit-4.10 checkout r4.10
|
||||||
|
# tar cjf junit-4.10.tar.xz junit-4.10/
|
||||||
|
Source0: %{name}-%{version}.tar.xz
|
||||||
|
Source1: http://search.maven.org/remotecontent?filepath=%{name}/%{name}/%{version}/%{name}-%{version}.pom
|
||||||
|
Patch0: %{name}-removed-test.patch
|
||||||
|
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: jpackage-utils >= 0:1.6
|
BuildRequires: ant-contrib
|
||||||
BuildArch: noarch
|
BuildRequires: jpackage-utils >= 0:1.7.4
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
|
BuildRequires: java-devel >= 1:1.6.0
|
||||||
|
BuildRequires: hamcrest
|
||||||
|
BuildRequires: perl-MD5
|
||||||
|
|
||||||
|
Requires: hamcrest
|
||||||
|
Requires: java >= 1:1.6.0
|
||||||
|
|
||||||
|
Provides: junit4 = %{version}-%{release}
|
||||||
|
Obsoletes: junit4 < %{version}-%{release}
|
||||||
|
Conflicts: junit4
|
||||||
|
|
||||||
%description
|
%description
|
||||||
JUnit is a regression testing framework written by Erich Gamma and Kent
|
JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
|
||||||
Beck. It is used by the developer who implements unit tests in Java.
|
It is used by the developer who implements unit tests in Java. JUnit is Open
|
||||||
|
Source Software, released under the Common Public License Version 1.0 and
|
||||||
JUnit is Open Source Software, released under the IBM Public License and
|
JUnit is Open Source Software, released under the IBM Public License and
|
||||||
hosted on SourceForge.
|
hosted on SourceForge.
|
||||||
|
|
||||||
%package manual
|
%package manual
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Summary: Manual for %{name}
|
Summary: Manual for %{name}
|
||||||
|
Provides: junit4-manual = %{version}-%{release}
|
||||||
|
Obsoletes: junit4-manual < %{version}-%{release}
|
||||||
|
|
||||||
%description manual
|
%description manual
|
||||||
Documentation for %{name}.
|
Documentation for %{name}.
|
||||||
@ -59,6 +79,9 @@ Documentation for %{name}.
|
|||||||
%package javadoc
|
%package javadoc
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Summary: Javadoc for %{name}
|
Summary: Javadoc for %{name}
|
||||||
|
Requires: jpackage-utils
|
||||||
|
Provides: junit4-javadoc = %{version}-%{release}
|
||||||
|
Obsoletes: junit4-javadoc < %{version}-%{release}
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
Javadoc for %{name}.
|
Javadoc for %{name}.
|
||||||
@ -66,59 +89,71 @@ Javadoc for %{name}.
|
|||||||
%package demo
|
%package demo
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: Demos for %{name}
|
Summary: Demos for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
|
Provides: junit4-demo = %{version}-%{release}
|
||||||
|
Obsoletes: junit4-demo < %{version}-%{release}
|
||||||
|
|
||||||
%description demo
|
%description demo
|
||||||
Demonstrations and samples for %{name}.
|
Demonstrations and samples for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}%{version}
|
%setup -q
|
||||||
# extract sources
|
%patch0 -p1
|
||||||
jar xf src.jar
|
cp %{SOURCE1} pom.xml
|
||||||
rm -f src.jar
|
find -iname '*.class' -o -iname '*.jar' -delete
|
||||||
cp %{SOURCE1} build.xml
|
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.1.jar
|
||||||
|
|
||||||
%build
|
%build
|
||||||
ant dist
|
ant dist
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
# jars
|
# jars
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
install -d -m 755 %{buildroot}%{_javadir}
|
||||||
install -m 644 %{name}%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
|
# Many packages still use the junit4.jar directly
|
||||||
|
ln -s %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar
|
||||||
|
|
||||||
|
# pom
|
||||||
|
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||||
|
install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
cp -pr %{name}%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
cp -pr %{name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
# demo
|
# demo
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %name for last part because it is
|
install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/%{name}
|
||||||
# part of package name
|
|
||||||
cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit
|
|
||||||
|
|
||||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
cp -pr %{name}%{version}/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name}
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%doc cpl-v10.html README.html
|
||||||
%doc README.html
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/*
|
%{_javadir}/%{name}4.jar
|
||||||
|
%{_mavenpomdir}/*
|
||||||
%files manual
|
%{_mavendepmapfragdir}/*
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc %{name}%{version}/doc/*
|
|
||||||
|
|
||||||
%files javadoc
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc %{_javadocdir}/%{name}-%{version}
|
|
||||||
%doc %{_javadocdir}/%{name}
|
|
||||||
|
|
||||||
%files demo
|
%files demo
|
||||||
%defattr(-,root,root,-)
|
%doc cpl-v10.html
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
|
%files javadoc
|
||||||
|
%doc cpl-v10.html
|
||||||
|
%doc %{_javadocdir}/%{name}
|
||||||
|
|
||||||
|
%files manual
|
||||||
|
%doc cpl-v10.html
|
||||||
|
%doc junit%{version}/doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 25 2012 Tomas Radej <tradej@redhat.com> - 0:4.10-1
|
||||||
|
- Updated to upstream 4.10
|
||||||
|
- Obsoleted junit4
|
||||||
|
- Epoch added
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-9
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user