Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move reference parser methods to dedicated class #15

Merged
merged 1 commit into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 0 additions & 141 deletions src/ClosedXML.Parser.Tests/ReferenceAreaTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,147 +20,6 @@ public void DisplayStringR1C1_displays_reference_in_R1C1_style(ReferenceArea ref
Assert.Equal(reference, TokenParser.ParseReference(expectedString, false));
}

[Theory]
[MemberData(nameof(ParseA1TestCases))]
public void ParseA1_parses_cell_area_or_rowspan_or_colspan(string text, ReferenceArea expectedReference)
{
Assert.Equal(expectedReference, ReferenceArea.ParseA1(text));
}

[Fact]
public void ParseA1_requires_argument()
{
Assert.Throws<ArgumentNullException>(() => ReferenceArea.ParseA1(null!));
}

[Fact]
public void ParseA1_throws_on_non_references()
{
Assert.Throws<ParsingException>(() => ReferenceArea.ParseA1("HELLO"));
}

[Theory]
[MemberData(nameof(ParseA1TestCases))]
public void TryParseA1_parses_cell_area_or_rowspan_or_colspan(string text, ReferenceArea expectedReference)
{
var success = ReferenceArea.TryParseA1(text, out var area);
Assert.True(success);
Assert.Equal(expectedReference, area);
}

[Fact]
public void TryParseA1_requires_argument()
{
Assert.Throws<ArgumentNullException>(() => ReferenceArea.TryParseA1(null!, out _));
}

[Fact]
public void ParseA1_returns_false_on_non_references()
{
var success = ReferenceArea.TryParseA1("HELLO", out var area);
Assert.False(success);
Assert.Equal(default, area);
}

[Theory]
[MemberData(nameof(ParseSheetA1TestCases))]
public void TryParseSheetA1_accepts_area_or_rowspan_or_colspan_with_sheet(string text, string expectedSheet, ReferenceArea expectedArea)
{
var success = ReferenceArea.TryParseSheetA1(text, out var sheet, out var area);
Assert.True(success);
Assert.Equal(expectedSheet, sheet);
Assert.Equal(expectedArea, area);
}

[Fact]
public void TryParseSheetA1_cant_parse_workbook_index()
{
var success = ReferenceArea.TryParseSheetA1("[1]Sheet!A1", out _, out _);
Assert.False(success);
}

[Fact]
public void TryParseSheetA1_cant_parse_reference_without_sheet()
{
var success = ReferenceArea.TryParseSheetA1("A1", out _, out _);
Assert.False(success);
}

[Fact]
public void TryParseSheetA1_requires_argument()
{
Assert.Throws<ArgumentNullException>(() => ReferenceArea.TryParseSheetA1(null!, out _, out _));
}

public static IEnumerable<object[]> ParseSheetA1TestCases
{
get
{
yield return new object[]
{
"Sheet!$C$2",
"Sheet",
new ReferenceArea(new RowCol(Absolute, 2, Absolute, 3, A1)),
};
yield return new object[]
{
"' ''John''s'' Shop! '!C2",
" 'John's' Shop! ",
new ReferenceArea(new RowCol(Relative, 2, Relative, 3, A1)),
};
yield return new object[]
{
"Sheet!A1:B2",
"Sheet",
new ReferenceArea(new RowCol(Relative, 1, Relative, 1, A1), new RowCol(Relative, 2, Relative, 2, A1)),
};
yield return new object[]
{
"'Some Sheet'!C:D",
"Some Sheet",
new ReferenceArea(new RowCol(None, 0, Relative, 3, A1), new RowCol(None, 0, Relative, 4, A1)),
};
yield return new object[]
{
"'!!WARN'!10:$15",
"!!WARN",
new ReferenceArea(new RowCol(Relative, 10, None, 0, A1), new RowCol(Absolute, 15, None, 0, A1)),
};
}
}

public static IEnumerable<object[]> ParseA1TestCases
{
get
{
yield return new object[]
{
"$C$2",
new ReferenceArea(new RowCol(Absolute, 2, Absolute, 3, A1)),
};
yield return new object[]
{
"AB123",
new ReferenceArea(new RowCol(Relative, 123, Relative, 28, A1)),
};
yield return new object[]
{
"$C$2:E7",
new ReferenceArea(new RowCol(Absolute, 2, Absolute, 3, A1), new RowCol(Relative, 7, Relative, 5, A1)),
};
yield return new object[]
{
"$C:F",
new ReferenceArea(new RowCol(None, 0, Absolute, 3, A1), new RowCol(None, 0, Relative, 6, A1)),
};
yield return new object[]
{
"10:$15",
new ReferenceArea(new RowCol(Relative, 10, None, 0, A1), new RowCol(Absolute, 15, None, 0, A1)),
};
}
}

public static IEnumerable<object[]> DisplayStringA1
{
get
Expand Down
147 changes: 147 additions & 0 deletions src/ClosedXML.Parser.Tests/ReferenceParserTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
using static ClosedXML.Parser.ReferenceAxisType;

namespace ClosedXML.Parser.Tests;

public class ReferenceParserTests
{
[Theory]
[MemberData(nameof(ParseA1TestCases))]
public void ParseA1_parses_cell_area_or_rowspan_or_colspan(string text, ReferenceArea expectedReference)
{
Assert.Equal(expectedReference, ReferenceParser.ParseA1(text));
}

[Fact]
public void ParseA1_requires_argument()
{
Assert.Throws<ArgumentNullException>(() => ReferenceParser.ParseA1(null!));
}

[Fact]
public void ParseA1_throws_on_non_references()
{
Assert.Throws<ParsingException>(() => ReferenceParser.ParseA1("HELLO"));
}

[Theory]
[MemberData(nameof(ParseA1TestCases))]
public void TryParseA1_parses_cell_area_or_rowspan_or_colspan(string text, ReferenceArea expectedReference)
{
var success = ReferenceParser.TryParseA1(text, out var area);
Assert.True(success);
Assert.Equal(expectedReference, area);
}

[Fact]
public void TryParseA1_requires_argument()
{
Assert.Throws<ArgumentNullException>(() => ReferenceParser.TryParseA1(null!, out _));
}

[Fact]
public void ParseA1_returns_false_on_non_references()
{
var success = ReferenceParser.TryParseA1("HELLO", out var area);
Assert.False(success);
Assert.Equal(default, area);
}

[Theory]
[MemberData(nameof(ParseSheetA1TestCases))]
public void TryParseSheetA1_accepts_area_or_rowspan_or_colspan_with_sheet(string text, string expectedSheet, ReferenceArea expectedArea)
{
var success = ReferenceParser.TryParseSheetA1(text, out var sheet, out var area);
Assert.True(success);
Assert.Equal(expectedSheet, sheet);
Assert.Equal(expectedArea, area);
}

[Fact]
public void TryParseSheetA1_cant_parse_workbook_index()
{
var success = ReferenceParser.TryParseSheetA1("[1]Sheet!A1", out _, out _);
Assert.False(success);
}

[Fact]
public void TryParseSheetA1_cant_parse_reference_without_sheet()
{
var success = ReferenceParser.TryParseSheetA1("A1", out _, out _);
Assert.False(success);
}

[Fact]
public void TryParseSheetA1_requires_argument()
{
Assert.Throws<ArgumentNullException>(() => ReferenceParser.TryParseSheetA1(null!, out _, out _));
}

public static IEnumerable<object[]> ParseSheetA1TestCases
{
get
{
yield return new object[]
{
"Sheet!$C$2",
"Sheet",
new ReferenceArea(new RowCol(Absolute, 2, Absolute, 3, A1)),
};
yield return new object[]
{
"' ''John''s'' Shop! '!C2",
" 'John's' Shop! ",
new ReferenceArea(new RowCol(Relative, 2, Relative, 3, A1)),
};
yield return new object[]
{
"Sheet!A1:B2",
"Sheet",
new ReferenceArea(new RowCol(Relative, 1, Relative, 1, A1), new RowCol(Relative, 2, Relative, 2, A1)),
};
yield return new object[]
{
"'Some Sheet'!C:D",
"Some Sheet",
new ReferenceArea(new RowCol(None, 0, Relative, 3, A1), new RowCol(None, 0, Relative, 4, A1)),
};
yield return new object[]
{
"'!!WARN'!10:$15",
"!!WARN",
new ReferenceArea(new RowCol(Relative, 10, None, 0, A1), new RowCol(Absolute, 15, None, 0, A1)),
};
}
}

public static IEnumerable<object[]> ParseA1TestCases
{
get
{
yield return new object[]
{
"$C$2",
new ReferenceArea(new RowCol(Absolute, 2, Absolute, 3, A1)),
};
yield return new object[]
{
"AB123",
new ReferenceArea(new RowCol(Relative, 123, Relative, 28, A1)),
};
yield return new object[]
{
"$C$2:E7",
new ReferenceArea(new RowCol(Absolute, 2, Absolute, 3, A1), new RowCol(Relative, 7, Relative, 5, A1)),
};
yield return new object[]
{
"$C:F",
new ReferenceArea(new RowCol(None, 0, Absolute, 3, A1), new RowCol(None, 0, Relative, 6, A1)),
};
yield return new object[]
{
"10:$15",
new ReferenceArea(new RowCol(Relative, 10, None, 0, A1), new RowCol(Absolute, 15, None, 0, A1)),
};
}
}
}
Loading
Loading