Version 2.0 candidate

.gitignore

@@ -294,3 +294,4 @@ TestResult.xml
 # NDepend
 *.ndproj
 /NDependOut
+.vscode/

ConTabs.Tests/BarChartTests.cs

@@ -0,0 +1,179 @@
+using ConTabs.TestData;
+using NUnit.Framework;
+using Shouldly;
+using System;
+
+namespace ConTabs.Tests
+{
+    [TestFixture]
+    public class BarChartTests
+    {
+        [Test]
+        public void GenerateBarChart_ResultsInNewColumnAdded()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData();
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"]);
+
+            // Assert
+            table.Columns.Count.ShouldBe(3);
+        }
+
+        [Test]
+        public void GenerateBarChart_ResultsInStringColumnAdded()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData();
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"]);
+
+            // Assert
+            table.Columns[2].SourceType.ShouldBe(typeof(string));
+        }
+
+        [Test]
+        public void GenerateBarChart_WithDefaultParams_BarsAreExpectedSize()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(3); // IntB = 3, 9, 27
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"]); // Max = 27, default width = 25, unit scale = 25/27 = 0.92592...
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("###");                         // 0.92592 *  3 =  2.77 = 3
+            table.Columns[2].Values[1].ShouldBe("########");                    // 0.92592 *  9 =  8.33 = 8
+            table.Columns[2].Values[2].ShouldBe("#########################");   // 0.92592 * 27 = 25.00 = 25
+        }
+
+        [Test]
+        public void GenerateBarChart_MaxWidthCanBeSpecified()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(1); // single row, IntB = 3
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], maxLength: 3);
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("###");
+        }
+
+        [Test]
+        public void GenerateBarChart_ForSingleValues_ResultsInFullWidthBar()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(1); // single row, IntB = 3
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], maxLength: 10);
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("##########"); // count = 10 = maxLength
+        }
+
+        [Test]
+        public void GenerateBarChart_UnitCharCanBeChanged()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(1); // single row, IntB = 3
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], maxLength:3, unitChar: '>');
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe(">>>");
+        }
+
+        [Test]
+        public void GenerateBarChart_ScaleCanBeSpecified()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(1); // single row, IntB = 3
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], unitSize: 3);
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("#"); // one unit of size 3, for a value of 3
+        }
+
+        [Test]
+        public void GenerateBarChart_WhenBothScaleAndMaxWidthAreSpecified_ScaleTakesPrecedence()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(1); // single row, IntB = 3
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], unitSize: 3, maxLength: 9);
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("#"); // one unit of size 3, for a value of 3, rather than 100% of maxLength
+        }
+
+        [Test]
+        public void GenerateBarChart_WhenBothScaleAndMaxWidthAreSpecified_NeverExceedsMax()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(3); // single row, IntB = 3
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], unitSize: 3, maxLength: 5);
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("#");
+            table.Columns[2].Values[1].ShouldBe("###");
+            table.Columns[2].Values[2].ShouldBe("#####"); // capped at 5 instead of value 27 / scale 3 = 9 units
+        }
+
+        [Test]
+        public void GenerateBarChart_NegativeValuesGetHandledGracefully()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(1); // single row, IntB = 3
+            data[0].IntB = -1;
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"]);
+
+            // Assert
+            table.Columns[2].Values[0].ShouldBe("");
+        }
+
+        [Test]
+        public void GenerateBarChart_ConformanceTest()
+        {
+            // Arrange
+            var data = DataProvider.ListOfMinimalData(3); // IntB = 3, 9, 27
+            var table = Table.Create(data);
+
+            // Act
+            table.Columns.AddBarChart<int>("Chart", table.Columns["IntB"], maxLength: 10, unitChar: '=');
+
+            // Assert
+            string expected = "";
+            expected += "+------+------+------------+" + Environment.NewLine;
+            expected += "| IntA | IntB | Chart      |" + Environment.NewLine;
+            expected += "+------+------+------------+" + Environment.NewLine;
+            expected += "| 1    | 3    | =          |" + Environment.NewLine;
+            expected += "| 2    | 9    | ===        |" + Environment.NewLine;
+            expected += "| 3    | 27   | ========== |" + Environment.NewLine;
+            expected += "+------+------+------------+";
+
+            table.ToString().ShouldBe(expected);
+        }
+    }
+}

ConTabs.Tests/ColumnAttributeTests.cs

@@ -0,0 +1,93 @@
+using AutoFixture.NUnit3;
+using NUnit.Framework;
+using Shouldly;
+using System.Collections.Generic;
+using System.Linq;
+using ConTabs.Attributes;
+using System.Threading;
+using System.Globalization;
+
+namespace ConTabs.Tests
+{
+    [TestFixture]
+    public class ColumnAttributeTests
+    {
+        [Test, AutoData]
+        public void ConTabsColumnHideAttributeShouldResultInColumnBeingHidden(List<ClassWithOneHiddenColumn> data)
+        {
+            // act
+            var table = Table.Create(data);
+
+            // assert
+            table.Columns.Count(c => c.Hide).ShouldBe(1);
+            table.Columns.Count(c => !c.Hide).ShouldBe(1);
+        }
+
+        [Test, AutoData]
+        public void ConTabsColumnPositionAttributeShouldResultInColumnBeingMoved(List<ClassWithReorderedColumns> data)
+        {
+            // act
+            var table = Table.Create(data);
+
+            // assert
+            table.Columns[0].ColumnName.ShouldBe("ColumnB");
+            table.Columns[1].ColumnName.ShouldBe("ColumnA");
+        }
+
+        [Test, AutoData]
+        public void ConTabsColumnNameAttributeShouldResultInColumnBeingRenamed(List<ClassWithRenamedColumns> data)
+        {
+            // act
+            var table = Table.Create(data);
+
+            // assert
+            table.Columns[1].ColumnName.ShouldBe("ColumnX");
+        }
+
+        [Test, AutoData]
+        public void ConTabsColumnFormatStringAttributeShouldResultInFormatBeingApplied(List<ClassWithFormattedColumns> data)
+        {
+            // arrange
+            Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-GB");
+
+            // act
+            var table = Table.Create(data);
+
+            // assert
+            table.Columns[1].StringValForCol(79.11d).ShouldBe("079.110");
+        }
+    }
+
+
+    public class ClassWithOneHiddenColumn
+    {
+        public int ColumnA { get; set; }
+
+        [ConTabsColumnHide]
+        public int ColumnB { get; set; }
+    }
+
+    public class ClassWithReorderedColumns
+    {
+        public int ColumnA { get; set; }
+
+        [ConTabsColumnPosition(0)]
+        public int ColumnB { get; set; }
+    }
+
+    public class ClassWithRenamedColumns
+    {
+        public int ColumnA { get; set; }
+
+        [ConTabsColumnName("ColumnX")]
+        public int ColumnB { get; set; }
+    }
+
+    public class ClassWithFormattedColumns
+    {
+        public int ColumnA { get; set; }
+
+        [ConTabsColumnFormatString("000.000")]
+        public double ColumnB { get; set; }
+    }
+}

ConTabs.Tests/ColumnTests.cs

@@ -27,7 +27,7 @@ public void MaxWidthWithNullValuesReturnsColumnNameLength()
             var column = new Column(typeof(string), "StringColumn");
 
             //Act
-            var result = column.MaxWidth;
+            var result = TableStretchStyles.DoNothing.CalculateOptimalWidth(column, 0);
 
             //Assert
             result.ShouldBe(12);
@@ -41,7 +41,7 @@ public void MaxWidthWithZeroValuesReturnsColumnNameLength()
             column.Values = new List<object>();
 
             //Act
-            var result = column.MaxWidth;
+            var result = TableStretchStyles.DoNothing.CalculateOptimalWidth(column, 0);
 
             //Assert
             result.ShouldBe(12);
@@ -57,7 +57,7 @@ public void MaxWidthWithLongStringBehaviourReturnsLongStringBehaviourWidth()
             column.LongStringBehaviour.Width = 15;
 
             //Act
-            var result = column.MaxWidth;
+            var result = TableStretchStyles.DoNothing.CalculateOptimalWidth(column, 0);
 
             //Assert
             result.ShouldBe(15);
@@ -71,7 +71,7 @@ public void MaxWidthWithValuesReturnsLengthOfLongestValue()
             column.Values = new List<object>() { "one", "two", "three", "four" };
 
             //Act
-            var result = column.MaxWidth;
+            var result = TableStretchStyles.DoNothing.CalculateOptimalWidth(column, 0);
 
             //Assert
             result.ShouldBe(5);

ConTabs.Tests/ConTabs.Tests.csproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ConTabs.Tests</RootNamespace>
     <AssemblyName>ConTabs.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -39,16 +40,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="AutoFixture, Version=4.5.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoFixture.4.5.0\lib\net452\AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Shouldly, Version=2.8.3.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
-      <HintPath>..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll</HintPath>
+    <Reference Include="AutoFixture.NUnit3, Version=4.5.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoFixture.NUnit3.4.5.0\lib\net452\AutoFixture.NUnit3.dll</HintPath>
+    </Reference>
+    <Reference Include="Fare, Version=2.1.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Fare.2.1.1\lib\net35\Fare.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Shouldly, Version=3.0.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
+      <HintPath>..\packages\Shouldly.3.0.2\lib\net451\Shouldly.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BarChartTests.cs" />
+    <Compile Include="ColumnAttributeTests.cs" />
     <Compile Include="ConformanceTests.cs" />
     <Compile Include="FormatTests.cs" />
     <Compile Include="AlignmentTests.cs" />
@@ -62,6 +76,7 @@
     <Compile Include="UsageTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -80,6 +95,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
 </Project>