Skip to content

Commit

Permalink
Merge pull request #1808 from arjantijms/jsonb_clean_source
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjantijms
arjantijms authored Jan 26, 2025
2 parents 8dab30f + 87aaaf6 commit f13b95c
Show file tree
Hide file tree
Showing 31 changed files with 1,718 additions and 1,777 deletions.
4 changes: 2 additions & 2 deletions tcks/apis/jsonb/src/main/java/com/sun/ts/tests/jsonb/TypeContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package com.sun.ts.tests.jsonb;

public interface TypeContainer<T> {
T getInstance();
T getInstance();

void setInstance(T instance);
void setInstance(T instance);
}
256 changes: 141 additions & 115 deletions ...om/sun/ts/tests/jsonb/cdi/customizedmapping/adapters/AdaptersCustomizationCDIEjbTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,31 @@

package com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters;

import com.sun.ts.lib.harness.EETest;
import com.sun.ts.lib.harness.ServiceEETest;
import com.sun.ts.lib.harness.Status;
import com.sun.ts.tests.common.vehicle.EmptyVehicleRunner;
import com.sun.ts.tests.common.vehicle.VehicleClient;
import com.sun.ts.tests.common.vehicle.VehicleRunnable;
import com.sun.ts.tests.common.vehicle.VehicleRunnerFactory;
import com.sun.ts.tests.common.vehicle.ejb.EJBVehicle;
import com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote;
import com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Animal;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.AnimalShelterInjectedAdapter;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Cat;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Dog;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalIdentifier;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalJson;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.InjectedAdapter;
import com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.InjectedListAdapter;

import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;

import java.lang.System.Logger;
import java.net.URL;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OverProtocol;
import org.jboss.arquillian.container.test.api.TargetsContainer;
Expand All @@ -35,12 +57,10 @@
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 java.lang.System.Logger;
import java.net.URL;

/**
* @test
* @sources AdaptersCustomizationTest.java
Expand All @@ -56,121 +76,127 @@
@ExtendWith(ArquillianExtension.class)
public class AdaptersCustomizationCDIEjbTest extends AdaptersCustomizationCDITest {

static final String VEHICLE_ARCHIVE = "jsonb_cdi_customizedmapping_adapters_ejb_vehicle";

private final Jsonb jsonb = JsonbBuilder.create();

public static void main(String[] args) {
AdaptersCustomizationCDIEjbTest t = new AdaptersCustomizationCDIEjbTest();
Status s = t.run(args, System.out, System.err);
s.exit();
}

private static final Logger logger = System.getLogger(AdaptersCustomizationCDIEjbTest.class.getName());

private static String packagePath = AdaptersCustomizationCDIEjbTest.class.getPackageName().replace(".", "/");

@TargetsContainer("tck-appclient")
@OverProtocol("appclient")
@Deployment(name = VEHICLE_ARCHIVE, order = 2)
public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {

JavaArchive jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.jar");
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addClasses(
com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
com.sun.ts.lib.harness.EETest.class,
com.sun.ts.lib.harness.EETest.Fault.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.lib.harness.ServiceEETest.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Animal.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Cat.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Dog.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.AnimalShelterInjectedAdapter.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalIdentifier.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalJson.TYPE.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalJson.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.InjectedAdapter.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.InjectedListAdapter.class,
AdaptersCustomizationCDIEjbTest.class,
AdaptersCustomizationCDITest.class
);

URL resURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath+"/ejb_vehicle_client.xml");
if(resURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
}
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
static final String VEHICLE_ARCHIVE = "jsonb_cdi_customizedmapping_adapters_ejb_vehicle";

private final Jsonb jsonb = JsonbBuilder.create();

resURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath+"/ejb_vehicle_client.jar.sun-application-client.xml");
if(resURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
public static void main(String[] args) {
AdaptersCustomizationCDIEjbTest t = new AdaptersCustomizationCDIEjbTest();
Status s = t.run(args, System.out, System.err);
s.exit();
}
archiveProcessor.processClientArchive(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client, AdaptersCustomizationCDIEjbTest.class, resURL);


JavaArchive jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.jar");
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addClasses(
com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class,
com.sun.ts.lib.harness.EETest.class,
com.sun.ts.lib.harness.EETest.Fault.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.lib.harness.ServiceEETest.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalIdentifier.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalJson.TYPE.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.AnimalJson.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.InjectedAdapter.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.adapter.InjectedListAdapter.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Animal.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.AnimalShelterInjectedAdapter.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Cat.class,
com.sun.ts.tests.jsonb.cdi.customizedmapping.adapters.model.Dog.class,
AdaptersCustomizationCDIEjbTest.class,
AdaptersCustomizationCDITest.class
);

// The ejb-jar.xml descriptor
URL ejbResURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath+"/ejb_vehicle_ejb.xml");
if(ejbResURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
}
ejbResURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath+"/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");

private static final Logger logger = System.getLogger(AdaptersCustomizationCDIEjbTest.class.getName());

private static String packagePath = AdaptersCustomizationCDIEjbTest.class.getPackageName().replace(".", "/");

@TargetsContainer("tck-appclient")
@OverProtocol("appclient")
@Deployment(name = VEHICLE_ARCHIVE, order = 2)
public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {

JavaArchive jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class,
"jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.jar");
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addClasses(
EmptyVehicleRunner.class,
VehicleRunnerFactory.class,
VehicleRunnable.class,
VehicleClient.class,
EJBVehicleRemote.class,
EJBVehicleRunner.class,
EETest.class,
Fault.class,
SetupException.class,
ServiceEETest.class,
Animal.class,
Cat.class,
Dog.class,
AnimalShelterInjectedAdapter.class,
AnimalIdentifier.class,
AnimalJson.TYPE.class,
AnimalJson.class,
InjectedAdapter.class,
InjectedListAdapter.class,
AdaptersCustomizationCDIEjbTest.class,
AdaptersCustomizationCDITest.class);

URL resURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath + "/ejb_vehicle_client.xml");
if (resURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
}
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client
.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");

resURL = AdaptersCustomizationCDIEjbTest.class
.getClassLoader()
.getResource(packagePath + "/ejb_vehicle_client.jar.sun-application-client.xml");

if (resURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
}
archiveProcessor.processClientArchive(
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client,
AdaptersCustomizationCDIEjbTest.class,
resURL);

JavaArchive jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class,
"jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.jar");
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addClasses(VehicleRunnerFactory.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class, VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, EJBVehicle.class,
EETest.class, Fault.class,
SetupException.class, ServiceEETest.class,
AnimalIdentifier.class,
AnimalJson.TYPE.class,
AnimalJson.class,
InjectedAdapter.class,
InjectedListAdapter.class,
Animal.class,
AnimalShelterInjectedAdapter.class,
Cat.class,
Dog.class, AdaptersCustomizationCDIEjbTest.class,
AdaptersCustomizationCDITest.class);

// The ejb-jar.xml descriptor
URL ejbResURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath + "/ejb_vehicle_ejb.xml");
if (ejbResURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
}
ejbResURL = AdaptersCustomizationCDIEjbTest.class
.getClassLoader()
.getResource(packagePath + "/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
if (ejbResURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
}

URL warResURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath + "/beans.xml");
if (warResURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addAsManifestResource(warResURL, "beans.xml");
}
archiveProcessor.processEjbArchive(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb, AdaptersCustomizationCDIEjbTest.class,
ejbResURL);

EnterpriseArchive jsonb_cdi_customizedmapping_adapters_ejb_vehicle =
ShrinkWrap.create(EnterpriseArchive.class, "jsonb_cdi_customizedmapping_adapters_ejb_vehicle.ear");

jsonb_cdi_customizedmapping_adapters_ejb_vehicle.addAsModule(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client);
jsonb_cdi_customizedmapping_adapters_ejb_vehicle.addAsModule(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb);

return jsonb_cdi_customizedmapping_adapters_ejb_vehicle;

}
URL warResURL = AdaptersCustomizationCDIEjbTest.class.getClassLoader().getResource(packagePath+"/beans.xml");
if(warResURL != null) {
jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb.addAsManifestResource(warResURL, "beans.xml");

/*
* @testName: testCDISupport
*
* @assertion_ids: JSONB:SPEC:JSB-4.7.1-3
*
* @test_Strategy: Assert that CDI injection is supported in adapters
*/
@Override
@Test
@TargetVehicle("ejb")
public void testCDISupport() throws Exception {
super.testCDISupport();
}
archiveProcessor.processEjbArchive(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb, AdaptersCustomizationCDIEjbTest.class, ejbResURL);

EnterpriseArchive jsonb_cdi_customizedmapping_adapters_ejb_vehicle = ShrinkWrap.create(EnterpriseArchive.class, "jsonb_cdi_customizedmapping_adapters_ejb_vehicle.ear");
jsonb_cdi_customizedmapping_adapters_ejb_vehicle.addAsModule(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_client);
jsonb_cdi_customizedmapping_adapters_ejb_vehicle.addAsModule(jsonb_cdi_customizedmapping_adapters_ejb_vehicle_ejb);

return jsonb_cdi_customizedmapping_adapters_ejb_vehicle;

}

/*
* @testName: testCDISupport
*
* @assertion_ids: JSONB:SPEC:JSB-4.7.1-3
*
* @test_Strategy: Assert that CDI injection is supported in adapters
*/
@Test
@TargetVehicle("ejb")
public void testCDISupport() throws Exception {
super.testCDISupport();
}
}
Loading

0 comments on commit f13b95c

Please sign in to comment.