diff options
23 files changed, 55 insertions, 65 deletions
diff --git a/src/changes/changes.xml b/src/changes/changes.xml index eab4e788..d740dc1a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -6,6 +6,9 @@ </properties> <body> <release version="1.20-SNAPSHOT" date="in Mercurial" description="Maintenance"> + <action dev="asomov" type="update"> + Refactor Mark - remove unused code (2018-02-06) + </action> <action dev="asomov" type="fix" issue="395"> Introduce DuplicateKeyException and report line number for duplicate keys when creating non-Javabeans (2017-12-15) diff --git a/src/main/java/org/yaml/snakeyaml/error/Mark.java b/src/main/java/org/yaml/snakeyaml/error/Mark.java index 49d599c1..7c2b18f4 100644 --- a/src/main/java/org/yaml/snakeyaml/error/Mark.java +++ b/src/main/java/org/yaml/snakeyaml/error/Mark.java @@ -15,26 +15,24 @@ */ package org.yaml.snakeyaml.error; -import java.io.Serializable; - import org.yaml.snakeyaml.scanner.Constant; +import java.io.Serializable; + /** * It's just a record and its only use is producing nice error messages. Parser * does not use it for any other purposes. */ public final class Mark implements Serializable { private String name; - private int index; private int line; private int column; private char[] buffer; private int pointer; - public Mark(String name, int index, int line, int column, char[] buffer, int pointer) { + public Mark(String name, int line, int column, char[] buffer, int pointer) { super(); this.name = name; - this.index = index; this.line = line; this.column = column; this.buffer = buffer; @@ -93,17 +91,15 @@ public final class Mark implements Serializable { @Override public String toString() { String snippet = get_snippet(); - StringBuilder where = new StringBuilder(" in "); - where.append(name); - where.append(", line "); - where.append(line + 1); - where.append(", column "); - where.append(column + 1); - if (snippet != null) { - where.append(":\n"); - where.append(snippet); - } - return where.toString(); + StringBuilder builder = new StringBuilder(" in "); + builder.append(name); + builder.append(", line "); + builder.append(line + 1); + builder.append(", column "); + builder.append(column + 1); + builder.append(":\n"); + builder.append(snippet); + return builder.toString(); } public String getName() { @@ -126,12 +122,4 @@ public final class Mark implements Serializable { return column; } - /** - * starts with 0 - * @return character number - */ - public int getIndex() { - return index; - } - } diff --git a/src/main/java/org/yaml/snakeyaml/reader/StreamReader.java b/src/main/java/org/yaml/snakeyaml/reader/StreamReader.java index 77b355bb..437bc1cb 100644 --- a/src/main/java/org/yaml/snakeyaml/reader/StreamReader.java +++ b/src/main/java/org/yaml/snakeyaml/reader/StreamReader.java @@ -88,7 +88,7 @@ public class StreamReader { } public Mark getMark() { - return new Mark(name, this.index, this.line, this.column, this.buffer, this.pointer); + return new Mark(name, this.line, this.column, this.buffer, this.pointer); } public void forward() { diff --git a/src/test/java/org/pyyaml/CanonicalScanner.java b/src/test/java/org/pyyaml/CanonicalScanner.java index c3779976..f906eb09 100644 --- a/src/test/java/org/pyyaml/CanonicalScanner.java +++ b/src/test/java/org/pyyaml/CanonicalScanner.java @@ -58,7 +58,7 @@ public class CanonicalScanner implements Scanner { this.index = 0; this.tokens = new ArrayList<Token>(); this.scanned = false; - this.mark = new Mark("test", 0, 0, 0, data.toCharArray(), 0); + this.mark = new Mark("test", 0, 0, data.toCharArray(), 0); } public boolean checkToken(Token.ID... choices) { diff --git a/src/test/java/org/pyyaml/PyMarkTest.java b/src/test/java/org/pyyaml/PyMarkTest.java index ae7949e6..12187ac0 100644 --- a/src/test/java/org/pyyaml/PyMarkTest.java +++ b/src/test/java/org/pyyaml/PyMarkTest.java @@ -39,7 +39,7 @@ public class PyMarkTest extends PyImportTest { } index += 1; } - Mark mark = new Mark("testMarks", index, line, column, input.toCharArray(), index); + Mark mark = new Mark("testMarks", line, column, input.toCharArray(), index); String snippet = mark.get_snippet(2, 79); assertTrue("Must only have one '\n'.", snippet.indexOf("\n") > -1); assertEquals("Must only have only one '\n'.", snippet.indexOf("\n"), diff --git a/src/test/java/org/yaml/snakeyaml/error/MarkTest.java b/src/test/java/org/yaml/snakeyaml/error/MarkTest.java index 83fbc99d..59df49e1 100644 --- a/src/test/java/org/yaml/snakeyaml/error/MarkTest.java +++ b/src/test/java/org/yaml/snakeyaml/error/MarkTest.java @@ -20,14 +20,14 @@ import junit.framework.TestCase; public class MarkTest extends TestCase { public void testGet_snippet() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); assertEquals(" *The first line.\n ^", mark.get_snippet()); - mark = new Mark("test1", 9, 0, 0, "The first*line.\nThe last line.".toCharArray(), 9); + mark = new Mark("test1", 0, 0, "The first*line.\nThe last line.".toCharArray(), 9); assertEquals(" The first*line.\n ^", mark.get_snippet()); } public void testToString() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); String[] lines = mark.toString().split("\n"); assertEquals(" in test1, line 1, column 1:", lines[0]); assertEquals("*The first line.", lines[1].trim()); @@ -35,8 +35,7 @@ public class MarkTest extends TestCase { } public void testPosition() { - Mark mark = new Mark("test1", 17, 29, 213, "*The first line.\nThe last line.".toCharArray(), 0); - assertEquals(17, mark.getIndex()); + Mark mark = new Mark("test1", 29, 213, "*The first line.\nThe last line.".toCharArray(), 0); assertEquals(29, mark.getLine()); assertEquals(213, mark.getColumn()); } diff --git a/src/test/java/org/yaml/snakeyaml/error/MarkedYAMLExceptionTest.java b/src/test/java/org/yaml/snakeyaml/error/MarkedYAMLExceptionTest.java index aa96689d..8a6f7ec1 100644 --- a/src/test/java/org/yaml/snakeyaml/error/MarkedYAMLExceptionTest.java +++ b/src/test/java/org/yaml/snakeyaml/error/MarkedYAMLExceptionTest.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; public class MarkedYAMLExceptionTest extends TestCase { public void testToString1() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); MarkedYAMLException exception = new MarkedYAMLException(null, null, "Error happened", mark); assertTrue(exception.toString().contains("Error happened")); assertTrue(exception.toString().contains("The first line")); @@ -28,7 +28,7 @@ public class MarkedYAMLExceptionTest extends TestCase { } public void testToString2() { - Mark mark = new Mark("search", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("search", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); MarkedYAMLException exception = new MarkedYAMLException("See http://www.google.com", mark, "Error2 happened", mark); assertTrue(exception.toString().contains("Error2 happened")); @@ -43,14 +43,14 @@ public class MarkedYAMLExceptionTest extends TestCase { } public void testToString4() { - Mark mark = new Mark("search", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("search", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); MarkedYAMLException exception = new MarkedYAMLException("See http://www.google.com", mark, null, null, null, null); assertTrue(exception.toString().contains("first line")); } public void testGetters() { - Mark mark = new Mark("search", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("search", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); MarkedYAMLException exception = new MarkedYAMLException("See http://www.google.com", mark, "Error2 happened", mark); assertEquals("See http://www.google.com", exception.getContext()); diff --git a/src/test/java/org/yaml/snakeyaml/nodes/NodeTest.java b/src/test/java/org/yaml/snakeyaml/nodes/NodeTest.java index 43d758ee..405b73e1 100644 --- a/src/test/java/org/yaml/snakeyaml/nodes/NodeTest.java +++ b/src/test/java/org/yaml/snakeyaml/nodes/NodeTest.java @@ -41,8 +41,8 @@ public class NodeTest extends TestCase { } public void testGetEndMark() { - Mark mark1 = new Mark("name", 5, 2, 12, "afd asd asd".toCharArray(), 7); - Mark mark2 = new Mark("name", 6, 3, 13, "afd asd asd".toCharArray(), 8); + Mark mark1 = new Mark("name", 2, 12, "afd asd asd".toCharArray(), 7); + Mark mark2 = new Mark("name", 3, 13, "afd asd asd".toCharArray(), 8); Node node = new ScalarNode(new Tag("!foo"), "bla-bla", mark1, mark2, '"'); assertEquals(mark1, node.getStartMark()); assertEquals(mark2, node.getEndMark()); diff --git a/src/test/java/org/yaml/snakeyaml/parser/ParserImplTest.java b/src/test/java/org/yaml/snakeyaml/parser/ParserImplTest.java index cc1c588a..5e706d0b 100644 --- a/src/test/java/org/yaml/snakeyaml/parser/ParserImplTest.java +++ b/src/test/java/org/yaml/snakeyaml/parser/ParserImplTest.java @@ -50,7 +50,7 @@ public class ParserImplTest extends TestCase { String data = "string: abcd"; StreamReader reader = new StreamReader(data); Parser parser = new ParserImpl(reader); - Mark dummyMark = new Mark("dummy", 0, 0, 0, "".toCharArray(), 0); + Mark dummyMark = new Mark("dummy", 0, 0, "".toCharArray(), 0); LinkedList<Event> etalonEvents = new LinkedList<Event>(); etalonEvents.add(new StreamStartEvent(dummyMark, dummyMark)); etalonEvents.add(new DocumentStartEvent(dummyMark, dummyMark, false, null, null)); @@ -70,7 +70,7 @@ public class ParserImplTest extends TestCase { String data = "american:\n - Boston Red Sox"; StreamReader reader = new StreamReader(data); Parser parser = new ParserImpl(reader); - Mark dummyMark = new Mark("dummy", 0, 0, 0, "".toCharArray(), 0); + Mark dummyMark = new Mark("dummy", 0, 0, "".toCharArray(), 0); LinkedList<Event> etalonEvents = new LinkedList<Event>(); etalonEvents.add(new StreamStartEvent(dummyMark, dummyMark)); etalonEvents.add(new DocumentStartEvent(dummyMark, dummyMark, false, null, null)); diff --git a/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java b/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java index 41f85af0..59f711cb 100644 --- a/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java +++ b/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java @@ -37,7 +37,7 @@ public class ScannerImplTest extends TestCase { String data = "string: abcd"; StreamReader reader = new StreamReader(data); Scanner scanner = new ScannerImpl(reader); - Mark dummy = new Mark("dummy", 0, 0, 0, "".toCharArray(), 0); + Mark dummy = new Mark("dummy", 0, 0, "".toCharArray(), 0); LinkedList<Token> etalonTokens = new LinkedList<Token>(); etalonTokens.add(new StreamStartToken(dummy, dummy)); etalonTokens.add(new BlockMappingStartToken(dummy, dummy)); diff --git a/src/test/java/org/yaml/snakeyaml/tokens/AliasTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/AliasTokenTest.java index cee98b09..f70309d2 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/AliasTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/AliasTokenTest.java @@ -23,19 +23,19 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class AliasTokenTest extends TestCase { public void testEquals() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); AliasToken token = new AliasToken("*id123", mark, mark); assertFalse(token.equals(mark)); } public void testGetArguments() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); AliasToken token = new AliasToken("*id123", mark, mark); assertEquals("value=*id123", token.getArguments()); } public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); AliasToken token = new AliasToken("&id123", mark, mark); assertEquals(ID.Alias, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/AnchorTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/AnchorTokenTest.java index e972237d..9a4310d7 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/AnchorTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/AnchorTokenTest.java @@ -23,13 +23,13 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class AnchorTokenTest extends TestCase { public void testGetArguments() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); AnchorToken token = new AnchorToken("&id123", mark, mark); assertEquals("value=&id123", token.getArguments()); } public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); AnchorToken token = new AnchorToken("&id123", mark, mark); assertEquals(ID.Anchor, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/BlockEndTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/BlockEndTokenTest.java index 6b04bc5c..d10c30ca 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/BlockEndTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/BlockEndTokenTest.java @@ -23,13 +23,13 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class BlockEndTokenTest extends TestCase { public void testGetArguments() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); BlockEndToken token = new BlockEndToken(mark, mark); assertEquals("", token.getArguments()); } public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); BlockEndToken token = new BlockEndToken(mark, mark); assertEquals(ID.BlockEnd, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/BlockEntryTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/BlockEntryTokenTest.java index a2543ae8..4e29e7cb 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/BlockEntryTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/BlockEntryTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class BlockEntryTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); BlockEntryToken token = new BlockEntryToken(mark, mark); assertEquals(ID.BlockEntry, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/BlockSequenceStartTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/BlockSequenceStartTokenTest.java index a5c6a282..e09bac7c 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/BlockSequenceStartTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/BlockSequenceStartTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class BlockSequenceStartTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); BlockSequenceStartToken token = new BlockSequenceStartToken(mark, mark); assertEquals(ID.BlockSequenceStart, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/DirectiveTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/DirectiveTokenTest.java index 080629f0..3df2135e 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/DirectiveTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/DirectiveTokenTest.java @@ -26,13 +26,13 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class DirectiveTokenTest extends TestCase { public void testGetArguments() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); DirectiveToken<Integer> token = new DirectiveToken<Integer>("YAML", null, mark, mark); assertEquals("name=YAML", token.getArguments()); } public void testInvalidList() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); List<Integer> list = new ArrayList<Integer>(); list.add(new Integer(1)); try { @@ -44,7 +44,7 @@ public class DirectiveTokenTest extends TestCase { } public void testTag() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); List<String> list = new ArrayList<String>(); list.add("!foo"); list.add("!bar"); @@ -53,7 +53,7 @@ public class DirectiveTokenTest extends TestCase { } public void testList() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); List<Integer> list = new ArrayList<Integer>(); list.add(new Integer(1)); list.add(new Integer(1)); @@ -62,7 +62,7 @@ public class DirectiveTokenTest extends TestCase { } public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); DirectiveToken<Integer> token = new DirectiveToken<Integer>("YAML", null, mark, mark); assertEquals(ID.Directive, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/DocumentEndTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/DocumentEndTokenTest.java index 416e8965..6ac3dccc 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/DocumentEndTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/DocumentEndTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class DocumentEndTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); DocumentEndToken token = new DocumentEndToken(mark, mark); assertEquals(ID.DocumentEnd, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/DocumentStartTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/DocumentStartTokenTest.java index 07ef4e45..9205bcf5 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/DocumentStartTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/DocumentStartTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class DocumentStartTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); DocumentStartToken token = new DocumentStartToken(mark, mark); assertEquals(ID.DocumentStart, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/FlowEntryTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/FlowEntryTokenTest.java index ec110211..3bf4898f 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/FlowEntryTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/FlowEntryTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class FlowEntryTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); FlowEntryToken token = new FlowEntryToken(mark, mark); assertEquals(ID.FlowEntry, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/FlowMappingStartTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/FlowMappingStartTokenTest.java index 3e2f2f56..9bfcbe3e 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/FlowMappingStartTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/FlowMappingStartTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class FlowMappingStartTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); FlowMappingStartToken token = new FlowMappingStartToken(mark, mark); assertEquals(ID.FlowMappingStart, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/FlowSequenceStartTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/FlowSequenceStartTokenTest.java index 7b8ec53c..56d5e3c4 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/FlowSequenceStartTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/FlowSequenceStartTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class FlowSequenceStartTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); FlowSequenceStartToken token = new FlowSequenceStartToken(mark, mark); assertEquals(ID.FlowSequenceStart, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/StreamStartTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/StreamStartTokenTest.java index f3434d41..c9d5e1b2 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/StreamStartTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/StreamStartTokenTest.java @@ -23,7 +23,7 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class StreamStartTokenTest extends TestCase { public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); StreamStartToken token = new StreamStartToken(mark, mark); assertEquals(ID.StreamStart, token.getTokenId()); } diff --git a/src/test/java/org/yaml/snakeyaml/tokens/TagTokenTest.java b/src/test/java/org/yaml/snakeyaml/tokens/TagTokenTest.java index b66586ca..ca619df8 100644 --- a/src/test/java/org/yaml/snakeyaml/tokens/TagTokenTest.java +++ b/src/test/java/org/yaml/snakeyaml/tokens/TagTokenTest.java @@ -24,13 +24,13 @@ import org.yaml.snakeyaml.tokens.Token.ID; public class TagTokenTest extends TestCase { public void testGetArguments() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); TagToken token = new TagToken(new TagTuple("!foo", "!bar"), mark, mark); assertEquals("value=[!foo, !bar]", token.getArguments()); } public void testNoMarks() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); try { new TagToken(new TagTuple("!foo", "!bar"), null, mark); fail("Token without start mark should not be accepted."); @@ -47,7 +47,7 @@ public class TagTokenTest extends TestCase { public void testNoTag() { try { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); new TagToken(new TagTuple("!foo", null), mark, mark); fail("Marks must be provided."); } catch (NullPointerException e) { @@ -56,7 +56,7 @@ public class TagTokenTest extends TestCase { } public void testGetTokenId() { - Mark mark = new Mark("test1", 0, 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); + Mark mark = new Mark("test1", 0, 0, "*The first line.\nThe last line.".toCharArray(), 0); TagToken token = new TagToken(new TagTuple("!foo", "!bar"), mark, mark); assertEquals(ID.Tag, token.getTokenId()); } |