Merge pull request #7 from nizhikov/IGNITE-12608
IGNITE-12608: Setup spring autoconfigurer modules on TC.
diff --git a/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTestSuite.java b/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTestSuite.java
deleted file mode 100644
index 04a18ee..0000000
--- a/modules/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteAutoconfigureTestSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.springframework.boot.autoconfigure;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({IgniteAutoconfigureTest.class})
-public class IgniteAutoconfigureTestSuite {
-}
diff --git a/modules/spring-boot-client-autoconfigure/pom.xml b/modules/spring-boot-client-autoconfigure/pom.xml
index f50ab78..f7be2c1 100644
--- a/modules/spring-boot-client-autoconfigure/pom.xml
+++ b/modules/spring-boot-client-autoconfigure/pom.xml
@@ -72,7 +72,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
diff --git a/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
index 698a83d..642768b 100644
--- a/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
+++ b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
@@ -23,6 +23,7 @@
import org.apache.ignite.Ignition;
import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -43,7 +44,7 @@
@ExtendWith(SpringExtension.class)
public class IgniteClientAutoConfigureTest {
/** Default address. */
- public static final String DEFAULT_ADDR = "127.0.0.1:10800";
+ public static final String DEFAULT_ADDR = "127.0.0.1:10801";
/** Cache names. */
public static final Set<String> CACHES = Collections.singleton("my-cache");
@@ -57,7 +58,9 @@
/** */
@BeforeAll
public static void beforeClass() {
- node = Ignition.start(new IgniteConfiguration());
+ node = Ignition.start(new IgniteConfiguration()
+ .setClientConnectorConfiguration(
+ new ClientConnectorConfiguration().setPort(10801)));
for (String cache : CACHES)
node.createCache(cache);
diff --git a/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTestSuite.java b/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTestSuite.java
deleted file mode 100644
index abdcf8d..0000000
--- a/modules/spring-boot-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTestSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.springframework.boot.autoconfigure;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({IgniteClientAutoConfigureTest.class})
-public class IgniteClientAutoConfigureTestSuite {
-}