Skip to content

Commit 03770f3

Browse files
authored
Simplify test (#11339)
1 parent 5be203a commit 03770f3

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ dependencies {
2121
library("org.springframework:spring-aop:4.0.0.RELEASE")
2222
testLibrary("org.springframework.boot:spring-boot:1.1.0.RELEASE")
2323
testImplementation("org.apache.tomee:openejb-core:8.0.16")
24-
testImplementation("org.apache.tomee:openejb-ejbd:8.0.16")
25-
testImplementation("org.apache.tomee:openejb-client:8.0.16")
2624

2725
// rmi remoting was removed in spring 6
2826
latestDepTestLibrary("org.springframework:spring-context:5.+") // documented limitation

instrumentation/spring/spring-rmi-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/SpringRmiTest.java

-6
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
import java.util.function.Consumer;
2727
import javax.ejb.EJBException;
2828
import javax.ejb.embeddable.EJBContainer;
29-
import javax.naming.spi.NamingManager;
30-
import org.apache.openejb.OpenEjbContainer;
31-
import org.apache.openejb.client.RemoteInitialContextFactory;
3229
import org.junit.jupiter.api.AfterAll;
3330
import org.junit.jupiter.api.BeforeAll;
3431
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -92,10 +89,7 @@ static void beforeAll() throws Exception {
9289
Map<String, Object> map = new HashMap<>();
9390
map.put(EJBContainer.APP_NAME, "test");
9491
map.put(EJBContainer.MODULES, new java.io.File("build/classes/java/test"));
95-
map.put(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
9692
ejbContainer = EJBContainer.createEJBContainer(map);
97-
// needed to ensure that remote ejb call isn't optimized to a local call
98-
NamingManager.setInitialContextFactoryBuilder(environment -> new RemoteInitialContextFactory());
9993

10094
Map<String, Object> props = new HashMap<>();
10195
props.put("spring.jmx.enabled", false);

0 commit comments

Comments
 (0)