Index: Core/Components/src/Core.Components.OxyPlot/Data/AreaData.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/src/Core.Components.OxyPlot/Data/AreaData.cs (.../AreaData.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/src/Core.Components.OxyPlot/Data/AreaData.cs (.../AreaData.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -11,7 +11,7 @@
///
public class AreaData : ISeries
{
- private AreaSeries series = new AreaSeries();
+ private readonly AreaSeries series = new AreaSeries();
///
/// Creates a new instance of .
Index: Core/Components/src/Core.Components.OxyPlot/Data/LineData.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/src/Core.Components.OxyPlot/Data/LineData.cs (.../LineData.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/src/Core.Components.OxyPlot/Data/LineData.cs (.../LineData.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -10,7 +10,7 @@
///
public class LineData : ISeries
{
- private LineSeries series = new LineSeries();
+ private readonly LineSeries series = new LineSeries();
///
/// Creates a new instance of .
Index: Core/Components/src/Core.Components.OxyPlot/Data/PointData.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/src/Core.Components.OxyPlot/Data/PointData.cs (.../PointData.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/src/Core.Components.OxyPlot/Data/PointData.cs (.../PointData.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -10,7 +10,7 @@
///
public class PointData : ISeries
{
- private LineSeries series = new LineSeries();
+ private readonly LineSeries series = new LineSeries();
///
/// Creates a new instance of .
Index: Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -5,6 +5,4 @@
[assembly: AssemblyTitle("Core.Components.OxyPlot")]
[assembly: AssemblyProduct("Core.Components.OxyPlot")]
[assembly: Guid("05a1a16f-6f4f-4ebb-9540-b09a94bfded0")]
-[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Forms")]
-[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Forms.Test")]
-[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Test")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Forms")]
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/BaseChartTest.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/BaseChartTest.cs (.../BaseChartTest.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/BaseChartTest.cs (.../BaseChartTest.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,10 +1,8 @@
using System;
using System.Collections.ObjectModel;
-using System.Linq;
using System.Windows.Forms;
using Core.Components.OxyPlot.Data;
using NUnit.Framework;
-using OxyPlot.Series;
using Rhino.Mocks;
namespace Core.Components.OxyPlot.Forms.Test
@@ -43,7 +41,7 @@
// Setup
var mocks = new MockRepository();
var chart = new BaseChart();
- var dataMock = new TestChartData(mocks.Stub());
+ var dataMock = new PointData(new Collection>());
mocks.ReplayAll();
chart.AddData(dataMock);
@@ -59,35 +57,19 @@
[Test]
public void AddData_Always_AddsToSeries()
{
- // Given
- var mocks = new MockRepository();
+ // Setup
var chart = new BaseChart();
- var dataMock = new TestChartData(mocks.Stub());
+ var pointData = new PointData(new Collection>());
+ var lineData = new LineData(new Collection>());
+ var areaData = new AreaData(new Collection>());
- // When
- chart.AddData(dataMock);
+ // Call
+ chart.AddData(pointData);
+ chart.AddData(lineData);
+ chart.AddData(areaData);
- // Then
- Assert.IsInstanceOf(chart.Series.First());
+ // Assert
+ CollectionAssert.AreEqual(new IChartData[] {pointData, lineData, areaData}, chart.Series);
}
}
-
- public class TestChartData : ISeries {
- private Series series;
-
- public TestChartData(Series series)
- {
- this.series = series;
- }
-
- public bool IsVisible { get; set; }
-
- public Series Series
- {
- get
- {
- return series;
- }
- }
- }
}
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj (.../Core.Components.OxyPlot.Forms.Test.csproj) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj (.../Core.Components.OxyPlot.Forms.Test.csproj) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -42,13 +42,6 @@
..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
-
- ..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable1953\lib\net40\OxyPlot.dll
-
-
- ..\..\..\..\packages\OxyPlot.WindowsForms.1.0.0-unstable1953\lib\net40\OxyPlot.WindowsForms.dll
- True
-
..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
@@ -65,10 +58,6 @@
-
- {45EF3071-5C30-40AA-8B99-CE174DCEEE48}
- Core.Plugins.OxyPlot.Test
-
{dadaa0a5-288c-49cb-9f08-337f16832c86}
Core.Components.OxyPlot.Forms
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/packages.config
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/packages.config (.../packages.config) (revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/packages.config (.../packages.config) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,7 +1,5 @@
-
-
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj (.../Core.Components.OxyPlot.Test.csproj) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj (.../Core.Components.OxyPlot.Test.csproj) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -42,9 +42,6 @@
..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
-
- ..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable1953\lib\net40\OxyPlot.dll
-
Index: Core/Components/test/Core.Components.OxyPlot.Test/Data/AreaDataTest.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Test/Data/AreaDataTest.cs (.../AreaDataTest.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Data/AreaDataTest.cs (.../AreaDataTest.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,10 +1,7 @@
using System;
using System.Collections.ObjectModel;
-using System.Linq;
using Core.Components.OxyPlot.Data;
using NUnit.Framework;
-using OxyPlot;
-using OxyPlot.Series;
namespace Core.Components.OxyPlot.Test.Data
{
Index: Core/Components/test/Core.Components.OxyPlot.Test/Data/LineDataTest.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Test/Data/LineDataTest.cs (.../LineDataTest.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Data/LineDataTest.cs (.../LineDataTest.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,10 +1,7 @@
using System;
using System.Collections.ObjectModel;
-using System.Linq;
using Core.Components.OxyPlot.Data;
using NUnit.Framework;
-using OxyPlot;
-using OxyPlot.Series;
namespace Core.Components.OxyPlot.Test.Data
{
Index: Core/Components/test/Core.Components.OxyPlot.Test/Data/PointDataTest.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Test/Data/PointDataTest.cs (.../PointDataTest.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Data/PointDataTest.cs (.../PointDataTest.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,10 +1,7 @@
using System;
using System.Collections.ObjectModel;
-using System.Linq;
using Core.Components.OxyPlot.Data;
using NUnit.Framework;
-using OxyPlot;
-using OxyPlot.Series;
namespace Core.Components.OxyPlot.Test.Data
{
Index: Core/Components/test/Core.Components.OxyPlot.Test/packages.config
===================================================================
diff -u -rfed2698bf90c5e58d83122e286d68313ca5e54a2 -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Components/test/Core.Components.OxyPlot.Test/packages.config (.../packages.config) (revision fed2698bf90c5e58d83122e286d68313ca5e54a2)
+++ Core/Components/test/Core.Components.OxyPlot.Test/packages.config (.../packages.config) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,7 +1,5 @@
-
-
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml
===================================================================
diff -u -r10a16f2a08c6a50176351ae46c9a23a37ab92e28 -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml (.../ChartingRibbon.xaml) (revision 10a16f2a08c6a50176351ae46c9a23a37ab92e28)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml (.../ChartingRibbon.xaml) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -19,17 +19,17 @@
-
+
-
-
+
+
-
+
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj (.../Core.Plugins.OxyPlot.csproj) (revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj (.../Core.Plugins.OxyPlot.csproj) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -42,30 +42,13 @@
..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll
True
-
- ..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll
- True
-
-
- ..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable1953\lib\net40\OxyPlot.dll
-
-
- ..\..\..\..\packages\OxyPlot.WindowsForms.1.0.0-unstable1953\lib\net40\OxyPlot.WindowsForms.dll
-
-
- ..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll
- True
-
-
-
-
Index: Core/Plugins/src/Core.Plugins.OxyPlot/packages.config
===================================================================
diff -u -rcb23ee4b169979c1862a394cea470b46cc0866e4 -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Plugins/src/Core.Plugins.OxyPlot/packages.config (.../packages.config) (revision cb23ee4b169979c1862a394cea470b46cc0866e4)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/packages.config (.../packages.config) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -1,6 +1,4 @@
-
-
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj
===================================================================
diff -u -r10a16f2a08c6a50176351ae46c9a23a37ab92e28 -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj (.../Core.Plugins.OxyPlot.Test.csproj) (revision 10a16f2a08c6a50176351ae46c9a23a37ab92e28)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj (.../Core.Plugins.OxyPlot.Test.csproj) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -46,14 +46,6 @@
..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
-
- False
- ..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable1953\lib\net40\OxyPlot.dll
-
-
- False
- ..\..\..\..\packages\OxyPlot.WindowsForms.1.0.0-unstable1953\lib\net40\OxyPlot.WindowsForms.dll
-
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataNodePresenterTest.cs
===================================================================
diff -u -rec36de61b0eb813fedd9616e5113bd695470935c -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataNodePresenterTest.cs (.../ChartDataNodePresenterTest.cs) (revision ec36de61b0eb813fedd9616e5113bd695470935c)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataNodePresenterTest.cs (.../ChartDataNodePresenterTest.cs) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -6,7 +6,6 @@
using Core.Plugins.OxyPlot.Legend;
using Core.Plugins.OxyPlot.Properties;
using NUnit.Framework;
-using OxyPlot;
namespace Core.Plugins.OxyPlot.Test.Legend
{
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config
===================================================================
diff -u -r03d5df1364557b6f4a184908affb7754e58b3fa4 -r3c816a265bc4ea959ced0376d8b4b0d244e146b3
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config (.../packages.config) (revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config (.../packages.config) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3)
@@ -2,7 +2,5 @@
-
-
\ No newline at end of file