Repository: tomee Updated Branches: refs/heads/master 1d6f59104 -> 24af48bc1
removing unmaintained cdi-tomee-embedded debug module Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/24af48bc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/24af48bc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/24af48bc Branch: refs/heads/master Commit: 24af48bc1ea0fefe68e6b10b68dd50e43c00f2d5 Parents: 1d6f591 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Wed Aug 24 17:05:15 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Wed Aug 24 17:05:15 2016 +0200 ---------------------------------------------------------------------- tck/cdi-tomee-embedded/pom.xml | 176 ------------- .../tck/cdi/tomee/embedded/BeansImpl.java | 59 ----- .../tck/cdi/tomee/embedded/ContainersImpl.java | 176 ------------- .../tck/cdi/tomee/embedded/ContextsImpl.java | 60 ----- .../openejb/tck/cdi/tomee/embedded/ELImpl.java | 101 ------- .../tomee/embedded/EmbeddedTestListener.java | 57 ---- .../tck/cdi/tomee/embedded/ManagersImpl.java | 33 --- .../openejb/tck/cdi/tomee/embedded/Report.java | 260 ------------------- .../cdi/tomee/embedded/ResetStaticValve.java | 43 --- .../META-INF/jboss-test-harness.properties | 29 --- .../src/test/resources/passing.xml | 28 -- tck/pom.xml | 3 +- 12 files changed, 1 insertion(+), 1024 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/pom.xml b/tck/cdi-tomee-embedded/pom.xml deleted file mode 100644 index 37d77bc..0000000 --- a/tck/cdi-tomee-embedded/pom.xml +++ /dev/null @@ -1,176 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<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";> - <parent> - <artifactId>tck</artifactId> - <groupId>org.apache.tomee</groupId> - <version>7.0.2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>cdi-tomee-embedded</artifactId> - <packaging>jar</packaging> - <name>OpenEJB :: TCK :: CDI-1.2 TomEE Embedded</name> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tomee-embedded</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tck-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <version>1.0.4.SP1</version> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <useFile>false</useFile> - <disableXmlReport>true</disableXmlReport> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>reserve-network-port</id> - <phase>pre-integration-test</phase> - <goals> - <goal>reserve-network-port</goal> - </goals> - <configuration> - <portNames> - <portName>tomee.ssl.port</portName> - <portName>tomee.ajp.port</portName> - <portName>tomee.http.port</portName> - <portName>tomee.shutdown.port</portName> - </portNames> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>tck-common</artifactId> - <version>${project.version}</version> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>cdi-tomee-embedded</artifactId> - <version>${project.version}</version> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k</argLine> - <suiteXmlFiles> - <suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile> - </suiteXmlFiles> - <systemPropertyVariables> - <org.jboss.testharness.standalone>false</org.jboss.testharness.standalone> - <org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests> - <org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart> - <org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib - </org.jboss.testharness.libraryDirectory> - <deleteArtifacts>true</deleteArtifacts> - - <!--<maven.failsafe.debug>true</maven.failsafe.debug>--> - <java.opts>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k - </java.opts> - </systemPropertyVariables> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - <execution> - <id>verify</id> - <phase>verify</phase> - <goals> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java deleted file mode 100644 index 4b6b27c..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.apache.openejb.core.ObjectInputStreamFiltered; -import org.apache.openejb.core.ivm.IntraVmCopyMonitor; -import org.apache.openejb.core.ivm.IntraVmProxy; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -/** -* @version $Rev$ $Date$ -*/ -public class BeansImpl implements org.jboss.jsr299.tck.spi.Beans { - - public boolean isProxy(final Object instance) { - System.out.println("isProxy: " + instance); - return instance instanceof IntraVmProxy || instance.getClass().getName().contains("$Owb"); - } - - @Override - public byte[] serialize(final Object instance) throws IOException { - IntraVmCopyMonitor.prePassivationOperation(); - try { - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - final ObjectOutputStream os = new ObjectOutputStream(baos); - os.writeObject(instance); - os.flush(); - return baos.toByteArray(); - } finally { - IntraVmCopyMonitor.postPassivationOperation(); - } - } - - @Override - public Object deserialize(final byte[] bytes) throws IOException, ClassNotFoundException { - final ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - final ObjectInputStream is = new ObjectInputStreamFiltered(bais); - return is.readObject(); - } -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java deleted file mode 100644 index 5e825f8..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.apache.commons.io.FileUtils; -import org.apache.openejb.config.ValidationException; -import org.apache.openejb.tck.OpenEJBTCKRuntimeException; -import org.apache.tomee.embedded.Container; -import org.jboss.testharness.api.DeploymentException; -import org.jboss.testharness.spi.Containers; - -import java.io.Closeable; -import java.io.File; -import java.io.FileOutputStream; -import java.io.Flushable; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @version $Rev$ $Date$ - */ -public class ContainersImpl implements Containers { - - private static int count = 0; - private static final String tmpDir = System.getProperty("java.io.tmpdir"); - private Exception exception; - private final Container container; - - private static final Map<String, File> FILES = new ConcurrentHashMap<String, File>(); - - public ContainersImpl() { - System.out.println("Initialized ContainersImpl " + (++count)); - container = new Container(); - System.setProperty("tomee.valves", ResetStaticValve.class.getName()); - } - - @Override - public boolean deploy(InputStream archive, String name) throws IOException { - exception = null; - - System.out.println("Deploying " + archive + " with name " + name); - - File application = getFile(name); - System.out.println(application); - FILES.put(name, application.getParentFile()); - writeToFile(application, archive); - - try { - container.deploy(name, application); - } catch (Exception ex) { - Exception e = ex; - if (e.getCause() instanceof ValidationException) { - e = (Exception) e.getCause(); - } - - if (name.contains(".broken.")) { - // Tests that contain the name '.broken.' are expected to fail deployment - // This is how the TCK verifies the container is doing the required error checking - exception = (DeploymentException) new DeploymentException("deploy failed").initCause(e); - } else { - // This on the other hand is not good .... - System.out.println("FIX Deployment of " + name); - e.printStackTrace(); - exception = e; - } - - return false; - } - return true; - } - - private void writeToFile(File file, InputStream archive) { - try { - FileOutputStream fos = new FileOutputStream(file); - byte[] buffer = new byte[4096]; - int bytesRead = -1; - while ((bytesRead = archive.read(buffer)) > -1) { - fos.write(buffer, 0, bytesRead); - } - Util.close(fos); - } catch (Exception e) { - throw new OpenEJBTCKRuntimeException(e); - } - } - - private File getFile(String name) { - final File dir = new File(tmpDir, Math.random() + ""); - dir.mkdirs(); - dir.deleteOnExit(); - - return new File(dir, name); - } - - @Override - public DeploymentException getDeploymentException() { - try { - return (DeploymentException) exception; - } catch (Exception e) { - System.out.println("BADCAST"); - return new DeploymentException("", exception); - } - } - - @Override - public void undeploy(String name) throws IOException { - System.out.println("Undeploying " + name); - try { - container.undeploy(name); - } catch (Exception e) { - e.printStackTrace(); - throw new OpenEJBTCKRuntimeException(e); - } - - File file = FILES.remove(name); - System.out.println("deleting " + file.getAbsolutePath()); - FileUtils.deleteDirectory(file); - } - - @Override - public void setup() throws IOException { - try { - container.start(); - } catch (Exception e) { - throw new IOException(e); - } - } - - @Override - public void cleanup() throws IOException { - try { - container.stop(); - } catch (Exception e) { - throw new IOException(e); - } - - for (File f : FILES.values()) { - FileUtils.deleteDirectory(f); - } - FILES.clear(); - } - - private static final class Util { - static void close(Closeable closeable) throws IOException { - if (closeable == null) - return; - try { - if (closeable instanceof Flushable) { - ((Flushable) closeable).flush(); - } - } catch (IOException e) { - // no-op - } - try { - closeable.close(); - } catch (IOException e) { - // no-op - } - } - } -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java deleted file mode 100644 index 89afdae..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.apache.webbeans.config.WebBeansContext; -import org.apache.webbeans.context.AbstractContext; -import org.apache.webbeans.context.RequestContext; -import org.apache.webbeans.spi.ContextsService; - -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; - -/** - * @version $Rev$ $Date$ - */ -public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractContext> { - - public AbstractContext getRequestContext() { - ContextsService contextFactory = WebBeansContext.currentInstance().getContextsService(); - RequestContext ctx = (RequestContext) contextFactory.getCurrentContext(RequestScoped.class); - - if (ctx == null) { - contextFactory.startContext(RequestScoped.class, null); - } - - return (AbstractContext) contextFactory.getCurrentContext(RequestScoped.class); - } - - public void setActive(AbstractContext context) { - context.setActive(true); - - } - - public void setInactive(AbstractContext context) { - context.setActive(false); - } - - public AbstractContext getDependentContext() { - ContextsService contextFactory = WebBeansContext.currentInstance().getContextsService(); - return (AbstractContext) contextFactory.getCurrentContext(Dependent.class); - } - - public void destroyContext(AbstractContext context) { - context.destroy(); - } -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java deleted file mode 100644 index d5ae103..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.apache.el.ExpressionFactoryImpl; -import org.apache.el.lang.FunctionMapperImpl; -import org.apache.el.lang.VariableMapperImpl; -import org.apache.webbeans.el22.WebBeansELResolver; -import org.apache.webbeans.el22.WrappedExpressionFactory; - -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; -import javax.el.ELContext; -import javax.el.ELContextEvent; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.el.FunctionMapper; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.ResourceBundleELResolver; -import javax.el.VariableMapper; - -/** - * @version $Rev$ $Date$ - */ -public class ELImpl implements org.jboss.jsr299.tck.spi.EL { - - private static final ExpressionFactory EXPRESSION_FACTORY = new WrappedExpressionFactory(new ExpressionFactoryImpl()); - - public ELImpl() { - } - - public static ELResolver getELResolver() { - CompositeELResolver composite = new CompositeELResolver(); - composite.add(new BeanELResolver()); - composite.add(new ArrayELResolver()); - composite.add(new MapELResolver()); - composite.add(new ListELResolver()); - composite.add(new ResourceBundleELResolver()); - composite.add(new WebBeansELResolver()); - - return composite; - } - - public static class ELContextImpl extends ELContext { - @Override - public ELResolver getELResolver() { - return ELImpl.getELResolver(); - } - - @Override - public FunctionMapper getFunctionMapper() { - return new FunctionMapperImpl(); - } - - @Override - public VariableMapper getVariableMapper() { - return new VariableMapperImpl(); - } - - } - - @SuppressWarnings("unchecked") - public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams) { - ELContext context = createELContext(); - Object object = EXPRESSION_FACTORY.createMethodExpression(context, expression, expectedType, expectedParamTypes).invoke(context, expectedParams); - - return (T) object; - } - - @SuppressWarnings("unchecked") - public <T> T evaluateValueExpression(String expression, Class<T> expectedType) { - ELContext context = createELContext(); - Object object = EXPRESSION_FACTORY.createValueExpression(context, expression, expectedType).getValue(context); - - return (T) object; - } - - @Override - public ELContext createELContext() { - ELContext context = new ELContextImpl(); - ELContextEvent event = new ELContextEvent(context); - - return context; - } -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java deleted file mode 100644 index fcd822e..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.jboss.testharness.AbstractTest; -import org.testng.ITestContext; -import org.testng.ITestListener; -import org.testng.ITestResult; - -/** - * @version $Rev$ $Date$ - */ -public class EmbeddedTestListener implements ITestListener { - @Override - public void onTestStart(ITestResult result) { -// AbstractTest.setInContainer(false); - } - - @Override - public void onTestSuccess(ITestResult result) { - } - - @Override - public void onTestFailure(ITestResult result) { - } - - @Override - public void onTestSkipped(ITestResult result) { - } - - @Override - public void onTestFailedButWithinSuccessPercentage(ITestResult result) { - } - - @Override - public void onStart(ITestContext context) { - AbstractTest.setInContainer(false); - } - - @Override - public void onFinish(ITestContext context) { - } -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java deleted file mode 100644 index c1a21e9..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.apache.webbeans.config.WebBeansContext; -import org.apache.webbeans.container.InjectableBeanManager; - -import javax.enterprise.inject.spi.BeanManager; - -/** - * @version $Rev$ $Date$ - */ -public class ManagersImpl implements org.jboss.jsr299.tck.spi.Managers { - - public BeanManager getManager() { - return new InjectableBeanManager(WebBeansContext.currentInstance().getBeanManagerImpl()); - } - -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java deleted file mode 100644 index 17bc71e..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * @version $Rev$ $Date$ - */ -public class Report { - - public static void main(String[] args) throws Exception { - new Report().main(); - } - - private final LinkedList<TestClass> classes = new LinkedList<TestClass>(); - - private void main() throws Exception { -// final File file = new File("/Users/dblevins/work/uber/geronimo-tck-public-trunk/jcdi-tck-runner/target/surefire-reports/testng-results.xml"); - final File file = new File("/Users/dblevins/work/all/openejb/tck/cdi-tomee/target/failsafe-reports/testng-results.xml"); -// final File file = new File("/Users/dblevins/work/uber/testng-results.xml"); - - final SAXParser parser = SAXParserFactory.newInstance().newSAXParser(); - - parser.parse(file, new DefaultHandler() { - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - final String name = qName; - if ("class".equals(name)) { - classes.add(new TestClass(attributes.getValue("name"))); - } - - if ("test-method".equals(name)) { - classes.getLast().addStatus(attributes.getValue("status"), attributes.getValue("name")); - } - } - }); - - Collections.sort(classes); - - textReport(file); - passingXml(file); - failingXml(file); - - } - - private void textReport(File file) throws FileNotFoundException { - final File report = new File(file.getParentFile(), file.getName().replaceAll(".xml$", ".txt")); - final PrintStream out = new PrintStream(new FileOutputStream(report)); - printResults(out); - out.close(); - } - - private void passingXml(File file) throws FileNotFoundException { - final File report = new File(file.getParentFile(), file.getName().replaceAll(".xml$", "-passing.xml")); - final PrintStream out = new PrintStream(new FileOutputStream(report)); - - out.println(header + - "<suite name=\"CDI TCK\" verbose=\"0\">\n" + - " <test name=\"CDI TCK\">\n" + - " <packages>\n" + - " <package name=\"org.jboss.jsr299.tck.tests.*\"/>\n" + - " <package name=\"org.jboss.jsr299.tck.interceptors.tests.*\"/>\n" + - " </packages>\n" + - " <classes>"); - - for (TestClass testClass : classes) { - - if (contains(testClass, Status.FAIL)) { - out.printf(" <class name=\"%s\">\n", testClass.name); - out.printf(" <methods>\n"); - - for (TestResult result : testClass.getResults()) { - if (result.status == Status.FAIL) { - out.printf(" <exclude name=\"%s\"/>\n", result.name); - } - } - - out.printf(" </methods>\n"); - out.printf(" </class>\n"); - } - } - out.println(" </classes>"); - out.println(" </test>"); - out.println("</suite>"); - - out.close(); - } - - private void failingXml(File file) throws FileNotFoundException { - final File report = new File(file.getParentFile(), file.getName().replaceAll(".xml$", "-failing.xml")); - final PrintStream out = new PrintStream(new FileOutputStream(report)); - - out.println(header); - out.println("<suite name=\"CDI TCK\" verbose=\"0\">"); - out.println(" <test name=\"CDI TCK\">"); - out.println(" <!--<packages>-->\n" + - " <!--<package name=\"org.jboss.jsr299.tck.tests.*\"/>-->\n" + - " <!--<package name=\"org.jboss.jsr299.tck.interceptors.tests.*\"/>-->\n" + - " <!--</packages>-->"); - out.println(" <classes>"); - - for (TestClass testClass : classes) { - - if (contains(testClass, Status.FAIL)) { - out.printf(" <class name=\"%s\"/>\n", testClass.name); - } - } - out.println(" </classes>"); - out.println(" </test>"); - out.println("</suite>"); - - out.close(); - } - - private boolean contains(TestClass testClass, Status status) { - - for (TestResult result : testClass.getResults()) { - if (result.name.equals("beforeClass")) continue; - if (result.name.equals("afterClass")) continue; - if (result.name.equals("afterSuite")) continue; - if (result.name.equals("beforeSuite")) continue; - - if (result.status == status) { - return true; - } - } - return false; - } - - private void printResults(PrintStream out) { - - Map<Status, AtomicInteger> totals = new HashMap<Status, AtomicInteger>(); - for (Status status : Status.values()) { - totals.put(status, new AtomicInteger()); - } - - for (TestClass testClass : classes) { - - for (TestResult result : testClass.getResults()) { - if (result.name.equals("beforeClass")) continue; - if (result.name.equals("afterClass")) continue; - if (result.name.equals("afterSuite")) continue; - if (result.name.equals("beforeSuite")) continue; -// if (result.status == Status.PASS) continue; - totals.get(result.status).getAndIncrement(); - - out.printf("%s - %s(%s)\n", result.status, result.name, testClass.name); - } - } - - out.println("\n\n"); - - int total = 0; - - for (Map.Entry<Status, AtomicInteger> entry : totals.entrySet()) { - final int i = entry.getValue().get(); - total += i; - out.printf("%5s %s\n", i, entry.getKey()); - } - - out.printf("%5s %s\n", total, "Total"); - - } - - public static enum Status { - PASS, FAIL, ERROR; - } - public static class TestResult { - private final String name; - private final Status status; - - public TestResult(String name, Status status) { - this.name = name; - this.status = status; - } - } - - public static class TestClass implements Comparable<TestClass>{ - - private final String name; - private int failed; - private int passed; - private int error; - private final List<TestResult> results = new ArrayList<TestResult>(); - - public TestClass(String name) { - this.name = name; - } - - public void addStatus(String status, String testName) { - results.add(new TestResult(testName, Status.valueOf(status))); - if ("PASS".equals(status)) passed++; - if ("FAIL".equals(status)) failed++; - if ("ERROR".equals(status)) error++; - } - - public List<TestResult> getResults() { - return results; - } - - public boolean hasFailures() { - return failed > 0 || error > 0; - } - - @Override - public int compareTo(TestClass o) { - return this.name.compareTo(o.name); - } - } - - private static final String header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<!--\n" + - "\n" + - " Licensed to the Apache Software Foundation (ASF) under one or more\n" + - " contributor license agreements. See the NOTICE file distributed with\n" + - " this work for additional information regarding copyright ownership.\n" + - " The ASF licenses this file to You under the Apache License, Version 2.0\n" + - " (the \"License\"); you may not use this file except in compliance with\n" + - " the License. You may obtain a copy of the License at\n" + - "\n" + - " http://www.apache.org/licenses/LICENSE-2.0\n"; + - "\n" + - " Unless required by applicable law or agreed to in writing, software\n" + - " distributed under the License is distributed on an \"AS IS\" BASIS,\n" + - " WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" + - " See the License for the specific language governing permissions and\n" + - " limitations under the License.\n" + - "-->\n"; -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java deleted file mode 100644 index 567a542..0000000 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.tck.cdi.tomee.embedded; - -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; -import org.apache.catalina.valves.ValveBase; -import org.jboss.testharness.AbstractTest; - -import javax.servlet.ServletException; -import java.io.IOException; - -/** - * @version $Rev$ $Date$ - */ -public class ResetStaticValve extends ValveBase { - - - @Override - public void invoke(Request request, Response response) throws IOException, ServletException { - try { - AbstractTest.setInContainer(true); - getNext().invoke(request, response); - } finally { - AbstractTest.setInContainer(false); - } - - } -} http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties b/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties deleted file mode 100644 index a5156a9..0000000 --- a/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties +++ /dev/null @@ -1,29 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.jboss.jsr299.tck.spi.Managers=org.apache.openejb.tck.cdi.tomee.embedded.ManagersImpl -org.jboss.jsr299.tck.spi.Beans=org.apache.openejb.tck.cdi.tomee.embedded.BeansImpl -org.jboss.jsr299.tck.spi.Contexts=org.apache.openejb.tck.cdi.tomee.embedded.ContextsImpl -org.jboss.jsr299.tck.spi.EL=org.apache.openejb.tck.cdi.tomee.embedded.ELImpl -org.jboss.testharness.spi.Containers=org.apache.openejb.tck.cdi.tomee.embedded.ContainersImpl - -org.jboss.testharness.standalone=false -org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher -org.jboss.testharness.runIntegrationTests=true -org.jboss.testharness.outputDirectory=dumpedArtifacts -org.jboss.testharness.container.forceRestart=true -org.jboss.testharness.host=localhost:23880 http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/cdi-tomee-embedded/src/test/resources/passing.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/test/resources/passing.xml b/tck/cdi-tomee-embedded/src/test/resources/passing.xml deleted file mode 100644 index 9160494..0000000 --- a/tck/cdi-tomee-embedded/src/test/resources/passing.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<suite name="CDI TCK" verbose="0"> - <test name="CDI TCK"> - <classes> - <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest"/> - <!-- - <class name="org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest" /> - <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest" /> - --> - </classes> - </test> -</suite> http://git-wip-us.apache.org/repos/asf/tomee/blob/24af48bc/tck/pom.xml ---------------------------------------------------------------------- diff --git a/tck/pom.xml b/tck/pom.xml index 64fc67f..aa6ed72 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -32,10 +32,9 @@ </properties> <modules> + <module>tck-common</module> <module>cdi-embedded</module> <module>cdi-tomee</module> - <module>cdi-tomee-embedded</module> - <module>tck-common</module> <module>bval-tomee</module> <!-- TODO: either really use this module or delete it -->
