Patch from Andreas Schönebeck "CollectionStrategy returns ErrorMessag…

…e in BaseDataItem.DBValue if ColumnName not exist" git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5696 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
OmerRaviv · Apr 12, 2010 · 42ec034 · 42ec034
1 parent 084f6c2
commit 42ec034
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/...arpReport/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs b/...arpReport/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
@@ -257,8 +257,11 @@ public override void Fill(IReportItem item)
 				BaseDataItem baseDataItem = item as BaseDataItem;
 				if (baseDataItem != null) {
 					PropertyDescriptor p = this.listProperties.Find(baseDataItem.ColumnName, true);
-					baseDataItem.DBValue = "";
-					baseDataItem.DBValue = p.GetValue(this.Current).ToString();
+					if (p != null) {
+						baseDataItem.DBValue = p.GetValue(this.Current).ToString();
+					} else {
+						baseDataItem.DBValue = string.Format("<{0}> missing!", baseDataItem.ColumnName);
+					}
 					return;
 				}
 

diff --git a/...de.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs b/...de.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs
@@ -83,6 +83,22 @@ public void DataNavigatorCorrectPosition ()
 			                "CurrentRow should be -1");
 		}
 
+
+		[Test]
+		public void DataNavigator_Return_ErrMessage_If_ColumnName_NotExist ()
+		{
+			IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection as System.Collections.IList,new ReportSettings());
+			IDataNavigator dataNav = dm.GetNavigator;
+			BaseDataItem item = new BaseDataItem();
+			item.ColumnName = "ColumnNotExist";
+			var items = new ReportItemCollection();
+			items.Add(item);
+			dataNav.Fill(items);
+			string str = "<" + item.ColumnName +">";
+			Assert.That(item.DBValue.Contains(str));
+		}
+
+
 		#region Standart Enumerator
 		[Test]
 		public void EnumeratorStartFromBegin ()