You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/14 00:01:04 UTC
tomee git commit: replacing TestHTMLReporter to avoid cdi bean
parameter to be used cause their scope can make the reporting failed when
testng logs parameters
Repository: tomee
Updated Branches:
refs/heads/develop f478bbb99 -> f4789d5f8
replacing TestHTMLReporter to avoid cdi bean parameter to be used cause their scope can make the reporting failed when testng logs parameters
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f4789d5f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f4789d5f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f4789d5f
Branch: refs/heads/develop
Commit: f4789d5f867771e522fc16a60e113f2e5f89d8e5
Parents: f478bbb
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Dec 14 00:00:43 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Dec 14 00:00:43 2014 +0100
----------------------------------------------------------------------
tck/cdi-embedded/pom.xml | 6 ++++++
.../org/apache/openejb/tck/cdi/embedded/BeansImpl.java | 10 ----------
tck/cdi-embedded/src/test/resources/passing.xml | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4789d5f/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 97ca599..20ed0f7 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -135,6 +135,12 @@
<suiteXmlFiles>
<suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
</suiteXmlFiles>
+ <properties>
+ <property> <!-- broken cause @RequestScoped beans are parameter and testng logs parameters -->
+ <name>usedefaultlisteners</name>
+ <value>false</value>
+ </property>
+ </properties>
<systemPropertyVariables>
<!-- this is a nice perf optimization to have by default but TCKs play with it -->
<openejb.cdi.applicationScope.cached>false</openejb.cdi.applicationScope.cached>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4789d5f/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java b/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
index 64500da..0f18c37 100644
--- a/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
+++ b/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
@@ -18,12 +18,9 @@ package org.apache.openejb.tck.cdi.embedded;
import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
import org.apache.openejb.core.ivm.IntraVmProxy;
-import org.jboss.cdi.tck.spi.Beans;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
/**
@@ -47,11 +44,4 @@ public class BeansImpl extends org.apache.webbeans.test.tck.BeansImpl {
IntraVmCopyMonitor.postPassivationOperation();
}
}
-
- @Override
- public Object activate(final byte[] bytes) throws IOException, ClassNotFoundException {
- final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- final ObjectInputStream is = new ObjectInputStream(bais);
- return is.readObject();
- }
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4789d5f/tck/cdi-embedded/src/test/resources/passing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/passing.xml b/tck/cdi-embedded/src/test/resources/passing.xml
index fd797cf..2275539 100644
--- a/tck/cdi-embedded/src/test/resources/passing.xml
+++ b/tck/cdi-embedded/src/test/resources/passing.xml
@@ -47,7 +47,7 @@
<listener class-name="org.testng.reporters.FailedReporter"/>
<listener class-name="org.testng.reporters.XMLReporter"/>
<listener class-name="org.testng.reporters.EmailableReporter"/>
- <listener class-name="org.testng.reporters.TestHTMLReporter"/>
+ <listener class-name="org.apache.openejb.tck.cdi.embedded.HTMLReporter"/>
</listeners>
<test name="JSR-346 TCK">