Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r8e593693b22d3aff6994f810976d208e64bd5f96 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 8e593693b22d3aff6994f810976d208e64bd5f96) @@ -6,7 +6,6 @@ using System.Windows.Forms; using Core.Common.Controls.Swf.Charting.Series; using Core.Common.Controls.Swf.Properties; -using Core.Common.Utils.Aop; using Core.Common.Utils.Collections; using Core.Common.Utils.Collections.Generic; using log4net; @@ -18,10 +17,8 @@ { /// /// Dataobject for chartcontrol containing set of series. - /// /// Facade for TeeChart Chart. /// - [Entity] public class Chart : IChart { internal readonly Steema.TeeChart.Chart chart; Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/ChartTest.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r8e593693b22d3aff6994f810976d208e64bd5f96 --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/ChartTest.cs (.../ChartTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/ChartTest.cs (.../ChartTest.cs) (revision 8e593693b22d3aff6994f810976d208e64bd5f96) @@ -3,7 +3,6 @@ using Core.Common.Controls.Swf.Charting; using Core.Common.Controls.Swf.Charting.Series; using Core.Common.TestUtils; -using Core.Common.Utils.Collections; using NUnit.Framework; namespace Core.Common.Base.Tests.Controls.Swf.Charting @@ -12,16 +11,16 @@ public class ChartTest { [Test] - public void AddingSeriesToChartTriggersChartCollectionChanged() + public void ChartReferenceSetToChartSeriesAfterAddingItToChart() { var chart = new Chart(); - var count = 0; + var chartSeries = new AreaChartSeries(); - ((INotifyCollectionChanged) chart).CollectionChanged += (s, e) => { count++; }; + Assert.IsNull(chartSeries.Chart); - chart.Series.Add(new AreaChartSeries()); + chart.Series.Add(chartSeries); - Assert.AreEqual(1, count); + Assert.AreSame(chart, chartSeries.Chart); } [Test]