CsvDataReaderTests/app.config @@ -1,3 +1,4 @@ bin obj *.suo +*.user .gitignore @@ -2,264 +2,266 @@ Imports System.Text Imports System.IO Imports System.Collections.ObjectModel +Imports log4net - Public Class CsvDataReader - Inherits StreamReader - Implements IDataReader +Public Class CsvDataReader + Inherits StreamReader + Implements IDataReader #Region "Privates" - Private Const DEFAULT_FIELD_SEPARATOR As String = "," + Private Const DEFAULT_FIELD_SEPARATOR As String = "," + Private Shared ReadOnly Log As ILog = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod.DeclaringType) - Private _disposed As Boolean = False - Private _dataTable As New DataTable - Private _dataRow As DataRow + Private _disposed As Boolean = False + Private _dataTable As New DataTable + Private _dataRow As DataRow #End Region -#Region "Constructor" +#Region "Constructors" - Public Sub New(ByVal path As String) - MyBase.New(path) + Public Sub New(ByVal path As String) + MyBase.New(path) - For Each column As DataColumn In Me.GetColumnsFromFirstRow - Me.DataTable.Columns.Add(column) - Next - End Sub + For Each column As DataColumn In Me.GetColumnsFromFirstRow + Me.DataTable.Columns.Add(column) + Next + End Sub - Public Sub New(ByVal path As String, ByVal columns As Collection(Of DataColumn)) - MyBase.New(path) + Public Sub New(ByVal path As String, ByVal columns As Collection(Of DataColumn)) + MyBase.New(path) - For Each column As DataColumn In columns - Me.DataTable.Columns.Add(column) - Next - End Sub + For Each column As DataColumn In columns + Me.DataTable.Columns.Add(column) + Next + End Sub - Public Sub New(ByVal path As String, ByVal encoding As Encoding) - MyBase.New(path, encoding) + Public Sub New(ByVal path As String, ByVal encoding As Encoding) + MyBase.New(path, encoding) - For Each column As DataColumn In Me.GetColumnsFromFirstRow - Me.DataTable.Columns.Add(column) - Next - End Sub + For Each column As DataColumn In Me.GetColumnsFromFirstRow + Me.DataTable.Columns.Add(column) + Next + End Sub - Public Sub New(ByVal path As String, ByVal columns As Collection(Of DataColumn), ByVal encoding As Encoding) - MyBase.New(path, encoding) + Public Sub New(ByVal path As String, ByVal columns As Collection(Of DataColumn), ByVal encoding As Encoding) + MyBase.New(path, encoding) - For Each column As DataColumn In columns - Me.DataTable.Columns.Add(column) - Next - End Sub + For Each column As DataColumn In columns + Me.DataTable.Columns.Add(column) + Next + End Sub #End Region #Region "Properties" - Protected Overridable ReadOnly Property DataTable() As DataTable - Get - Return _dataTable - End Get - End Property + Protected Overridable ReadOnly Property DataTable() As DataTable + Get + Return _dataTable + End Get + End Property - Protected Overridable ReadOnly Property CurrentDataRow() As DataRow - Get - Return _dataRow - End Get - End Property + Protected Overridable ReadOnly Property CurrentDataRow() As DataRow + Get + Return _dataRow + End Get + End Property - Protected Overridable Function GetColumnsFromFirstRow() As Collection(Of DataColumn) - Dim header As String = Me.ReadLine - Dim fields() As String = header.Split(DEFAULT_FIELD_SEPARATOR) + Protected Overridable Function GetColumnsFromFirstRow() As Collection(Of DataColumn) + Dim header As String = Me.ReadLine + Dim fields() As String = header.Split(DEFAULT_FIELD_SEPARATOR) - Dim columns As New Collection(Of DataColumn) - For Each field As String In fields - Debug.WriteLine("HeaderColumnName: " & field.Trim) + Dim columns As New Collection(Of DataColumn) + For Each field As String In fields + Debug.WriteLine("HeaderColumnName: " & field.Trim) - columns.Add(New DataColumn(field.Trim, GetType(String))) - Next + columns.Add(New DataColumn(field.Trim, GetType(String))) + Next - Return columns - End Function + Return columns + End Function #End Region #Region "IDataReader" - Public Overrides Sub Close() Implements System.Data.IDataReader.Close - MyBase.Close() - End Sub - - Public ReadOnly Property Depth() As Integer Implements System.Data.IDataReader.Depth - Get - Return 0 - End Get - End Property + Public Overrides Sub Close() Implements System.Data.IDataReader.Close + MyBase.Close() + End Sub - Public Function GetSchemaTable() As System.Data.DataTable Implements System.Data.IDataReader.GetSchemaTable - Return Me.DataTable - End Function + Public ReadOnly Property Depth() As Integer Implements System.Data.IDataReader.Depth + Get + Return 0 + End Get + End Property - Public ReadOnly Property IsClosed() As Boolean Implements System.Data.IDataReader.IsClosed - Get - Return False - End Get - End Property + Public Function GetSchemaTable() As System.Data.DataTable Implements System.Data.IDataReader.GetSchemaTable + Return Me.DataTable + End Function - Public Function NextResult() As Boolean Implements System.Data.IDataReader.NextResult + Public ReadOnly Property IsClosed() As Boolean Implements System.Data.IDataReader.IsClosed + Get Return False - End Function - - Public Overloads Function Read() As Boolean Implements System.Data.IDataReader.Read - If Me.Peek >= 0 Then - Dim fields() As Object = Me.ReadLine.Split(DEFAULT_FIELD_SEPARATOR) - - REM Turn empty strings into Nothing, which Row turns to DbNull if the Column allows it - REM Row.Add will throw an exception if the column does not allow nulls - For f = 0 To fields.Length - 1 - If String.IsNullOrEmpty(fields(f)) Then - fields(f) = Nothing - End If - Next + End Get + End Property + + Public Function NextResult() As Boolean Implements System.Data.IDataReader.NextResult + Return False + End Function + + Public Overloads Function Read() As Boolean Implements System.Data.IDataReader.Read + If Me.Peek >= 0 Then + Dim fields() As Object = Me.ReadLine.Split(DEFAULT_FIELD_SEPARATOR) + + REM Turn empty strings into Nothing, which Row turns to DbNull if the Column allows it + REM Row.Add will throw an exception if the column does not allow nulls + For f = 0 To fields.Length - 1 + If String.IsNullOrEmpty(fields(f)) Then + fields(f) = Nothing + End If + Next - Me.DataTable.Rows.Add(fields) + Me.DataTable.Rows.Add(fields) - _dataRow = Me.DataTable.Rows(Me.DataTable.Rows.Count - 1) + _dataRow = Me.DataTable.Rows(Me.DataTable.Rows.Count - 1) - Return True - Else - Return False - End If - End Function + Return True + Else + Return False + End If + End Function - Public ReadOnly Property RecordsAffected() As Integer Implements System.Data.IDataReader.RecordsAffected - Get - Return 0 - End Get - End Property + Public ReadOnly Property RecordsAffected() As Integer Implements System.Data.IDataReader.RecordsAffected + Get + Return 0 + End Get + End Property - Public ReadOnly Property FieldCount() As Integer Implements System.Data.IDataRecord.FieldCount - Get - Return Me.DataTable.Columns.Count - End Get - End Property + Public ReadOnly Property FieldCount() As Integer Implements System.Data.IDataRecord.FieldCount + Get + Return Me.DataTable.Columns.Count + End Get + End Property - Public Function GetBoolean(ByVal i As Integer) As Boolean Implements System.Data.IDataRecord.GetBoolean - Return Me.CurrentDataRow.Item(i) - End Function + Public Function GetBoolean(ByVal i As Integer) As Boolean Implements System.Data.IDataRecord.GetBoolean + Return Me.CurrentDataRow.Item(i) + End Function - Public Function GetByte(ByVal i As Integer) As Byte Implements System.Data.IDataRecord.GetByte - 'Return Convert.ToByte(_row(i).Trim) - End Function + Public Function GetByte(ByVal i As Integer) As Byte Implements System.Data.IDataRecord.GetByte + 'Return Convert.ToByte(_row(i).Trim) + End Function - Public Function GetBytes(ByVal i As Integer, ByVal fieldOffset As Long, ByVal buffer() As Byte, ByVal bufferoffset As Integer, ByVal length As Integer) As Long Implements System.Data.IDataRecord.GetBytes + Public Function GetBytes(ByVal i As Integer, ByVal fieldOffset As Long, ByVal buffer() As Byte, ByVal bufferoffset As Integer, ByVal length As Integer) As Long Implements System.Data.IDataRecord.GetBytes - End Function + End Function - Public Function GetChar(ByVal i As Integer) As Char Implements System.Data.IDataRecord.GetChar - Return Me.GetString(i) - End Function + Public Function GetChar(ByVal i As Integer) As Char Implements System.Data.IDataRecord.GetChar + Return Me.GetString(i) + End Function - Public Function GetChars(ByVal i As Integer, ByVal fieldoffset As Long, ByVal buffer() As Char, ByVal bufferoffset As Integer, ByVal length As Integer) As Long Implements System.Data.IDataRecord.GetChars - Throw New NotImplementedException - End Function + Public Function GetChars(ByVal i As Integer, ByVal fieldoffset As Long, ByVal buffer() As Char, ByVal bufferoffset As Integer, ByVal length As Integer) As Long Implements System.Data.IDataRecord.GetChars + Throw New NotImplementedException + End Function - Public Function GetData(ByVal i As Integer) As System.Data.IDataReader Implements System.Data.IDataRecord.GetData - Throw New NotImplementedException - End Function + Public Function GetData(ByVal i As Integer) As System.Data.IDataReader Implements System.Data.IDataRecord.GetData + Throw New NotImplementedException + End Function - Public Function GetDataTypeName(ByVal i As Integer) As String Implements System.Data.IDataRecord.GetDataTypeName - Return Me.DataTable.Columns(i).DataType.Name - End Function + Public Function GetDataTypeName(ByVal i As Integer) As String Implements System.Data.IDataRecord.GetDataTypeName + Return Me.DataTable.Columns(i).DataType.Name + End Function - Public Function GetDateTime(ByVal i As Integer) As Date Implements System.Data.IDataRecord.GetDateTime - Return Me.GetValue(i) - End Function + Public Function GetDateTime(ByVal i As Integer) As Date Implements System.Data.IDataRecord.GetDateTime + Return Me.GetValue(i) + End Function - Public Function GetDecimal(ByVal i As Integer) As Decimal Implements System.Data.IDataRecord.GetDecimal - Return Me.GetValue(i) - End Function + Public Function GetDecimal(ByVal i As Integer) As Decimal Implements System.Data.IDataRecord.GetDecimal + Return Me.GetValue(i) + End Function - Public Function GetDouble(ByVal i As Integer) As Double Implements System.Data.IDataRecord.GetDouble - Return Me.GetValue(i) - End Function + Public Function GetDouble(ByVal i As Integer) As Double Implements System.Data.IDataRecord.GetDouble + Return Me.GetValue(i) + End Function - Public Function GetFieldType(ByVal i As Integer) As System.Type Implements System.Data.IDataRecord.GetFieldType - Return Me.CurrentDataRow.Item(i).GetType - End Function + Public Function GetFieldType(ByVal i As Integer) As System.Type Implements System.Data.IDataRecord.GetFieldType + Return Me.CurrentDataRow.Item(i).GetType + End Function - Public Function GetFloat(ByVal i As Integer) As Single Implements System.Data.IDataRecord.GetFloat - Return Me.GetValue(i) - End Function + Public Function GetFloat(ByVal i As Integer) As Single Implements System.Data.IDataRecord.GetFloat + Return Me.GetValue(i) + End Function - Public Function GetGuid(ByVal i As Integer) As System.Guid Implements System.Data.IDataRecord.GetGuid - Return Me.GetValue(i) - End Function + Public Function GetGuid(ByVal i As Integer) As System.Guid Implements System.Data.IDataRecord.GetGuid + Return Me.GetValue(i) + End Function - Public Function GetInt16(ByVal i As Integer) As Short Implements System.Data.IDataRecord.GetInt16 - Return Me.GetValue(i) - End Function + Public Function GetInt16(ByVal i As Integer) As Short Implements System.Data.IDataRecord.GetInt16 + Return Me.GetValue(i) + End Function - Public Function GetInt32(ByVal i As Integer) As Integer Implements System.Data.IDataRecord.GetInt32 - Return Me.GetValue(i) - End Function + Public Function GetInt32(ByVal i As Integer) As Integer Implements System.Data.IDataRecord.GetInt32 + Return Me.GetValue(i) + End Function - Public Function GetInt64(ByVal i As Integer) As Long Implements System.Data.IDataRecord.GetInt64 - Return Me.GetValue(i) - End Function + Public Function GetInt64(ByVal i As Integer) As Long Implements System.Data.IDataRecord.GetInt64 + Return Me.GetValue(i) + End Function - Public Function GetName(ByVal i As Integer) As String Implements System.Data.IDataRecord.GetName - Return Me.DataTable.Columns(i).ColumnName - End Function + Public Function GetName(ByVal i As Integer) As String Implements System.Data.IDataRecord.GetName + Return Me.DataTable.Columns(i).ColumnName + End Function - Public Function GetOrdinal(ByVal name As String) As Integer Implements System.Data.IDataRecord.GetOrdinal - Return Me.DataTable.Columns(name).Ordinal - End Function + Public Function GetOrdinal(ByVal name As String) As Integer Implements System.Data.IDataRecord.GetOrdinal + Return Me.DataTable.Columns(name).Ordinal + End Function - Public Function GetString(ByVal i As Integer) As String Implements System.Data.IDataRecord.GetString - Return Me.CurrentDataRow.Item(i).ToString - End Function + Public Function GetString(ByVal i As Integer) As String Implements System.Data.IDataRecord.GetString + Return Me.CurrentDataRow.Item(i).ToString + End Function - Public Function GetValue(ByVal i As Integer) As Object Implements System.Data.IDataRecord.GetValue - Return Me.CurrentDataRow.Item(i) - End Function + Public Function GetValue(ByVal i As Integer) As Object Implements System.Data.IDataRecord.GetValue + Return Me.CurrentDataRow.Item(i) + End Function - Public Function GetValues(ByVal values() As Object) As Integer Implements System.Data.IDataRecord.GetValues - Me.CurrentDataRow.ItemArray.CopyTo(values, 0) - End Function + Public Function GetValues(ByVal values() As Object) As Integer Implements System.Data.IDataRecord.GetValues + Me.CurrentDataRow.ItemArray.CopyTo(values, 0) + End Function - Public Function IsDBNull(ByVal i As Integer) As Boolean Implements System.Data.IDataRecord.IsDBNull - Return Me.CurrentDataRow.IsNull(i) - End Function + Public Function IsDBNull(ByVal i As Integer) As Boolean Implements System.Data.IDataRecord.IsDBNull + Return Me.CurrentDataRow.IsNull(i) + End Function - Default Public Overloads ReadOnly Property Item(ByVal i As Integer) As Object Implements System.Data.IDataRecord.Item - Get - Return Me.GetValue(i) - End Get - End Property + Default Public Overloads ReadOnly Property Item(ByVal i As Integer) As Object Implements System.Data.IDataRecord.Item + Get + Return Me.GetValue(i) + End Get + End Property - Default Public Overloads ReadOnly Property Item(ByVal name As String) As Object Implements System.Data.IDataRecord.Item - Get - Return Me.GetValue(Me.GetOrdinal(name)) - End Get - End Property + Default Public Overloads ReadOnly Property Item(ByVal name As String) As Object Implements System.Data.IDataRecord.Item + Get + Return Me.GetValue(Me.GetOrdinal(name)) + End Get + End Property #End Region -#Region " IDisposable Support " +#Region "IDisposable" - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - If Not _disposed Then - If disposing Then - Me.DataTable.Dispose() - End If - - _disposed = True + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If Not _disposed Then + If disposing Then + Me.DataTable.Dispose() End If - MyBase.Dispose(disposing) - End Sub + _disposed = True + End If + + MyBase.Dispose(disposing) + End Sub #End Region - End Class +End Class CsvDataReader/CsvDataReader.vb @@ -36,6 +36,10 @@ <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> </PropertyGroup> <ItemGroup> + <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>bin\log4net.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> CsvDataReader/CsvDataReader.vbproj @@ -1,6 +1,7 @@ Imports System Imports System.Reflection Imports System.Runtime.InteropServices +Imports log4net ' General Information about an assembly is controlled through the following ' set of attributes. Change these attribute values to modify the information @@ -14,6 +15,7 @@ Imports System.Runtime.InteropServices <Assembly: AssemblyProduct("")> <Assembly: AssemblyCopyright("")> <Assembly: AssemblyTrademark("")> +<Assembly: log4net.Config.XmlConfigurator(Watch:=True)> <Assembly: ComVisible(False)> CsvDataReader/My Project/AssemblyInfo.vb @@ -1,3 +1,26 @@ -Public Class CsvDataReaderTests +Imports System.IO +Imports NUnit.Framework +Imports ChrisLaco.Data + +<TestFixture(Description:="CsvDataReader Tests")> _ +Public Class CsvDataReaderTests + +#Region "Constructor Tests" + + <TestFixtureSetUp()> _ + Public Sub TestFixtureSetupUp() + log4net.Config.XmlConfigurator.Configure() + End Sub + + <Test(Description:="New throws exception for bogus file")> _ + <ExpectedException(GetType(FileNotFoundException))> _ + Public Sub NewBadFileName() + Using reader As New CsvDataReader("crapfile") + + End Using + End Sub + +#End Region End Class + CsvDataReaderTests/CsvDataReaderTests.vb @@ -36,6 +36,14 @@ <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> </PropertyGroup> <ItemGroup> + <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>bin\log4net.dll</HintPath> + </Reference> + <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\Program Files\TestDriven.NET 2.0\NUnit\2.4\nunit.framework.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> @@ -75,6 +83,7 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> + <None Include="app.config" /> <None Include="My Project\Application.myapp"> <Generator>MyApplicationCodeGenerator</Generator> <LastGenOutput>Application.Designer.vb</LastGenOutput> @@ -85,6 +94,12 @@ <LastGenOutput>Settings.Designer.vb</LastGenOutput> </None> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\CsvDataReader\CsvDataReader.vbproj"> + <Project>{DB3C75BA-33B9-46EE-B612-BB376E99B06D}</Project> + <Name>CsvDataReader</Name> + </ProjectReference> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. CsvDataReaderTests/CsvDataReaderTests.vbproj @@ -1,6 +1,7 @@ Imports System Imports System.Reflection Imports System.Runtime.InteropServices +Imports log4net ' General Information about an assembly is controlled through the following ' set of attributes. Change these attribute values to modify the information CsvDataReaderTests/My Project/AssemblyInfo.vb CsvDataReader/CvsReader.suo 12aef86c607479f18514d7f803b369c26e9b6222 Christopher H. Laco claco@chrislaco.com http://github.com/claco/csvdatareader/commit/5f3eda4d72bb75fb2422e95138a3bf55d8a2d8cc 5f3eda4d72bb75fb2422e95138a3bf55d8a2d8cc 2008-09-10T22:00:16-07:00 2008-09-10T22:00:16-07:00 Setup NUnit/Log4Net and config 817d09a394690325ae803b9b56c55226bef259fe Christopher H. Laco claco@chrislaco.com