Skip to content

Commit 36055d1

Browse files
Adjusted csv test namespaces
1 parent 36b98c0 commit 36055d1

File tree

4 files changed

+17
-29
lines changed

4 files changed

+17
-29
lines changed

tests/MiniExcel.Csv.Tests/AsyncIssueTests.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using MiniExcelLib.Tests.Common.Utils;
2-
3-
namespace MiniExcel.Csv.Tests;
1+
namespace MiniExcelLib.Csv.Tests;
42

53
public class AsyncIssueTests
64
{
7-
private readonly MiniExcelExporter _exporter = MiniExcelLib.MiniExcel.GetExporter();
8-
private readonly MiniExcelImporter _importer = MiniExcelLib.MiniExcel.GetImporter();
5+
private readonly MiniExcelExporter _exporter = MiniExcel.GetExporter();
6+
private readonly MiniExcelImporter _importer = MiniExcel.GetImporter();
97

108
/// <summary>
119
/// Csv SaveAs by datareader with encoding default show messy code #253

tests/MiniExcel.Csv.Tests/IssueTests.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using MiniExcelLib.Tests.Common.Utils;
2-
3-
namespace MiniExcel.Csv.Tests;
1+
namespace MiniExcelLib.Csv.Tests;
42

53
public class IssueTests
64
{
7-
private readonly MiniExcelImporter _importer = MiniExcelLib.MiniExcel.GetImporter();
8-
private readonly MiniExcelExporter _exporter = MiniExcelLib.MiniExcel.GetExporter();
5+
private readonly MiniExcelImporter _importer = MiniExcel.GetImporter();
6+
private readonly MiniExcelExporter _exporter = MiniExcel.GetExporter();
97

108
[Fact]
119
public void TestPR10()

tests/MiniExcel.Csv.Tests/MiniExcelCsvAsycTests.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using MiniExcelLib.Tests.Common.Utils;
2-
using System.Text;
3-
using CsvReader = CsvHelper.CsvReader;
4-
5-
namespace MiniExcelLib.Tests;
1+
namespace MiniExcelLib.Csv.Tests;
62

73
public class MiniExcelCsvAsycTests
84
{
@@ -107,7 +103,7 @@ public async Task SaveAsByDictionary()
107103
Assert.Equal(2, rowsWritten[0]);
108104

109105
using var reader = new StreamReader(path);
110-
using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
106+
using var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture);
111107
var records = csv.GetRecords<dynamic>().ToList();
112108

113109
Assert.Equal(@"""<>+-*//}{\\n", records[0].a);
@@ -148,7 +144,7 @@ public async Task SaveAsByDictionary()
148144
Assert.Equal(2, rowsWritten[0]);
149145

150146
using var reader = new StreamReader(path);
151-
using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
147+
using var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture);
152148
var records = csv.GetRecords<dynamic>().ToList();
153149

154150
var row1 = records[0] as IDictionary<string, object>;
@@ -193,7 +189,7 @@ public async Task SaveAsByDataTableTest()
193189
Assert.Equal(2, rowsWritten[0]);
194190

195191
using var reader = new StreamReader(path2);
196-
using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
192+
using var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture);
197193
var records = csv.GetRecords<dynamic>().ToList();
198194

199195
Assert.Equal(@"""<>+-*//}{\\n", records[0].a);
@@ -236,7 +232,7 @@ public async Task CsvExcelTypeTest()
236232
Assert.Equal("Test2", rows1[1].B);
237233

238234
using var reader = new StreamReader(path);
239-
using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
235+
using var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture);
240236
var rows2 = csv.GetRecords<dynamic>().ToList();
241237

242238
Assert.Equal("Test1", rows2[0].A);

tests/MiniExcel.Csv.Tests/MiniExcelCsvTests.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using MiniExcelLib.Tests.Common.Utils;
2-
using CsvReader = CsvHelper.CsvReader;
3-
using CsvWriter = CsvHelper.CsvWriter;
4-
5-
namespace MiniExcelLib.Tests;
1+
namespace MiniExcelLib.Csv.Tests;
62

73
public class MiniExcelCsvTests
84
{
@@ -197,7 +193,7 @@ public void SaveAsByDictionary()
197193
Assert.Equal(2, rowsWritten[0]);
198194

199195
using var reader = new StreamReader(path.ToString());
200-
using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
196+
using var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture);
201197

202198
var records = csv.GetRecords<dynamic>().ToList();
203199
Assert.Equal(@"""<>+-*//}{\\n", records[0].a);
@@ -233,7 +229,7 @@ public void SaveAsByDictionary()
233229
_exporter.ExportCsv(path.ToString(), values);
234230

235231
using (var reader = new StreamReader(path.ToString()))
236-
using (var csv = new CsvReader(reader, CultureInfo.InvariantCulture))
232+
using (var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture))
237233
{
238234
var records = csv.GetRecords<dynamic>().ToList();
239235
{
@@ -284,7 +280,7 @@ public void SaveAsByDataTableTest()
284280
Assert.Equal(2, rowsWritten[0]);
285281

286282
using (var reader = new StreamReader(path.ToString()))
287-
using (var csv = new CsvReader(reader, CultureInfo.InvariantCulture))
283+
using (var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture))
288284
{
289285
var records = csv.GetRecords<dynamic>().ToList();
290286
Assert.Equal(@"""<>+-*//}{\\n", records[0].a);
@@ -335,7 +331,7 @@ public void CsvExcelTypeTest()
335331
Assert.Equal("Test2", rows[1].B);
336332

337333
using var reader = new StreamReader(path);
338-
using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
334+
using var csv = new global::CsvHelper.CsvReader(reader, CultureInfo.InvariantCulture);
339335
var records = csv.GetRecords<dynamic>().ToList();
340336
Assert.Equal("Test1", records[0].A);
341337
Assert.Equal("Test2", records[0].B);
@@ -481,7 +477,7 @@ private static string Generate(string value)
481477
var path = file.ToString();
482478

483479
using (var writer = new StreamWriter(path))
484-
using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
480+
using (var csv = new global::CsvHelper.CsvWriter(writer, CultureInfo.InvariantCulture))
485481
{
486482
var records = Enumerable.Range(1, 1).Select(_ => new { v1 = value, v2 = value });
487483
csv.WriteRecords(records);

0 commit comments

Comments
 (0)