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/15 21:12:39 UTC
ignite git commit: WIP.
Repository: ignite
Updated Branches:
refs/heads/ignite-2817 91fc9ab59 -> 48cdc57b5
WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48cdc57b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48cdc57b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48cdc57b
Branch: refs/heads/ignite-2817
Commit: 48cdc57b54013aca10eb4235fe82a24b060009da
Parents: 91fc9ab
Author: thatcoach <pp...@list.ru>
Authored: Tue Mar 15 23:07:18 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Tue Mar 15 23:07:18 2016 +0300
----------------------------------------------------------------------
.../igfs/IgfsMetaManagerSelfTest.java | 39 ++++++++++----------
1 file changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48cdc57b/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 f3d35f4..e4ea5ec 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;
@@ -38,13 +33,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.
@@ -171,33 +170,33 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
assertNull("Unexpected stored properties: " + info, info.properties().get(key1));
assertNull("Unexpected stored properties: " + info, info.properties().get(key2));
- info = mgr.updateProperties(ROOT_ID, fileId, fileName, F.asMap(key1, "1"));
+ info = mgr.updateProperties(fileId, F.asMap(key1, "1"));
assertEquals("Unexpected stored properties: " + info, "1", info.properties().get(key1));
- info = mgr.updateProperties(ROOT_ID, fileId, fileName, F.asMap(key2, "2"));
+ info = mgr.updateProperties(fileId, F.asMap(key2, "2"));
// assertEquals("Unexpected stored properties: " + info, F.asMap(key1, "1", key2, "2"), info.properties());
assertEquals("Unexpected stored properties: " + info, "1", info.properties().get(key1));
assertEquals("Unexpected stored properties: " + info, "2", info.properties().get(key2));
- info = mgr.updateProperties(ROOT_ID, fileId, fileName, F.<String, String>asMap(key1, null));
+ info = mgr.updateProperties(fileId, F.<String, String>asMap(key1, null));
assertEquals("Unexpected stored properties: " + info, "2", info.properties().get(key2));
- info = mgr.updateProperties(ROOT_ID, fileId, fileName, F.<String, String>asMap(key2, null));
+ info = mgr.updateProperties(fileId, F.<String, String>asMap(key2, null));
assertNull("Unexpected stored properties: " + info, info.properties().get(key1));
assertNull("Unexpected stored properties: " + info, info.properties().get(key2));
- assertNull(mgr.updateProperties(ROOT_ID, fileId, "not_exists", F.<String, String>asMap(key2, null)));
+ assertNull(mgr.updateProperties(fileId, F.<String, String>asMap(key2, null)));
}
mgr.softDelete(new IgfsPath("/dir"), true);
mgr.softDelete(new IgfsPath("/file"), false);
- assertNull(mgr.updateProperties(ROOT_ID, dir.id(), "dir", F.asMap("p", "7")));
- assertNull(mgr.updateProperties(ROOT_ID, file.id(), "file", F.asMap("q", "8")));
+ assertNull(mgr.updateProperties(dir.id(), F.asMap("p", "7")));
+ assertNull(mgr.updateProperties(file.id(), F.asMap("q", "8")));
}
private IgfsFileInfo mkdirsAndGetInfo(String path) throws IgniteCheckedException {
@@ -423,7 +422,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
Class<? extends Throwable> cls, @Nullable String msg) {
assertThrows(log, new Callable() {
@Override public Object call() throws Exception {
- return mgr.updateProperties(null, fileId, "file", props);
+ return mgr.updateProperties(fileId, props);
}
}, cls, msg);
}