tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [1/2] tomee git commit: NO-JIRA - ignoring this test for now, this will be fixed with TOMEE-2330
Date Fri, 07 Dec 2018 17:05:58 GMT
Repository: tomee
Updated Branches:
  refs/heads/master afe7539a9 -> 6b2e7118e


NO-JIRA - ignoring this test for now, this will be fixed with TOMEE-2330


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5ca0ba8d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5ca0ba8d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5ca0ba8d

Branch: refs/heads/master
Commit: 5ca0ba8d1fd748784a2d0f506c7c91af37d468b1
Parents: 2f07757
Author: Jonathan Gallimore <jgallimore@tomitribe.com>
Authored: Fri Dec 7 17:04:50 2018 +0000
Committer: Jonathan Gallimore <jgallimore@tomitribe.com>
Committed: Fri Dec 7 17:04:50 2018 +0000

----------------------------------------------------------------------
 .../arquillian/tests/cmp/CmpMappingTest.java    | 58 --------------------
 .../arquillian/tests/cmp/CmpServlet.java        |  2 +-
 2 files changed, 1 insertion(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/5ca0ba8d/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
deleted file mode 100644
index 4c8cf41..0000000
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
+++ /dev/null
@@ -1,58 +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.arquillian.tests.cmp;
-
-import org.apache.ziplock.IO;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.net.URL;
-
-/**
- * @version $Rev$ $Date$
- */
-@RunWith(Arquillian.class)
-public class CmpMappingTest {
-
-    @ArquillianResource
-    private URL url;
-
-    @Deployment(testable = false)
-    public static WebArchive createDeployment() {
-        WebArchive archive = ShrinkWrap.create(WebArchive.class, CmpMappingTest.class.getSimpleName()
+ ".war")
-                .addClasses(CmpServlet.class, MyCmpBean.class, MyLocalHome.class, MyLocalObject.class,
MyRemoteHome.class, MyRemoteObject.class)
-                .addAsWebInfResource(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/openejb-cmp-orm.xml"),
"openejb-cmp-orm.xml")
-                .addAsWebInfResource(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/ejb-jar.xml"),
"ejb-jar.xml");
-
-        System.out.println(archive.toString(true));
-        return archive;
-    }
-
-    @Test
-    @RunAsClient
-    public void checkCmpJpaEntityORMMappings() throws Exception {
-        final String output = IO.readString(new URL(url.toExternalForm()));
-        System.out.println(output);
-    }
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/5ca0ba8d/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
index c843a9c..15bdc67 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
@@ -21,7 +21,7 @@ public class CmpServlet extends HttpServlet {
         final Collection<AppInfo> deployedApplications = assembler.getDeployedApplications();
 
         for (final AppInfo deployedApplication : deployedApplications) {
-            if ("CmpMappingTest".equals(deployedApplication.appId)) {
+            if ("CmpMappingTestIgnoreMe".equals(deployedApplication.appId)) {
                 final String cmpMappingsXml = deployedApplication.cmpMappingsXml;
                 resp.getWriter().write(cmpMappingsXml == null ? "null" : cmpMappingsXml);
             }


Mime
View raw message