[icedtea-web] Fixing unittests

jiri vanek jvanek at fedoraproject.org
Fri Jan 23 15:42:02 UTC 2015


commit 9787e918bc0fa24e3ded83255083ca77d97dd6be
Author: Jiri <jvanek at redhat.com>
Date:   Fri Jan 23 16:42:24 2015 +0100

    Fixing unittests

 fixUnittests.diff |   28 ++++++++++++++++++++++++++++
 icedtea-web.spec  |    3 +++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/fixUnittests.diff b/fixUnittests.diff
new file mode 100644
index 0000000..775377f
--- /dev/null
+++ b/fixUnittests.diff
@@ -0,0 +1,28 @@
+diff -r 918fb141b815 tests/test-extensions/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java
+--- a/tests/test-extensions/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java	Fri Jan 23 15:35:46 2015 +0100
++++ b/tests/test-extensions/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java	Fri Jan 23 16:41:59 2015 +0100
+@@ -37,7 +37,6 @@
+ 
+ package net.sourceforge.jnlp.browsertesting;
+ 
+-import java.lang.annotation.Annotation;
+ import java.lang.reflect.InvocationTargetException;
+ import net.sourceforge.jnlp.annotations.TestInBrowsers;
+ import java.lang.reflect.Method;
+@@ -46,7 +45,6 @@
+ import java.util.Random;
+ import net.sourceforge.jnlp.ServerAccess;
+ import org.junit.Ignore;
+-import org.junit.internal.AssumptionViolatedException;
+ import org.junit.internal.runners.model.EachTestNotifier;
+ import org.junit.runner.Description;
+ import org.junit.runner.notification.RunNotifier;
+@@ -160,8 +158,6 @@
+             }
+         try {
+           statement.evaluate();
+-        } catch (AssumptionViolatedException e) {
+-            eachNotifier.addFailedAssumption(e);
+         } catch (Throwable e) {
+             eachNotifier.addFailure(e);
+         } finally {
diff --git a/icedtea-web.spec b/icedtea-web.spec
index 6edfb1d..e735c75 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -22,6 +22,8 @@ URL:        http://icedtea.classpath.org/wiki/IcedTea-Web
 Source0:    http://icedtea.classpath.org/download/source/%{name}-1.6pre02.tar.gz
 Source1:    icedtea-web.metainfo.xml
 
+Patch1:     fixUnittests.diff
+
 BuildRequires:  java-%{javaver}-openjdk-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gecko-devel
@@ -79,6 +81,7 @@ This package contains Javadocs for the IcedTea-Web project.
 %prep
 #%setup -q
 %setup -q -n icedtea-web-1.6pre
+%patch1 -p1
 
 %build
 autoreconf -vfi


More information about the scm-commits mailing list