http://git-wip-us.apache.org/repos/asf/ignite/blob/ebf40752/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java index 19a91ad..26424f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java @@ -17,11 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.Callable; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.FileSystemConfiguration; @@ -29,7 +24,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.igfs.IgfsException; import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper; import org.apache.ignite.igfs.IgfsPath; -import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteUuid; @@ -38,6 +32,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.jetbrains.annotations.Nullable; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.Callable; + import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -142,7 +142,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { assertEmpty(mgr.directoryListing(ROOT_ID)); assertTrue(mgr.mkdirs(new IgfsPath("/dir"), IgfsImpl.DFLT_DIR_META)); - assertNotNull(mgr.create(new IgfsPath("/file"), false, false, null, 400, null, false, null)); + assertNotNull(mgr.create(new IgfsPath("/file"), null, false, 400, null, false, null)); IgfsListingEntry dirEntry = mgr.directoryListing(ROOT_ID).get("dir"); assertNotNull(dirEntry); @@ -214,7 +214,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { private IgfsFileInfo createFileAndGetInfo(String path) throws IgniteCheckedException { IgfsPath p = path(path); - IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = mgr.create(p, false, false, null, 400, null, false, null); + IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = mgr.create(p, null, false, 400, null, false, null); assert t2 != null; assert !t2.get1().isDirectory(); @@ -297,14 +297,13 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { assertEquals(Arrays.asList(ROOT_ID, null, null, null, null), mgr.fileIds(new IgfsPath("/f7/a/b/f6"))); // One of participated files does not exist in cache. - expectsRenameFail("/b8", "/b2", "Failed to perform move because some path component was not found."); + expectsRenameFail("/b8", "/b2"); - expectsRenameFail("/a", "/b/b8", "Failed to perform move because some path component was not found."); + expectsRenameFail("/a", "/b/b8"); - expectsRenameFail("/a/f2", "/a/b/f3", "Failed to perform move because destination points to existing file"); + expectsRenameFail("/a/f2", "/a/b/f3"); - expectsRenameFail("/a/k", "/a/b/", "Failed to perform move because destination already " + - "contains entry with the same name existing file"); + expectsRenameFail("/a/k", "/a/b/"); mgr.delete(a.id(), "k", z.id()); mgr.delete(b.id(), "k", k.id()); @@ -414,17 +413,15 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { /** * Test expected failures for 'move file' operation. - * - * @param msg Failure message if expected exception was not thrown. */ - private void expectsRenameFail(final String src, final String dst, @Nullable String msg) { + private void expectsRenameFail(final String src, final String dst) { Throwable err = assertThrowsInherited(log, new Callable() { @Override public Object call() throws Exception { mgr.move(new IgfsPath(src), new IgfsPath(dst)); return null; } - }, IgfsException.class, msg); + }, IgfsException.class, null); assertTrue("Unexpected cause: " + err, err instanceof IgfsException); }
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebf40752/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java index f567099..4112846 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java @@ -626,17 +626,17 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { /** @throws Exception If failed. */ public void testCreateOpenAppend() throws Exception { // Error - path points to root directory. - assertCreateFails("/", false, "Failed to create file (path points to an existing directory)"); + assertCreateFails("/", false); // Create directories. igfs.mkdirs(path("/A/B1/C1")); // Error - path points to directory. for (String path : Arrays.asList("/A", "/A/B1", "/A/B1/C1")) { - assertCreateFails(path, false, "Failed to create file (path points to an existing directory)"); - assertCreateFails(path, true, "Failed to create file (path points to an existing directory)"); - assertAppendFails(path, false, "Failed to open file (path points to an existing directory)"); - assertAppendFails(path, true, "Failed to open file (path points to an existing directory)"); + assertCreateFails(path, false); + assertCreateFails(path, true); + assertAppendFails(path, false); + assertAppendFails(path, true); assertOpenFails(path, "Failed to open file (not a file)"); } @@ -647,13 +647,13 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { for (String path : Arrays.asList("/A/a", "/A/B1/a", "/A/B1/C1/a")) { // Error - file doesn't exist. assertOpenFails(path, "File not found"); - assertAppendFails(path, false, "File not found"); + assertAppendFails(path, false); // Create new and write. assertEquals(text1, create(path, false, text1)); // Error - file already exists. - assertCreateFails(path, false, "Failed to create file (file already exists and overwrite flag is false)"); + assertCreateFails(path, false); // Overwrite existent. assertEquals(text2, create(path, true, text2)); @@ -669,7 +669,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { // Error - file doesn't exist. assertOpenFails(path, "File not found"); - assertAppendFails(path, false, "File not found"); + assertAppendFails(path, false); // Create with append. assertEquals(text1, append(path, true, text1)); @@ -927,16 +927,15 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { * * @param path File path to create. * @param overwrite Overwrite file if it already exists. Note: you cannot overwrite an existent directory. - * @param msg Failure message if expected exception was not thrown. */ - private void assertCreateFails(final String path, final boolean overwrite, @Nullable String msg) { + private void assertCreateFails(final String path, final boolean overwrite) { GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @Override public Object call() throws Exception { igfs.create(path(path), overwrite); return false; } - }, IgfsException.class, msg); + }, IgfsException.class, null); } /** @@ -944,16 +943,15 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { * * @param path File path to append. * @param create Create file if it doesn't exist yet. - * @param msg Failure message if expected exception was not thrown. */ - private void assertAppendFails(final String path, final boolean create, @Nullable String msg) { + private void assertAppendFails(final String path, final boolean create) { GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @Override public Object call() throws Exception { igfs.append(path(path), create); return false; } - }, IgfsException.class, msg); + }, IgfsException.class, null); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ebf40752/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java index 56559cb..eff44f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.io.BufferedWriter; -import java.io.OutputStreamWriter; -import java.util.concurrent.Callable; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.configuration.CacheConfiguration; @@ -35,6 +32,10 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; +import java.io.BufferedWriter; +import java.io.OutputStreamWriter; +import java.util.concurrent.Callable; + import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -85,7 +86,7 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest { metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); - dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setFileSystemConfiguration(igfsCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/ebf40752/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java index c013cae..1dd665a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java @@ -46,11 +46,11 @@ public class IgfsEventsTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite FS Events Test Suite"); - suite.addTest(new TestSuite(ldr.loadClass(ShmemPrivate.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(ShmemPrimary.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(ShmemDualSync.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(ShmemDualAsync.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrimary.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName()))); @@ -66,7 +66,7 @@ public class IgfsEventsTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite IGFS Events Test Suite Noarch Only"); - suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrimary.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName()))); @@ -76,7 +76,7 @@ public class IgfsEventsTestSuite extends TestSuite { /** * Shared memory IPC in PRIVATE mode. */ - public static class ShmemPrivate extends IgfsEventsAbstractSelfTest { + public static class ShmemPrimary extends IgfsEventsAbstractSelfTest { /** {@inheritDoc} */ @Override protected FileSystemConfiguration getIgfsConfiguration() throws IgniteCheckedException { FileSystemConfiguration igfsCfg = super.getIgfsConfiguration(); @@ -95,7 +95,7 @@ public class IgfsEventsTestSuite extends TestSuite { /** * Loopback socket IPS in PRIVATE mode. */ - public static class LoopbackPrivate extends IgfsEventsAbstractSelfTest { + public static class LoopbackPrimary extends IgfsEventsAbstractSelfTest { /** {@inheritDoc} */ @Override protected FileSystemConfiguration getIgfsConfiguration() throws IgniteCheckedException { FileSystemConfiguration igfsCfg = super.getIgfsConfiguration();
