This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 79f9d07ee6 IGNITE-23371 Disable route filters in tests (#4511)
79f9d07ee6 is described below
commit 79f9d07ee6d8c05eb425d2f129c67dfb46e1ad28
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Mon Oct 7 11:10:42 2024 +0300
IGNITE-23371 Disable route filters in tests (#4511)
---
.../ClusterConfigurationControllerTest.java | 27 +-------------------
.../NodeConfigurationControllerTest.java | 29 +++-------------------
.../SystemDisasterRecoveryControllerTest.java | 29 +++-------------------
3 files changed, 7 insertions(+), 78 deletions(-)
diff --git
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
index 55e1a74fb8..e51eb1211e 100644
---
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/ClusterConfigurationControllerTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.rest.configuration;
import io.micronaut.context.annotation.Bean;
-import io.micronaut.context.annotation.Factory;
import io.micronaut.context.annotation.Property;
import io.micronaut.context.annotation.Replaces;
import io.micronaut.http.client.HttpClient;
@@ -29,25 +28,14 @@ import jakarta.inject.Named;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
import
org.apache.ignite.internal.configuration.presentation.ConfigurationPresentation;
import org.apache.ignite.internal.configuration.presentation.HoconPresentation;
-import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
-import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
-import org.apache.ignite.internal.rest.RestManager;
-import org.apache.ignite.internal.rest.RestManagerFactory;
-import
org.apache.ignite.internal.security.authentication.AuthenticationManager;
-import
org.apache.ignite.internal.security.authentication.AuthenticationManagerImpl;
-import org.apache.ignite.internal.security.configuration.SecurityConfiguration;
-import org.junit.jupiter.api.extension.ExtendWith;
/**
* Functional test for {@link ClusterConfigurationController}.
*/
@MicronautTest
-@ExtendWith(ConfigurationExtension.class)
@Property(name = "ignite.endpoints.filter-non-initialized", value = "false")
+@Property(name = "micronaut.security.enabled", value = "false")
class ClusterConfigurationControllerTest extends
ConfigurationControllerBaseTest {
- @InjectConfiguration
- SecurityConfiguration securityConfiguration;
-
@Inject
@Client("/management/v1/configuration/cluster/")
HttpClient client;
@@ -66,17 +54,4 @@ class ClusterConfigurationControllerTest extends
ConfigurationControllerBaseTest
public ConfigurationPresentation<String>
cfgPresentation(ConfigurationRegistry configurationRegistry) {
return new HoconPresentation(configurationRegistry);
}
-
- @Factory
- @Bean
- @Replaces(RestManagerFactory.class)
- public RestManagerFactory restManagerProvider() {
- return new RestManagerFactory(new RestManager());
- }
-
- @Bean
- @Factory
- AuthenticationManager authenticationManager() {
- return new AuthenticationManagerImpl(securityConfiguration, ign -> {});
- }
}
diff --git
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
index 96eed68795..942c3cf83d 100644
---
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/NodeConfigurationControllerTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.rest.configuration;
import io.micronaut.context.annotation.Bean;
-import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Property;
import io.micronaut.context.annotation.Replaces;
import io.micronaut.http.client.HttpClient;
import io.micronaut.http.client.annotation.Client;
@@ -28,24 +28,14 @@ import jakarta.inject.Named;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
import
org.apache.ignite.internal.configuration.presentation.ConfigurationPresentation;
import org.apache.ignite.internal.configuration.presentation.HoconPresentation;
-import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
-import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
-import org.apache.ignite.internal.rest.RestManager;
-import org.apache.ignite.internal.rest.RestManagerFactory;
-import
org.apache.ignite.internal.security.authentication.AuthenticationManager;
-import
org.apache.ignite.internal.security.authentication.AuthenticationManagerImpl;
-import org.apache.ignite.internal.security.configuration.SecurityConfiguration;
-import org.junit.jupiter.api.extension.ExtendWith;
/**
* Functional test for {@link NodeConfigurationController}.
*/
@MicronautTest
-@ExtendWith(ConfigurationExtension.class)
+@Property(name = "ignite.endpoints.filter-non-initialized", value = "false")
+@Property(name = "micronaut.security.enabled", value = "false")
class NodeConfigurationControllerTest extends ConfigurationControllerBaseTest {
- @InjectConfiguration
- SecurityConfiguration securityConfiguration;
-
@Inject
@Client("/management/v1/configuration/node/")
HttpClient client;
@@ -64,17 +54,4 @@ class NodeConfigurationControllerTest extends
ConfigurationControllerBaseTest {
public ConfigurationPresentation<String>
cfgPresentation(ConfigurationRegistry configurationRegistry) {
return new HoconPresentation(configurationRegistry);
}
-
- @Factory
- @Bean
- @Replaces(RestManagerFactory.class)
- public RestManagerFactory restManagerProvider() {
- return new RestManagerFactory(new RestManager());
- }
-
- @Bean
- @Factory
- AuthenticationManager authenticationManager() {
- return new AuthenticationManagerImpl(securityConfiguration, ign -> {});
- }
}
diff --git
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/recovery/system/SystemDisasterRecoveryControllerTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/recovery/system/SystemDisasterRecoveryControllerTest.java
index c444d55153..dcdb5f5a70 100644
---
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/recovery/system/SystemDisasterRecoveryControllerTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/recovery/system/SystemDisasterRecoveryControllerTest.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import io.micronaut.context.annotation.Bean;
-import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Property;
import io.micronaut.context.annotation.Replaces;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpResponse;
@@ -47,32 +47,22 @@ import java.util.List;
import java.util.Optional;
import java.util.UUID;
import org.apache.ignite.internal.cluster.management.ClusterState;
-import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
-import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import
org.apache.ignite.internal.disaster.system.SystemDisasterRecoveryManager;
import
org.apache.ignite.internal.disaster.system.exception.ClusterResetException;
import org.apache.ignite.internal.disaster.system.exception.MigrateException;
-import org.apache.ignite.internal.rest.RestManager;
-import org.apache.ignite.internal.rest.RestManagerFactory;
import org.apache.ignite.internal.rest.api.Problem;
import org.apache.ignite.internal.rest.api.recovery.system.MigrateRequest;
import org.apache.ignite.internal.rest.api.recovery.system.ResetClusterRequest;
-import
org.apache.ignite.internal.security.authentication.AuthenticationManager;
-import
org.apache.ignite.internal.security.authentication.AuthenticationManagerImpl;
-import org.apache.ignite.internal.security.configuration.SecurityConfiguration;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
@MicronautTest
-@ExtendWith(ConfigurationExtension.class)
+@Property(name = "ignite.endpoints.filter-non-initialized", value = "false")
+@Property(name = "micronaut.security.enabled", value = "false")
class SystemDisasterRecoveryControllerTest extends BaseIgniteAbstractTest {
- @InjectConfiguration
- private SecurityConfiguration securityConfiguration;
-
@Inject
@Client("/management/v1/recovery/cluster/")
private HttpClient client;
@@ -84,19 +74,6 @@ class SystemDisasterRecoveryControllerTest extends
BaseIgniteAbstractTest {
Mockito.reset(systemDisasterRecoveryManager);
}
- @Factory
- @Bean
- @Replaces(RestManagerFactory.class)
- RestManagerFactory restManagerProvider() {
- return new RestManagerFactory(new RestManager());
- }
-
- @Bean
- @Factory
- AuthenticationManager authenticationManager() {
- return new AuthenticationManagerImpl(securityConfiguration, ign -> {});
- }
-
@Bean
@Replaces(SystemDisasterRecoveryFactory.class)
SystemDisasterRecoveryFactory systemDisasterRecoveryFactory() {
