Skip to content

Commit

Permalink
Merge pull request jakartaee#1223 from scottmarlow/remove_tests_entit…
Browse files Browse the repository at this point in the history 
…ybeans_containmanagedpersistence_beanmanagedpersistence_embeddableejbcontainer

remove tests that should of been removed for EE 10.  This includes EntityBean, Container Managed Persistence, Bean Managed Persistence, Embeddable EJB Container tests
  • Loading branch information
@scottmarlow
scottmarlow authored May 2, 2024
2 parents 53add1b + 96da0ae commit 6742ec7
Show file tree
Hide file tree
Showing 2,581 changed files with 149 additions and 309,239 deletions.
79 changes: 0 additions & 79 deletions appclient/src/main/java/com/sun/ts/tests/appclient/deploy/ejblink/single/Client.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.sun.ts.lib.util.TSNamingContext;
import com.sun.ts.lib.util.TestUtil;
import com.sun.ts.tests.assembly.util.shared.ejbref.single.TestCode;
import com.sun.ts.tests.common.dao.DAOFactory;

public class Client extends EETest {

Expand Down Expand Up @@ -59,9 +58,6 @@ public void setup(String[] args, Properties props) throws Exception {
logTrace("[Client] Getting naming context...");
nctx = new TSNamingContext();

logTrace("[Client] Initializing BMP table...");
DAOFactory.getInstance().getCoffeeDAO().cleanup();

logMsg("[Client] Setup succeed (got naming context).");
} catch (Exception e) {
throw new Exception("Setup failed:", e);
Expand Down Expand Up @@ -125,81 +121,6 @@ public void testStateful() throws Exception {
}
}

/**
* @testName: testBMP
*
* @assertion_ids: JavaEE:SPEC:10118
*
* @test_Strategy: Deploy an application client referencing a BMP Entity bean.
* Check at runtime that the application client can do a
* lookup for the EJB reference and use it to create a bean.
* Then invoke on that bean instance a business method to be
* found only in this particular bean: This is to check that
* the EJB reference was resolved consistently with the DD.
*/
public void testBMP() throws Exception {
boolean pass;

try {
pass = TestCode.testBMPExternal(nctx, props);
if (!pass) {
throw new Exception("ejb-link test failed!");
}
} catch (Exception e) {
throw new Exception("ejb-link test failed: " + e, e);
}
}

/**
* @testName: testCMP11
*
* @assertion_ids: JavaEE:SPEC:10118
*
* @test_Strategy: Deploy an application client referencing a CMP 1.1 Entity
* bean. Check at runtime that the application client can do a
* lookup for the EJB reference and use it to create a bean.
* Then invoke on that bean instance a business method to be
* found only in this particular bean: This is to check that
* the EJB reference was resolved consistently with the DD.
*/
public void testCMP11() throws Exception {
boolean pass;

try {
pass = TestCode.testCMP11External(nctx, props);
if (!pass) {
throw new Exception("ejb-link test failed!");
}
} catch (Exception e) {
throw new Exception("ejb-link test failed: " + e, e);
}
}

/**
* @testName: testCMP20
*
* @assertion_ids: JavaEE:SPEC:10118
*
* @test_Strategy: Deploy an application client referencing a CMP 2.0 Entity
* bean. Check at runtime that the application client can do a
* lookup for the EJB reference and use it to create a bean.
* Then invoke on that bean instance a business method to be
* found only in this particular bean: This is to check that
* the EJB reference was resolved consistently with the DD.
*/
public void testCMP20() throws Exception {
boolean pass;

try {
pass = TestCode.testCMP20External(nctx, props);
if (!pass) {
throw new Exception("ejb-link test failed!");
}
} catch (Exception e) {
throw new Exception("ejb-link test failed: " + e, e);
}
}

public void cleanup() throws Exception {
logMsg("[Client] cleanup()");
}
Expand Down
12 changes: 0 additions & 12 deletions .../deploy/ejblink/single/appclient_dep_ejblink_single_client.jar.sun-application-client.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,6 @@
<ejb-ref-name>ejb/StatefulBean_ExternalJAR</ejb-ref-name>
<jndi-name/>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/BMPBean_ExternalJAR</ejb-ref-name>
<jndi-name/>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/CMP11Bean_ExternalJAR</ejb-ref-name>
<jndi-name/>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/CMP20Bean_ExternalJAR</ejb-ref-name>
<jndi-name/>
</ejb-ref>
<resource-ref>
<res-ref-name>jdbc/DB1</res-ref-name>
<jndi-name>jdbc/DB1</jndi-name>
Expand Down
21 changes: 0 additions & 21 deletions .../com/sun/ts/tests/appclient/deploy/ejblink/single/appclient_dep_ejblink_single_client.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,6 @@
<remote>com.sun.ts.tests.assembly.util.refbean.StatefulExternal</remote>
<ejb-link>Stateful</ejb-link>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/BMPBean_ExternalJAR</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>com.sun.ts.tests.assembly.util.refbean.BMPExternalHome</home>
<remote>com.sun.ts.tests.assembly.util.refbean.BMPExternal</remote>
<ejb-link>BMP</ejb-link>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/CMP11Bean_ExternalJAR</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>com.sun.ts.tests.assembly.util.refbean.CMP11ExternalHome</home>
<remote>com.sun.ts.tests.assembly.util.refbean.CMP11External</remote>
<ejb-link>CMP11</ejb-link>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/CMP20Bean_ExternalJAR</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>com.sun.ts.tests.assembly.util.refbean.CMP20ExternalHome</home>
<remote>com.sun.ts.tests.assembly.util.refbean.CMP20External</remote>
<ejb-link>CMP20</ejb-link>
</ejb-ref>
<resource-ref>
<res-ref-name>jdbc/DB1</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
Expand Down
57 changes: 0 additions & 57 deletions ...appclient/deploy/ejblink/single/appclient_dep_ejblink_single_ejb.jar.sun-cmp-mappings.xml
View file

This file was deleted.

95 changes: 0 additions & 95 deletions ...ests/appclient/deploy/ejblink/single/appclient_dep_ejblink_single_ejb.jar.sun-ejb-jar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,38 +45,6 @@
<refresh-period-in-seconds>-1</refresh-period-in-seconds>
<gen-classes/>
</ejb>
<ejb>
<ejb-name>BMP</ejb-name>
<jndi-name>appclient_deploy_ejblink_single_BMP</jndi-name>
<resource-ref>
<res-ref-name>jdbc/DB1</res-ref-name>
<jndi-name>jdbc/DB1</jndi-name>
<default-resource-principal>
<name>user1</name>
<password>password1</password>
</default-resource-principal>
</resource-ref>
<pass-by-reference>false</pass-by-reference>
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
<confidentiality>supported</confidentiality>
<establish-trust-in-target>supported</establish-trust-in-target>
<establish-trust-in-client>supported</establish-trust-in-client>
</transport-config>
<as-context>
<auth-method>username_password</auth-method>
<realm>default</realm>
<required>false</required>
</as-context>
<sas-context>
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
<is-read-only-bean>false</is-read-only-bean>
<refresh-period-in-seconds>-1</refresh-period-in-seconds>
<gen-classes/>
</ejb>
<ejb>
<ejb-name>Stateless</ejb-name>
<jndi-name>appclient_deploy_ejblink_single_Stateless</jndi-name>
Expand All @@ -101,68 +69,5 @@
<refresh-period-in-seconds>-1</refresh-period-in-seconds>
<gen-classes/>
</ejb>
<ejb>
<ejb-name>CMP20</ejb-name>
<jndi-name>appclient_deploy_ejblink_single_CMP20</jndi-name>
<pass-by-reference>false</pass-by-reference>
<cmp>
<mapping-properties>appclient_dep_ejblink_single_ejb.jar/com/sun/ts/tests/assembly/util/refbean/CMP20ExternalEJB_1981284142_JDOState.mapping</mapping-properties>
<is-one-one-cmp>false</is-one-one-cmp>
</cmp>
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
<confidentiality>supported</confidentiality>
<establish-trust-in-target>supported</establish-trust-in-target>
<establish-trust-in-client>supported</establish-trust-in-client>
</transport-config>
<as-context>
<auth-method>username_password</auth-method>
<realm>default</realm>
<required>false</required>
</as-context>
<sas-context>
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
<is-read-only-bean>false</is-read-only-bean>
<refresh-period-in-seconds>-1</refresh-period-in-seconds>
<gen-classes/>
</ejb>
<ejb>
<ejb-name>CMP11</ejb-name>
<jndi-name>appclient_deploy_ejblink_single_CMP11</jndi-name>
<pass-by-reference>false</pass-by-reference>
<cmp>
<mapping-properties>appclient_dep_ejblink_single_ejb.jar/com/sun/ts/tests/assembly/util/refbean/CMP11ExternalEJB1631160406_JDOState.mapping</mapping-properties>
<is-one-one-cmp>true</is-one-one-cmp>
</cmp>
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
<confidentiality>supported</confidentiality>
<establish-trust-in-target>supported</establish-trust-in-target>
<establish-trust-in-client>supported</establish-trust-in-client>
</transport-config>
<as-context>
<auth-method>username_password</auth-method>
<realm>default</realm>
<required>false</required>
</as-context>
<sas-context>
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
<is-read-only-bean>false</is-read-only-bean>
<refresh-period-in-seconds>-1</refresh-period-in-seconds>
<gen-classes/>
</ejb>
<cmp-resource>
<jndi-name>jdbc/DB1</jndi-name>
<default-resource-principal>
<name>user1</name>
<password>password1</password>
</default-resource-principal>
</cmp-resource>
</enterprise-beans>
</sun-ejb-jar>
Loading

0 comments on commit 6742ec7

Please sign in to comment.