ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: Fixed test.
Date Tue, 15 Mar 2016 20:22:21 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2817 48cdc57b5 -> e0b3c0e05


Fixed test.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0b3c0e0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0b3c0e0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0b3c0e0

Branch: refs/heads/ignite-2817
Commit: e0b3c0e0525ebb066cfc49d7e6f81a463cb95e2f
Parents: 48cdc57
Author: thatcoach <ppozerov@list.ru>
Authored: Tue Mar 15 23:17:00 2016 +0300
Committer: thatcoach <ppozerov@list.ru>
Committed: Tue Mar 15 23:17:00 2016 +0300

----------------------------------------------------------------------
 .../processors/igfs/IgfsMetaManagerSelfTest.java         | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0b3c0e0/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 e4ea5ec..110685e 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
@@ -188,15 +188,12 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest
{
 
             assertNull("Unexpected stored properties: " + info, info.properties().get(key1));
             assertNull("Unexpected stored properties: " + info, info.properties().get(key2));
-
-            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(dir.id(), F.asMap("p", "7")));
-        assertNull(mgr.updateProperties(file.id(), F.asMap("q", "8")));
     }
 
     private IgfsFileInfo mkdirsAndGetInfo(String path) throws IgniteCheckedException {
@@ -308,8 +305,8 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         expectsRenameFail("/a/k", "/a/b/", "Failed to perform move because destination already
" +
             "contains entry with the same name existing file");
 
-        mgr.delete(a.id(), "k", k.id());
-        mgr.delete(b.id(), "k", z.id());
+        mgr.delete(a.id(), "k", z.id());
+        mgr.delete(b.id(), "k", k.id());
 
         System.out.println("/: " + mgr.directoryListing(ROOT_ID));
         System.out.println("a: " + mgr.directoryListing(a.id()));
@@ -338,9 +335,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
         assertEquals(F.asMap("a", new IgfsListingEntry(a), "f1", new IgfsListingEntry(f1)),
                 mgr.directoryListing(ROOT_ID));
 
-        assertEquals(
-            F.asMap("b", new IgfsListingEntry(b),
-                "f2", new IgfsListingEntry(f2)),
+        assertEquals(F.asMap("b", new IgfsListingEntry(b), "f2", new IgfsListingEntry(f2)),
             mgr.directoryListing(a.id()));
 
         assertEmpty(mgr.directoryListing(b.id()));


Mime
View raw message