From 319ab6d98ff6f2d17ebda87fc4cfe65bf02667ef Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Thu, 27 Dec 2018 23:29:51 -0800
Subject: refactoring

---
 .../test/java/seaweed/hdfs/SeaweedReadTest.java    | 65 +++++++++++++++++++++
 .../test/java/seaweedfs/hdfs/SeaweedReadTest.java  | 66 ----------------------
 2 files changed, 65 insertions(+), 66 deletions(-)
 create mode 100644 other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java
 delete mode 100644 other/java/hdfs/src/test/java/seaweedfs/hdfs/SeaweedReadTest.java

(limited to 'other/java/hdfs/src/test')

diff --git a/other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java b/other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java
new file mode 100644
index 000000000..e3ab97910
--- /dev/null
+++ b/other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java
@@ -0,0 +1,65 @@
+package seaweed.hdfs;
+
+import org.junit.Test;
+import seaweedfs.client.FilerProto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class SeaweedReadTest {
+
+    @Test
+    public void testNonOverlappingVisibleIntervals() {
+        List<FilerProto.FileChunk> chunks = new ArrayList<>();
+        chunks.add(FilerProto.FileChunk.newBuilder()
+            .setFileId("aaa")
+            .setOffset(0)
+            .setSize(100)
+            .setMtime(1000)
+            .build());
+        chunks.add(FilerProto.FileChunk.newBuilder()
+            .setFileId("bbb")
+            .setOffset(100)
+            .setSize(133)
+            .setMtime(2000)
+            .build());
+
+        List<SeaweedRead.VisibleInterval> visibleIntervals = SeaweedRead.nonOverlappingVisibleIntervals(chunks);
+        for (SeaweedRead.VisibleInterval visibleInterval : visibleIntervals) {
+            System.out.println("visible:" + visibleInterval);
+        }
+
+        assertEquals(visibleIntervals.size(), 2);
+
+        SeaweedRead.VisibleInterval visibleInterval = visibleIntervals.get(0);
+        assertEquals(visibleInterval.start, 0);
+        assertEquals(visibleInterval.stop, 100);
+        assertEquals(visibleInterval.modifiedTime, 1000);
+        assertEquals(visibleInterval.fileId, "aaa");
+
+        visibleInterval = visibleIntervals.get(1);
+        assertEquals(visibleInterval.start, 100);
+        assertEquals(visibleInterval.stop, 233);
+        assertEquals(visibleInterval.modifiedTime, 2000);
+        assertEquals(visibleInterval.fileId, "bbb");
+
+        List<SeaweedRead.ChunkView> chunkViews = SeaweedRead.viewFromVisibles(visibleIntervals, 0, 233);
+
+        SeaweedRead.ChunkView chunkView = chunkViews.get(0);
+        assertEquals(chunkView.offset, 0);
+        assertEquals(chunkView.size, 100);
+        assertEquals(chunkView.logicOffset, 0);
+        assertEquals(chunkView.fileId, "aaa");
+
+        chunkView = chunkViews.get(1);
+        assertEquals(chunkView.offset, 0);
+        assertEquals(chunkView.size, 133);
+        assertEquals(chunkView.logicOffset, 100);
+        assertEquals(chunkView.fileId, "bbb");
+
+
+    }
+
+}
diff --git a/other/java/hdfs/src/test/java/seaweedfs/hdfs/SeaweedReadTest.java b/other/java/hdfs/src/test/java/seaweedfs/hdfs/SeaweedReadTest.java
deleted file mode 100644
index 4bb9efff5..000000000
--- a/other/java/hdfs/src/test/java/seaweedfs/hdfs/SeaweedReadTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package seaweedfs.hdfs;
-
-import org.junit.Test;
-import seaweed.hdfs.SeaweedRead;
-import seaweedfs.client.FilerProto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-public class SeaweedReadTest {
-
-    @Test
-    public void testNonOverlappingVisibleIntervals() {
-        List<FilerProto.FileChunk> chunks = new ArrayList<>();
-        chunks.add(FilerProto.FileChunk.newBuilder()
-            .setFileId("aaa")
-            .setOffset(0)
-            .setSize(100)
-            .setMtime(1000)
-            .build());
-        chunks.add(FilerProto.FileChunk.newBuilder()
-            .setFileId("bbb")
-            .setOffset(100)
-            .setSize(133)
-            .setMtime(2000)
-            .build());
-
-        List<SeaweedRead.VisibleInterval> visibleIntervals = SeaweedRead.nonOverlappingVisibleIntervals(chunks);
-        for (SeaweedRead.VisibleInterval visibleInterval : visibleIntervals) {
-            System.out.println("visible:" + visibleInterval);
-        }
-
-        assertEquals(visibleIntervals.size(), 2);
-
-        SeaweedRead.VisibleInterval visibleInterval = visibleIntervals.get(0);
-        assertEquals(visibleInterval.start, 0);
-        assertEquals(visibleInterval.stop, 100);
-        assertEquals(visibleInterval.modifiedTime, 1000);
-        assertEquals(visibleInterval.fileId, "aaa");
-
-        visibleInterval = visibleIntervals.get(1);
-        assertEquals(visibleInterval.start, 100);
-        assertEquals(visibleInterval.stop, 233);
-        assertEquals(visibleInterval.modifiedTime, 2000);
-        assertEquals(visibleInterval.fileId, "bbb");
-
-        List<SeaweedRead.ChunkView> chunkViews = SeaweedRead.viewFromVisibles(visibleIntervals, 0, 233);
-
-        SeaweedRead.ChunkView chunkView = chunkViews.get(0);
-        assertEquals(chunkView.offset, 0);
-        assertEquals(chunkView.size, 100);
-        assertEquals(chunkView.logicOffset, 0);
-        assertEquals(chunkView.fileId, "aaa");
-
-        chunkView = chunkViews.get(1);
-        assertEquals(chunkView.offset, 0);
-        assertEquals(chunkView.size, 133);
-        assertEquals(chunkView.logicOffset, 100);
-        assertEquals(chunkView.fileId, "bbb");
-
-
-    }
-
-}
-- 
cgit v1.2.3