You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/17 21:48:40 UTC
ignite git commit: Fix in meta manager tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-igfs-refactoring a6716ffcb -> f9683af0f
Fix in meta manager tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9683af0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9683af0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9683af0
Branch: refs/heads/ignite-igfs-refactoring
Commit: f9683af0f181b17309a60763dd02e86bddc9194a
Parents: a6716ff
Author: thatcoach <pp...@list.ru>
Authored: Thu Mar 17 23:43:15 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Thu Mar 17 23:43:15 2016 +0300
----------------------------------------------------------------------
.../igfs/IgfsMetaManagerSelfTest.java | 39 +++++++++-----------
1 file changed, 17 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f9683af0/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..38ad188 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,13 +32,17 @@ 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 static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.internal.processors.igfs.IgfsUtils.ROOT_ID;
-import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
-import static org.apache.ignite.testframework.GridTestUtils.assertThrowsInherited;
+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.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.internal.processors.igfs.IgfsUtils.*;
+import static org.apache.ignite.testframework.GridTestUtils.*;
/**
* {@link IgfsMetaManager} test case.
@@ -297,14 +295,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 +411,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);
}