[ignite] branch ignite-11461-java11 updated: IGNITE-11461: Automatic modules support for Apache Ignite: First persistent store test passed

[dp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ignite-11461-java11
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/ignite-11461-java11 by this push:
     new 650b352  IGNITE-11461: Automatic modules support for Apache Ignite: First persistent store test passed
650b352 is described below

commit 650b3524d0377b52e102af432437912f1f0ad7f1
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Mar 1 17:57:45 2019 +0300

    IGNITE-11461: Automatic modules support for Apache Ignite: First persistent store test passed
---
 modules/dev-utils/ignite-modules-test/build.gradle | 10 ++++++--
 .../modulestest/IgniteLaunchInModularEnvTest.java  | 29 +++++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/modules/dev-utils/ignite-modules-test/build.gradle b/modules/dev-utils/ignite-modules-test/build.gradle
index 661b593..4d55d87 100644
--- a/modules/dev-utils/ignite-modules-test/build.gradle
+++ b/modules/dev-utils/ignite-modules-test/build.gradle
@@ -28,10 +28,9 @@ targetCompatibility = 11
 ext {
     //ignVer = '2.8.0-SNAPSHOT'
     ignVer = '2.7.0'
+    moduleName = 'ignite_modules_test'
 }
 
-ext.moduleName = 'ignite_modules_test'
-
 compileJava {
     inputs.property("moduleName", moduleName)
     doFirst {
@@ -64,6 +63,13 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 
     compile group: 'org.apache.ignite', name: 'ignite-core', version: ignVer
+    //todo https://issues.apache.org/jira/browse/IGNITE-11464 - Fix indexing modularity:
+    /* compile (group: 'org.apache.ignite', name: 'ignite-indexing', version: ignVer) {
+        //transitive=false; // to remove "lucene-sandbox"
+    }*/
+    // compile group: 'org.apache.ignite', name: 'ignite-direct-io', version: ignVer
+    // compile group: 'org.apache.ignite', name: 'ignite-compress', version: ignVer
+    //compile group: 'org.apache.ignite', name: 'ignite-spring', version: ignVer
 }
 
 test {
diff --git a/modules/dev-utils/ignite-modules-test/src/test/java/org/apache/ignite/modulestest/IgniteLaunchInModularEnvTest.java b/modules/dev-utils/ignite-modules-test/src/test/java/org/apache/ignite/modulestest/IgniteLaunchInModularEnvTest.java
index 600dcf8..c71ee3d 100644
--- a/modules/dev-utils/ignite-modules-test/src/test/java/org/apache/ignite/modulestest/IgniteLaunchInModularEnvTest.java
+++ b/modules/dev-utils/ignite-modules-test/src/test/java/org/apache/ignite/modulestest/IgniteLaunchInModularEnvTest.java
@@ -23,10 +23,18 @@ import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.DataRegionConfiguration;
 import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static junit.framework.TestCase.assertTrue;
+import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
+
 /**
  *
  */
@@ -47,11 +55,13 @@ public class IgniteLaunchInModularEnvTest {
     public void testPdsEnabledSimpleLaunch() {
         IgniteConfiguration cfg = igniteConfiguration();
 
-        DataRegionConfiguration regCfg = new DataRegionConfiguration();
-        regCfg.setMaxSize(256L*1024*1024);
-        regCfg.setPersistenceEnabled(true);
+        DataRegionConfiguration regCfg = new DataRegionConfiguration()
+            .setMaxSize(256L * 1024 * 1024)
+            .setPersistenceEnabled(true);
 
-        cfg.setDataStorageConfiguration(new DataStorageConfiguration().setDefaultDataRegionConfiguration(regCfg));
+        cfg.setDataStorageConfiguration(
+            new DataStorageConfiguration()
+                .setDefaultDataRegionConfiguration(regCfg));
 
         Ignite ignite = Ignition.start(cfg);
 
@@ -62,6 +72,17 @@ public class IgniteLaunchInModularEnvTest {
         ignite.close();
     }
 
+
+    @Before
+    public void cleanPersistenceDir() throws Exception {
+        assertTrue("Grids are not stopped", F.isEmpty(G.allGrids()));
+
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "cp", false));
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "marshaller", false));
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
+    }
+
     /**
      * @return default configuration for test without spring module.
      */