Fix more tests

vaadin · Dec 19, 2023 · c107a81 · c107a81
1 parent c904e23
commit c107a81
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...v-server/src/test/java/com/vaadin/base/devserver/themeeditor/AbstractThemeEditorTest.java b/...v-server/src/test/java/com/vaadin/base/devserver/themeeditor/AbstractThemeEditorTest.java
@@ -1,12 +1,12 @@
 package com.vaadin.base.devserver.themeeditor;
 
 import com.vaadin.base.devserver.MockVaadinContext;
-import com.vaadin.experimental.FeatureFlags;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.internal.ComponentTracker;
 import com.vaadin.flow.di.Lookup;
 import com.vaadin.flow.dom.Element;
+import com.vaadin.flow.function.DeploymentConfiguration;
 import com.vaadin.flow.server.Command;
 import com.vaadin.flow.server.VaadinContext;
 import com.vaadin.flow.server.VaadinService;
@@ -44,6 +44,8 @@ public abstract class AbstractThemeEditorTest {
     protected final int INLINEADD_CREATE = 48;
     protected final int INLINEADD_ATTACH = 48;
 
+    private VaadinSession session;
+
     protected class TestThemeModifier extends ThemeModifier {
 
         public TestThemeModifier() {
@@ -58,8 +60,6 @@ protected File getFrontendFolder() {
 
     protected class TestJavaSourceModifier extends JavaSourceModifier {
 
-        private VaadinSession session = new MockVaadinSession(null);
-
         public TestJavaSourceModifier() {
             super(mockContext);
         }
@@ -145,6 +145,13 @@ public void prepare() {
         VaadinService.setCurrent(service);
         Mockito.when(service.getContext()).thenReturn(mockContext);
 
+        DeploymentConfiguration depConf = Mockito
+                .mock(DeploymentConfiguration.class);
+        Mockito.when(depConf.isProductionMode()).thenReturn(false);
+        Mockito.when(service.getDeploymentConfiguration()).thenReturn(depConf);
+
+        session = new MockVaadinSession(service);
+
         ApplicationConfiguration configuration = Mockito
                 .mock(ApplicationConfiguration.class);
         ApplicationConfigurationFactory factory = Mockito