fix mocking osgi-classes

Signed-off-by: Stefan Bischof <[email protected]>
vaadin · Nov 10, 2020 · 06ed6c7 · 06ed6c7
1 parent 405662d
commit 06ed6c7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/flow-server/src/test/java/com/vaadin/flow/server/startup/EnableOSGiRunner.java b/flow-server/src/test/java/com/vaadin/flow/server/startup/EnableOSGiRunner.java
@@ -69,7 +69,7 @@ public synchronized Class<?> loadClass(String name)
                 Builder<Exception> builder = new ByteBuddy()
                         .subclass(Exception.class);
                 return builder.name("org.osgi.framework.InvalidSyntaxException")
-                        .make().load(this, ClassLoadingStrategy.Default.WRAPPER)
+                        .make().load(this, ClassLoadingStrategy.Default.CHILD_FIRST.allowExistingTypes())
                         .getLoaded();
             } else if (name.equals("org.osgi.framework.FrameworkUtil")) {
                 Builder<Object> builder = new ByteBuddy()
@@ -81,7 +81,7 @@ public synchronized Class<?> loadClass(String name)
                         .withParameter(Class.class)
                         .intercept(MethodDelegation.to(Interceptor.class))
                         .name(name).make()
-                        .load(this, ClassLoadingStrategy.Default.WRAPPER)
+                        .load(this, ClassLoadingStrategy.Default.CHILD_FIRST.allowExistingTypes())
                         .getLoaded();
                 return fwUtil;
             } else if (name.startsWith(vaadinPackagePrefix)) {
@@ -106,7 +106,7 @@ private Class<?> defineBundleClass() {
             Builder<?> builder = new ByteBuddy().makeInterface();
 
             Class<?> bundleClass = builder.name("org.osgi.framework.Bundle")
-                    .make().load(this, ClassLoadingStrategy.Default.WRAPPER)
+                    .make().load(this, ClassLoadingStrategy.Default.CHILD_FIRST.allowExistingTypes())
                     .getLoaded();
             return bundleClass;
         }