Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor assembly module tests #1546

Merged
merged 6 commits into from
Nov 8, 2024
Merged

Refactor assembly module tests #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
323d41f
Initial changes to refactor assembly tests
alwin-joseph Sep 30, 2024
49025dd
all 12 assembly tests runnable
alwin-joseph Oct 15, 2024
c4fa3fe
add local ts.jte from ts.home
alwin-joseph Oct 16, 2024
199558e
Run as appclient tests, fix deployment errors
alwin-joseph Oct 30, 2024
e760ff7
Merge remote-tracking branch 'upstream/main' into assembly_ee
alwin-joseph Nov 8, 2024
f6d235a
update based on S Starks comment - fix CP issue
alwin-joseph Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 71 additions & 15 deletions assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,31 @@
<version>11.0.0-SNAPSHOT</version>
</parent>

<artifactId>assembly</artifactId>
<artifactId>assembly-tck</artifactId>
<packaging>jar</packaging>

<name>ASSEMBLY</name>
<name>assembly-tck</name>
<description>ASSEMBLY</description>

<properties>
<arquillian.junit>1.9.1.Final</arquillian.junit>
<jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<version.jakarta.tck.arquillian>${project.version}</version.jakarta.tck.arquillian>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.jupiter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -49,21 +68,57 @@
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-appclient</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-common</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-javatest</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-lib</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>tck-porting-lib</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-core</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
</dependency>
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/test.jsp</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand All @@ -74,4 +129,5 @@
</plugin>
</plugins>
</build>

</project>
109 changes: 107 additions & 2 deletions assembly/src/main/java/com/sun/ts/tests/assembly/altDD/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,36 @@
import com.sun.ts.lib.util.TSNamingContext;
import com.sun.ts.lib.util.TestUtil;

import java.net.URL;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.container.test.api.OverProtocol;
import org.jboss.arquillian.container.test.api.TargetsContainer;
import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.asset.UrlAsset;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;


import java.lang.System.Logger;

@Tag("assembly")
@Tag("platform")
@Tag("tck-appclient")
@ExtendWith(ArquillianExtension.class)
public class Client extends EETest {

private static final String prefix = "java:comp/env/";
Expand Down Expand Up @@ -58,15 +88,86 @@ public void setup(String[] args, Properties props) throws Fault {
try {
this.props = props;

logTrace("[Client] Getting Naming Context...");
logMsg("[Client] Getting Naming Context...");
nctx = new TSNamingContext();
logTrace("[Client] Setup completed!");
logMsg("[Client] Setup completed!");
} catch (Exception e) {
logErr("[Client] Failed to obtain Naming Context:" + e);
throw new Fault("[Client] Setup failed:" + e, e);
}
}


static final String VEHICLE_ARCHIVE = "assembly_altDD_client";

@TargetsContainer("tck-appclient")
@OverProtocol("appclient")
@Deployment(name = VEHICLE_ARCHIVE, order = 2)
public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
JavaArchive assembly_altDD_client = ShrinkWrap.create(JavaArchive.class, "assembly_altDD_client.jar");
assembly_altDD_client.addClasses(
com.sun.ts.lib.harness.EETest.Fault.class,
com.sun.ts.lib.harness.EETest.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.assembly.altDD.Client.class,
com.sun.ts.tests.assembly.altDD.PainterBean.class);
URL resURL = Client.class.getResource("assembly_altDD_client.xml");
if (resURL != null) {
assembly_altDD_client.addAsManifestResource(resURL, "application-client.xml");
}
assembly_altDD_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
"MANIFEST.MF");

resURL = Client.class.getResource("assembly_altDD_client.jar.sun-application-client.xml");
if (resURL != null) {
assembly_altDD_client.addAsManifestResource(resURL, "sun-application-client.xml");
}
archiveProcessor.processClientArchive(assembly_altDD_client, Client.class, resURL);

JavaArchive assembly_altDD_ejb = ShrinkWrap.create(JavaArchive.class, "assembly_altDD_ejb.jar");
assembly_altDD_ejb.addClasses(
com.sun.ts.tests.common.ejb.wrappers.Stateless3xWrapper.class,
com.sun.ts.lib.util.RemoteLoggingInitException.class,
com.sun.ts.tests.assembly.util.shared.ejbref.common.ReferencedBeanCode.class,
com.sun.ts.tests.assembly.altDD.Client.class,
com.sun.ts.tests.assembly.altDD.PainterBean.class,
com.sun.ts.tests.assembly.altDD.PainterBeanEJB.class);
// The ejb-jar.xml descriptor
URL ejbResURL = Client.class.getResource("assembly_altDD_ejb.xml");
if (ejbResURL != null) {
assembly_altDD_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
}
ejbResURL = Client.class.getResource("assembly_altDD_ejb.jar.sun-ejb-jar.xml");
if (ejbResURL != null) {
assembly_altDD_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
}
assembly_altDD_ejb.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
"MANIFEST.MF");

archiveProcessor.processEjbArchive(assembly_altDD_ejb, Client.class, ejbResURL);


EnterpriseArchive assembly_altDD_ear = ShrinkWrap.create(EnterpriseArchive.class, "assembly_altDD.ear");
assembly_altDD_ear.addAsModule(assembly_altDD_client);
assembly_altDD_ear.addAsModule(assembly_altDD_ejb);

URL earResURL = Client.class.getResource("altDD_client.xml");
assembly_altDD_ear.add(new UrlAsset(earResURL), "altDD_client.xml");
earResURL = Client.class.getResource("altDD_ejb.xml");
assembly_altDD_ear.add(new UrlAsset(earResURL), "altDD_ejb.xml");

earResURL = Client.class.getResource("application.xml");
if (earResURL != null) {
assembly_altDD_ear.addAsManifestResource(earResURL, "application.xml");
}
assembly_altDD_ear.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
"MANIFEST.MF");

archiveProcessor.processEarArchive(assembly_altDD_ear, Client.class, earResURL);

return assembly_altDD_ear;
}

/**
* @testName: testAppClient
*
Expand Down Expand Up @@ -96,12 +197,14 @@ public void setup(String[] args, Properties props) throws Fault {
* - The runtime value is 'France', validating the use of DD4
* at deployment time.
*/
@Test
public void testAppClient() throws Fault {
String entryValue;
boolean pass = false;

try {
logTrace("[Client] Looking up " + entryLookup);

entryValue = (String) nctx.lookup(entryLookup);

pass = entryValue.equals(entryNameRef);
Expand Down Expand Up @@ -163,6 +266,7 @@ public void testAppClient() throws Fault {
* - The returned value is 'Matisse', validating the use of
* DD3 at deployment time.
*/
@Test
public void testEJB() throws Fault {
PainterBean bean = null;
String nameValue;
Expand All @@ -172,6 +276,7 @@ public void testEJB() throws Fault {
logTrace("[Client] Looking up " + beanLookup);
bean = (PainterBean) nctx.lookup(beanLookup, PainterBean.class);
bean.createNamingContext();

bean.initLogging(props);

logTrace("[Client] Checking referenced EJB...");
Expand Down
Loading
Loading