|
36 | 36 | import com.vaadin.flow.component.dependency.JsModule;
|
37 | 37 | import com.vaadin.flow.component.page.AppShellConfigurator;
|
38 | 38 | import com.vaadin.flow.di.Lookup;
|
39 |
| -import com.vaadin.flow.internal.hilla.EndpointRequestUtil; |
40 | 39 | import com.vaadin.flow.router.Route;
|
41 | 40 | import com.vaadin.flow.server.InitParameters;
|
42 | 41 | import com.vaadin.flow.server.LoadDependenciesOnStartup;
|
@@ -353,10 +352,10 @@ public void should_generateOpenApi_when_EndpointPresents()
|
353 | 352 | javaSourceFolder.getRoot().getAbsolutePath());
|
354 | 353 |
|
355 | 354 | Assert.assertFalse(generatedOpenApiJson.exists());
|
356 |
| - try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic( |
357 |
| - EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) { |
358 |
| - util.when(() -> EndpointRequestUtil |
359 |
| - .isHillaAvailable(Mockito.any())).thenReturn(true); |
| 355 | + try (MockedStatic<FrontendUtils> util = Mockito.mockStatic( |
| 356 | + FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) { |
| 357 | + util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(), |
| 358 | + Mockito.any())).thenReturn(true); |
360 | 359 | devModeStartupListener.onStartup(classes, servletContext);
|
361 | 360 | handler = getDevModeHandler();
|
362 | 361 | waitForDevServer();
|
@@ -421,10 +420,10 @@ public void should_generateTs_files() throws Exception {
|
421 | 420 | System.setProperty("vaadin." + CONNECT_JAVA_SOURCE_FOLDER_TOKEN,
|
422 | 421 | javaSourceFolder.getRoot().getAbsolutePath());
|
423 | 422 |
|
424 |
| - try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic( |
425 |
| - EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) { |
426 |
| - util.when(() -> EndpointRequestUtil |
427 |
| - .isHillaAvailable(Mockito.any())).thenReturn(true); |
| 423 | + try (MockedStatic<FrontendUtils> util = Mockito.mockStatic( |
| 424 | + FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) { |
| 425 | + util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(), |
| 426 | + Mockito.any())).thenReturn(true); |
428 | 427 | devModeStartupListener.onStartup(classes, servletContext);
|
429 | 428 | handler = getDevModeHandler();
|
430 | 429 | waitForDevServer();
|
|
0 commit comments