Skip to content

Commit

Permalink
[Misc] Improve environment handling during tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tmortagne committed Jul 17, 2024
1 parent fd844b5 commit 15d3252
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.xwiki.cache.CacheFactory;
import org.xwiki.cache.CacheManager;
import org.xwiki.configuration.internal.MemoryConfigurationSource;
import org.xwiki.environment.Environment;
import org.xwiki.extension.ExtensionId;
import org.xwiki.extension.InstalledExtension;
import org.xwiki.extension.LocalExtension;
Expand All @@ -45,7 +44,6 @@
import org.xwiki.job.Request;
import org.xwiki.logging.LogLevel;
import org.xwiki.logging.event.LogEvent;
import org.xwiki.test.TestEnvironment;
import org.xwiki.test.annotation.AfterComponent;
import org.xwiki.test.annotation.AllComponents;
import org.xwiki.test.junit5.mockito.InjectComponentManager;
Expand All @@ -72,9 +70,6 @@ public abstract class AbstractExtensionHandlerTest
@AfterComponent
public void afterComponent() throws Exception
{
// Force a test environment
this.componentManager.registerComponent(Environment.class, new TestEnvironment());

// We inject infinispan after components have been loaded to be sure to mock it only if
// it's not available in all components.
if (!this.componentManager.hasComponent(CacheFactory.class, "infinispan")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.xwiki.component.util.ReflectionUtils;
import org.xwiki.environment.Environment;
import org.xwiki.test.TestEnvironment;
import org.xwiki.test.mockito.MockitoComponentManager;

import static org.xwiki.test.junit5.mockito.MockitoComponentManagerExtension.loadComponentManager;

Expand All @@ -41,7 +44,11 @@ public class MockitoRepositoryUtilsExtension implements BeforeEachCallback
public void beforeEach(ExtensionContext context) throws Exception
{
Object testInstance = context.getTestInstance().get();
MockitoRepositoryUtils utils = new MockitoRepositoryUtils(loadComponentManager(context));
MockitoComponentManager componentManager = loadComponentManager(context);
MockitoRepositoryUtils utils = new MockitoRepositoryUtils(componentManager);

// Force a test environment
componentManager.registerComponent(Environment.class, new TestEnvironment());

// Initialize the MockitoRepositoryUtils instance
utils.setup();
Expand Down

0 comments on commit 15d3252

Please sign in to comment.