embulk-input-filesplit 0.1.1

data/src/test/java/org/embulk/input/filesplit/EmbulkPluginTester.java

@@ -0,0 +1,95 @@
+package org.embulk.input.filesplit;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.embulk.EmbulkService;
+import org.embulk.config.ConfigLoader;
+import org.embulk.config.ConfigSource;
+import org.embulk.exec.ExecutionResult;
+import org.embulk.exec.LocalExecutor;
+import org.embulk.plugin.InjectedPluginSource;
+import org.embulk.spi.ExecSession;
+
+import com.google.inject.Binder;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+public class EmbulkPluginTester {
+	
+	private final Class<?> iface;
+	private final String name;
+	private final Class<?> impl;
+	
+	
+	public EmbulkPluginTester(Class<?> iface, String name, Class<?> impl) 
+	{
+		this.iface = iface;
+		this.name = name;
+		this.impl = impl;
+	}
+
+	public void run(String ymlPath) throws Exception 
+	{
+		EmbulkService service = new EmbulkService(new EmptyConfigSource()) {
+			protected Iterable<? extends Module> getAdditionalModules(ConfigSource systemConfig)
+			{
+				return Arrays.asList(new Module()
+				{
+					@Override
+					public void configure(Binder binder)
+					{
+						InjectedPluginSource.registerPluginTo(binder, iface, name, impl);
+					}
+				});
+			}
+		};
+		Injector injector = service.getInjector();
+		ConfigSource config = injector.getInstance(ConfigLoader.class).fromYamlFile(convert(ymlPath));
+		ExecSession session = new ExecSession(injector, config);
+        LocalExecutor executor = injector.getInstance(LocalExecutor.class);
+        ExecutionResult result = executor.run(session, config);
+        System.out.println(result);
+	}
+
+	private File convert(String yml) {
+		try {
+			File rootPath = new File(EmbulkPluginTester.class.getResource("/resource.txt").toURI()).getParentFile();
+			File ymlPath = new File(EmbulkPluginTester.class.getResource(yml).toURI());
+			File tempYmlPath = new File(ymlPath.getParentFile(), "temp-" + ymlPath.getName());
+			Pattern pathPrefixPattern = Pattern.compile("^ *path(_prefix)?: '(.*)'$");
+			try (BufferedReader reader = new BufferedReader(new FileReader(ymlPath))) {
+				try (BufferedWriter writer = new BufferedWriter(new FileWriter(tempYmlPath))) {
+					String line;
+					while ((line = reader.readLine()) != null) {
+						Matcher matcher = pathPrefixPattern.matcher(line);
+						if (matcher.matches()) {
+							int group = 2;
+							writer.write(line.substring(0, matcher.start(group)));
+							writer.write(new File(rootPath, matcher.group(group)).getAbsolutePath());
+							writer.write(line.substring(matcher.end(group)));
+						} else {
+							writer.write(line);
+						}
+						writer.newLine();
+					}
+				}
+			}
+			return tempYmlPath.getAbsoluteFile();
+			
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		} catch (URISyntaxException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+}

data/src/test/java/org/embulk/input/filesplit/EmptyConfigSource.java

@@ -0,0 +1,107 @@
+package org.embulk.input.filesplit;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.embulk.config.ConfigSource;
+import org.embulk.config.DataSource;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public class EmptyConfigSource implements ConfigSource
+{
+
+	@Override
+	public <E> E get(Class<E> type, String attrName)
+	{
+		return null;
+	}
+
+	@Override
+	public <E> E get(Class<E> type, String attrName, E defaultValue)
+	{
+		return defaultValue;
+	}
+
+	@Override
+	public List<String> getAttributeNames()
+	{
+		return Collections.emptyList();
+	}
+
+	@Override
+	public Iterable<Entry<String, JsonNode>> getAttributes() 
+	{
+		return Collections.emptyList();
+	}
+
+	@Override
+	public ObjectNode getObjectNode()
+	{
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty() 
+	{
+		return true;
+	}
+
+	@Override
+	public ConfigSource deepCopy()
+	{
+		return this;
+	}
+
+	@Override
+	public ConfigSource getNested(String s) 
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public ConfigSource getNestedOrSetEmpty(String s)
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public <T> T loadConfig(Class<T> class1)
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public ConfigSource merge(DataSource datasource)
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public ConfigSource set(String s, Object obj)
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public ConfigSource setAll(DataSource datasource)
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public ConfigSource setNested(String s, DataSource datasource) 
+	{
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+	
+}

data/src/test/java/org/embulk/input/filesplit/LocalFileSplitInputPluginTest.java

@@ -0,0 +1,94 @@
+package org.embulk.input.filesplit;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.embulk.spi.InputPlugin;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class LocalFileSplitInputPluginTest {
+	
+	private EmbulkPluginTester tester = new EmbulkPluginTester(InputPlugin.class, "filesplit", LocalFileSplitInputPlugin.class);
+	
+	@Test
+	public void test() throws Exception
+	{
+		run("/yml/test.yml", "/data/test.csv");
+	}
+	
+	@Test
+	public void testTasks() throws Exception
+	{
+		run("/yml/test-tasks.yml", "/data/test.csv");
+	}
+	
+	@Test
+	public void testHeader() throws Exception
+	{
+		run("/yml/test-header.yml", "/data/test.csv");
+	}
+	
+	@Test
+	public void testOnlyHeader() throws Exception
+	{
+		run("/yml/test-only-header.yml", "/data/empty.csv");
+	}
+	
+	private void run(String ymlPath, String expectedName) throws Exception
+	{
+		List<String> expected = readAll(expectedName);
+		Collections.sort(expected);
+
+		File file = prepare();
+		tester.run(ymlPath);
+		
+		List<String> actual= readAll(file);
+		Collections.sort(actual);
+		
+		assertEquals(expected, actual);
+	}
+	
+	private File prepare() throws URISyntaxException
+	{
+		File file = new File(new File(getClass().getResource("/resource.txt").toURI()).getParentFile(), "temp");
+		file.mkdir();
+		for (File child : file.listFiles()) {
+			child.delete();
+		}
+		return file;
+	}
+	
+	private List<String> readAll(String name) throws IOException, URISyntaxException
+	{
+		return readAll(new File(getClass().getResource(name).toURI()));
+	}
+	
+	private List<String> readAll(File file) throws IOException 
+	{
+		if (file.isFile()) {
+			FileSystem fs = FileSystems.getDefault();
+			Charset charset = Charset.forName("UTF-8");
+			return Files.readAllLines(fs.getPath(file.getAbsolutePath()), charset);
+		}
+		
+		if (file.isDirectory()) {
+			List<String> lines = new ArrayList<String>();
+			for (File child : file.listFiles()) {
+				lines.addAll(readAll(child));
+			}
+			return lines;
+		}
+		
+		return Collections.emptyList();
+	}
+	
+}

data/src/test/java/org/embulk/input/filesplit/LocalFileSplitInputTest.java

@@ -0,0 +1,81 @@
+/*
+ * $Id: typical.epf 2627 2010-03-18 01:40:13Z tiba $
+ */
+package org.embulk.input.filesplit;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+
+import org.embulk.input.filesplit.LocalFileSplitInputPlugin.LocalFileSplitInput.FileSplitProvider;
+import org.junit.Test;
+
+public class LocalFileSplitInputTest {
+	
+	@Test
+	public void testHeader() throws Exception
+	{
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-header.csv", 0, 20)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals("1,aaaaa,12345", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-header.csv", 0, 10)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-header.csv", 1, 2)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+		
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-header.csv", 1, 20)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals("1,aaaaa,12345", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+		
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-header.csv", 1, 40)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals("1,aaaaa,12345", reader.readLine());
+			assertEquals("2,bbb,67890", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+		
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-header.csv", 20, 40)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals("2,bbb,67890", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+	}
+	
+	@Test
+	public void testOnlyHeader() throws Exception
+	{
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-only-header.csv", 0, 10)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+		
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(open("/data/test-only-header.csv", 1, 10)))) {
+			assertEquals("id,name,value", reader.readLine());
+			assertEquals(null, reader.readLine());
+		}
+	}
+	
+	private InputStream open(String name, int start, int end) throws IOException, URISyntaxException 
+	{
+		File path = new File(getClass().getResource(name).toURI());
+		try (FileSplitProvider provider = new FileSplitProvider(new PartialFile(path.getAbsolutePath(), start, end), true)) {
+			return provider.openNext();
+		}
+	}
+	
+}

data/src/test/java/org/embulk/input/filesplit/PartialFileInputStreamTest.java

@@ -0,0 +1,570 @@
+package org.embulk.input.filesplit;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class PartialFileInputStreamTest 
+{
+	private byte[] buffer = new byte[8];
+	
+	@Test
+	public void testEmpty() throws IOException
+	{
+		try (InputStream in = createInput("", 0, 0)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("", 0, 0)) {
+			assertEquals(-1, in.read(buffer));
+		}
+	}
+	
+	@Test
+	public void testNoLineBreak() throws IOException 
+	{
+		try (InputStream in = createInput("12345", 0, 4)) {
+			assertEquals('1', in.read());
+			assertEquals('2', in.read());
+			assertEquals('3', in.read());
+			assertEquals('4', in.read());
+			assertEquals('5', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345", 0, 4)) {
+			assertEquals(5, in.read(buffer));
+			assertEquals('1', buffer[0]);
+			assertEquals('2', buffer[1]);
+			assertEquals('3', buffer[2]);
+			assertEquals('4', buffer[3]);
+			assertEquals('5', buffer[4]);
+		}
+		
+		try (InputStream in = createInput("12345", 1, 4)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345", 1, 4)) {
+			assertEquals(-1, in.read(buffer));
+		}
+	}
+	
+	@Test
+	public void testLF() throws IOException 
+	{
+		try (InputStream in = createInput("12345\n67\n89", 0, 4)) {
+			assertEquals('1', in.read());
+			assertEquals('2', in.read());
+			assertEquals('3', in.read());
+			assertEquals('4', in.read());
+			assertEquals('5', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 0, 4)) {
+			assertEquals(6, in.read(buffer));
+			assertEquals('1', buffer[0]);
+			assertEquals('2', buffer[1]);
+			assertEquals('3', buffer[2]);
+			assertEquals('4', buffer[3]);
+			assertEquals('5', buffer[4]);
+			assertEquals('\n', buffer[5]);
+		}
+		
+		try (InputStream in = createInput("12345\n67\n89", 1, 4)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 1, 4)) {
+			assertEquals(-1, in.read(buffer));
+		}
+		
+		try (InputStream in = createInput("12345\n67\n89", 1, 7)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 1, 7)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+		}
+		
+		try (InputStream in = createInput("12345\n67\n89", 1, 10)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\n', in.read());
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 1, 10)) {
+			assertEquals(5, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+			assertEquals('8', buffer[3]);
+			assertEquals('9', buffer[4]);
+		}
+		
+		try (InputStream in = createInput("12345\n67\n89", 10, 11)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 10, 11)) {
+			assertEquals(-1, in.read(buffer));
+		}
+		
+		// \nの直後まで
+		try (InputStream in = createInput("12345\n67\n89", 4, 9)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 4, 9)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+			assertEquals(-1, in.read(buffer));
+		}
+		try (InputStream in = createInput("12345\n67\n89", 4, 9)) {
+			assertEquals(3, in.read(buffer, 0, 3));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+			assertEquals(-1, in.read(buffer));
+		}
+		// \nの直後から
+		try (InputStream in = createInput("12345\n67\n89", 9, 11)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 9, 11)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+		
+		// \nの直前まで
+		try (InputStream in = createInput("12345\n67\n89", 4, 8)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 4, 8)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+		}
+		
+		// \nの直前から
+		try (InputStream in = createInput("12345\n67\n89", 8, 11)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n89", 8, 11)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+
+		// \nで終わる（最後まで）
+		try (InputStream in = createInput("12345\n67\n", 5, 9)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n", 5, 9)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+		}
+
+		// \nで終わる（直前まで）
+		try (InputStream in = createInput("12345\n67\n", 5, 8)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\n67\n", 5, 8)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\n', buffer[2]);
+		}
+	}
+	
+	
+	@Test
+	public void testCRLF() throws IOException 
+	{
+		try (InputStream in = createInput("12345\r\n67\r\n89", 0, 4)) {
+			assertEquals('1', in.read());
+			assertEquals('2', in.read());
+			assertEquals('3', in.read());
+			assertEquals('4', in.read());
+			assertEquals('5', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 0, 4)) {
+			assertEquals(7, in.read(buffer));
+			assertEquals('1', buffer[0]);
+			assertEquals('2', buffer[1]);
+			assertEquals('3', buffer[2]);
+			assertEquals('4', buffer[3]);
+			assertEquals('5', buffer[4]);
+			assertEquals('\r', buffer[5]);
+			assertEquals('\n', buffer[6]);
+		}
+		
+		try (InputStream in = createInput("12345\r\n67\r\n89", 1, 4)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 1, 4)) {
+			assertEquals(-1, in.read(buffer));
+		}
+		
+		try (InputStream in = createInput("12345\r\n67\r\n89", 1, 8)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 1, 8)) {
+			assertEquals(4, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+		}
+		
+		try (InputStream in = createInput("12345\r\n67\r\n89", 1, 12)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 1, 12)) {
+			assertEquals(6, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+			assertEquals('8', buffer[4]);
+			assertEquals('9', buffer[5]);
+		}
+		
+		try (InputStream in = createInput("12345\r\n67\r\n89", 12, 13)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 12, 13)) {
+			assertEquals(-1, in.read(buffer));
+		}
+		
+		// \nの直後まで
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 11)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 11)) {
+			assertEquals(4, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+			assertEquals(-1, in.read(buffer));
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 11)) {
+			assertEquals(4, in.read(buffer, 0, 4));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+			assertEquals(-1, in.read(buffer));
+		}
+		// \nの直後から
+		try (InputStream in = createInput("12345\r\n67\r\n89", 11, 13)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 11, 13)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+		
+		// \rと\nの間まで
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 10)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 10)) {
+			assertEquals(4, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+		}
+		
+		// \rと\nの間から
+		try (InputStream in = createInput("12345\r\n67\r\n89", 10, 13)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 10, 13)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+		
+		// \rの直前まで
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 9)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 4, 9)) {
+			assertEquals(4, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+		}
+		
+		// \rの直前から
+		try (InputStream in = createInput("12345\r\n67\r\n89", 9, 13)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n89", 9, 13)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+
+		// \r\nで終わる（最後まで）
+		try (InputStream in = createInput("12345\r\n67\r\n", 5, 11)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n", 5, 11)) {
+			assertEquals(4, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+		}
+
+		// \r\nで終わる（直前まで）
+		try (InputStream in = createInput("12345\r\n67\r\n", 5, 10)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('\n', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r\n67\r\n", 5, 10)) {
+			assertEquals(4, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('\n', buffer[3]);
+		}
+	}
+	
+	@Test
+	public void testCR() throws IOException
+	{
+		try (InputStream in = createInput("12345\r67\r89", 0, 4)) {
+			assertEquals('1', in.read());
+			assertEquals('2', in.read());
+			assertEquals('3', in.read());
+			assertEquals('4', in.read());
+			assertEquals('5', in.read());
+			assertEquals('\r', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 0, 4)) {
+			assertEquals(6, in.read(buffer));
+			assertEquals('1', buffer[0]);
+			assertEquals('2', buffer[1]);
+			assertEquals('3', buffer[2]);
+			assertEquals('4', buffer[3]);
+			assertEquals('5', buffer[4]);
+			assertEquals('\r', buffer[5]);
+		}
+		
+		try (InputStream in = createInput("12345\r67\r89", 1, 4)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 1, 4)) {
+			assertEquals(-1, in.read(buffer));
+		}
+		
+		try (InputStream in = createInput("12345\r67\r89", 1, 7)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 1, 7)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+		}
+		
+		try (InputStream in = createInput("12345\r67\r89", 1, 10)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 1, 10)) {
+			assertEquals(5, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals('8', buffer[3]);
+			assertEquals('9', buffer[4]);
+		}
+		
+		try (InputStream in = createInput("12345\r67\r89", 10, 11)) {
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 10, 11)) {
+			assertEquals(-1, in.read(buffer));
+		}
+		
+		// \rの直後まで
+		try (InputStream in = createInput("12345\r67\r89", 4, 9)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 4, 9)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals(-1, in.read(buffer));
+		}
+		try (InputStream in = createInput("12345\r67\r89", 4, 9)) {
+			assertEquals(3, in.read(buffer, 0, 3));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+			assertEquals(-1, in.read(buffer));
+		}
+		// \rの直後から
+		try (InputStream in = createInput("12345\r67\r89", 9, 11)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 9, 11)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+		
+		// \rの直前まで
+		try (InputStream in = createInput("12345\r67\r89", 4, 8)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 4, 8)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+		}
+		
+		// \rの直前から
+		try (InputStream in = createInput("12345\r67\r89", 8, 11)) {
+			assertEquals('8', in.read());
+			assertEquals('9', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r89", 8, 11)) {
+			assertEquals(2, in.read(buffer));
+			assertEquals('8', buffer[0]);
+			assertEquals('9', buffer[1]);
+		}
+
+		// \rで終わる（最後まで）
+		try (InputStream in = createInput("12345\r67\r", 5, 9)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r", 5, 9)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+		}
+
+		// \rで終わる（直前まで）
+		try (InputStream in = createInput("12345\r67\r", 5, 8)) {
+			assertEquals('6', in.read());
+			assertEquals('7', in.read());
+			assertEquals('\r', in.read());
+			assertEquals(-1, in.read());
+		}
+		try (InputStream in = createInput("12345\r67\r", 5, 8)) {
+			assertEquals(3, in.read(buffer));
+			assertEquals('6', buffer[0]);
+			assertEquals('7', buffer[1]);
+			assertEquals('\r', buffer[2]);
+		}
+	}
+
+	private InputStream createInput(String s, int start, int end)
+	{
+		try {
+			return new PartialFileInputStream(new ByteArrayInputStream(s.getBytes("UTF-8")), start, end);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+}