Cleanup test

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs

@@ -22,8 +22,6 @@ namespace ICSharpCode.Reports.Core
 	{
 
 		private string columnName;
-//		private string dbValue;
-
 
 		#region Constructor
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs

@@ -207,64 +207,48 @@ namespace ICSharpCode.Reports.Core {
 		
 		#endregion
 		
+		
 		public override void Fill(IDataItem item)
 		{
-			if (current != null) {
+			if (item is BaseDataItem)
-				BaseDataItem baseDataItem = item as BaseDataItem;
+			{
-				
+				if (item.ColumnName.Contains(".")) {
-				if (baseDataItem != null) {
+					string[] splittedNames = SplitNames(ref item);
 					
-					if (baseDataItem.ColumnName.Contains(".")) {
+					// PropDes for SubClass
-						
+					
-						string[] splittedNames = SplitNames(ref baseDataItem);
+					PropertyDescriptor classProperty = this.listProperties.Find(splittedNames[0], true);
-						
+					if (classProperty == null)
-						
+					{
-						PropertyDescriptor p = this.listProperties.Find(splittedNames[0], true);
+						WrongColumnName (item);
-						
-						var propCollection = ExtendedTypeDescriptor.GetProperties(p.PropertyType);
-						
-						
-						foreach (ExtendedPropertyDescriptor element in propCollection)
-						{
-							Console.WriteLine ("{0} - {1} - {2}",element.Name,element.ComponentType,element.PropertyType);
-						}
-						
-						
-						PropertyDescriptor ppp = propCollection.Find(splittedNames[1], true);
-						object classValue = p.GetValue(this.Current);
-						var v = ppp.GetValue(classValue);
-						
-						baseDataItem.DBValue = v.ToString();
-
-//						Console.WriteLine("{0} - {1}",p.Name,p.PropertyType);
-						
-						
 					}
 					else
-						
 					{
-						PropertyDescriptor p = this.listProperties.Find(baseDataItem.ColumnName, true);
+						//all Props for SubClass
-					
+						var propCollection = ExtendedTypeDescriptor.GetProperties(classProperty.PropertyType);
-						if (p != null)
+						
-						{
+						var subProperty = propCollection.Find(splittedNames[1], true);
-							var o = p.GetValue(this.Current);
+						
-							
+						var classValue = classProperty.GetValue(this.Current);
-							if (o != null) {
+						SetReturnValue(subProperty,classValue,item);
-//								baseDataItem.DBValue = p.GetValue(this.Current).ToString();
+					}
-								baseDataItem.DBValue = o.ToString();
+				}
-							} else {
+				else
-								baseDataItem.DBValue = String.Empty;
+				{
-							}
+					PropertyDescriptor p = this.listProperties.Find(item.ColumnName, true);
-							
+					if (p != null) {
-						} else {
+						SetReturnValue(p,this.Current,item);
-							baseDataItem.DBValue = string.Format(CultureInfo.InvariantCulture,"<{0}> missing!", baseDataItem.ColumnName);
+					} else {
-						}
+						WrongColumnName (item);
 					}
 					
-					
-					return;
 				}
 				
+				return;
+			}
+			else
+			{
+				
 				//image processing from IList
 				BaseImageItem baseImageItem = item as BaseImageItem;
 				
@@ -277,80 +261,42 @@ namespace ICSharpCode.Reports.Core {
 				}
 			}
 		}
-		
-		object getvalueFromproperty(PropertyDescriptor p)
-		{
-			throw new NotImplementedException();
-		}
 
-		string[] SplitNames(ref BaseDataItem baseDataItem)
+		
+		void WrongColumnName(IDataItem item)
 		{
-			var i = baseDataItem.ColumnName.IndexOf(".");
+			item.DBValue = string.Format(CultureInfo.InvariantCulture, "Error : <{0}> missing!", item.ColumnName);
-			char[] delimiters = new char[] { '.' };
-			var splittedNames = baseDataItem.ColumnName.Split(delimiters);
-			return splittedNames;
 		}
+			
 		
-		
+		void SetReturnValue(PropertyDescriptor p,object component,IDataItem item)
-		
-		public  void old_Fill(IDataItem item)
 		{
-			if (current != null) {
+			if (p != null)
-				BaseDataItem baseDataItem = item as BaseDataItem;
+			{
-				if (baseDataItem != null) {
+				var o = p.GetValue(component);
-					PropertyDescriptor p = this.listProperties.Find(baseDataItem.ColumnName, true);
-					
-					if (p != null)
-					{
-//						Console.WriteLine("PPPPPPPPPPPP {0}",p.PropertyType);
-						var o = p.GetValue(this.Current);
-						if (o != null) {
-							baseDataItem.DBValue = p.GetValue(this.Current).ToString();
-						} else {
-							baseDataItem.DBValue = String.Empty;
-						}
-						
-					} else {
-						baseDataItem.DBValue = string.Format(CultureInfo.InvariantCulture,"<{0}> missing!", baseDataItem.ColumnName);
-					}
-					return;
-				}
 				
-				//image processing from IList
+				if (o != null) {
-				BaseImageItem baseImageItem = item as BaseImageItem;
+					item.DBValue = o.ToString();
-				
+				} else {
-				if (baseImageItem != null) {
+					item.DBValue = String.Empty;
-					PropertyDescriptor p = this.listProperties.Find(baseImageItem.ColumnName, true);
-					if (p != null) {
-						baseImageItem.Image = p.GetValue(this.Current) as System.Drawing.Image;
-					}
-					return;
 				}
+				
+			} else {
+				WrongColumnName(item);
 			}
 		}
-		
 
-		#region test
+		
-		/*
+		string[] SplitNames(ref IDataItem item)
-		public override CurrentItems FillDataRow()
 		{
-			CurrentItems ci = base.FillDataRow();
+			var i = item.ColumnName.IndexOf(".");
-			DataRow row = this.Current as DataRow;
+			char[] delimiters = new char[] { '.' };
-			
+			var splittedNames = item.ColumnName.Split(delimiters);
-			if (row != null) {
+			return splittedNames;
-				CurrentItem c = null;
-				
-				foreach (DataColumn dc in table.Columns)
-				{
-					c = new CurrentItem();
-					c.ColumnName = dc.ColumnName;
-					c.Value = row[dc.ColumnName];
-					ci.Add(c);
-				}
-			}
-			return ci;
 		}
-		 */
+		
+		
+		#region test
 		
 		public override CurrentItemsCollection FillDataRow()
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/ListStrategy/IListDataManagerFixture.cs

@@ -89,7 +89,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.ListStrategy
 			items.Add(item);
 			dataNav.Fill(items);
 			string str = "<" + item.ColumnName +">";
-			Assert.That(item.DBValue.Contains(str));
+			Assert.That(item.DBValue.StartsWith("Error"));
 		}
 		
 		
@@ -288,8 +288,6 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.ListStrategy
 				Contributor view = dataNav.Current as Contributor;
 				string actual = view.Last;
 				Assert.GreaterOrEqual(compareTo,actual);
-//				string ss = String.Format("< {0} > <{1}>",compareTo,actual);
-//				Console.WriteLine(ss);
 				compareTo = actual;
 			}
 			Assert.IsTrue(dataNav.IsSorted);
@@ -392,33 +390,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.ListStrategy
 		#endregion
 		
 		#region get included class
-		[Test]
+		
-		public void checkIfPropIsClass()
-		{
-			IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection,new ReportSettings());
-			IDataNavigator dn = dm.GetNavigator;
-			int start = 0;
-			MyDummyClass dummy = new MyDummyClass();
-			
-			while (dn.MoveNext()) {
-				dummy.DummyString = "dummy" + start.ToString();
-				dummy.DummyInt = start;
-				Contributor view = dn.Current as Contributor;
-				view.DummyClass = dummy;
-				Console.WriteLine(view.Last);
-				start ++;
-			}
-				
-			dn.Reset();
-			dn.MoveNext();
-			start = 0;
-			while (dn.MoveNext()) {
-				Contributor view = dn.Current as Contributor;
-				Console.WriteLine("{0} - {1} - {2}",view.Last,view.DummyClass.DummyInt,view.DummyClass.DummyString);
-			start ++;
-			}
-			Console.WriteLine(start);
-		}
 			
 		ContributorCollection ModifyCollection ()
 		{
@@ -438,15 +410,15 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.ListStrategy
 		
 		
 		[Test]
-		public void Prop ()
+		public void Collection_Contains_Subclass ()
 		{
 			var modifyedCollection = this.ModifyCollection();
 			IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(modifyedCollection,new ReportSettings());
 			IDataNavigator dn = dm.GetNavigator;
+			
 			ReportItemCollection searchCol = new ReportItemCollection();
 			searchCol.Add(new BaseDataItem ()
 			              {
-			              	Name ="GroupItem",
 			              	ColumnName ="DummyClass.DummyString"			     
 			              }
 			             );
@@ -466,14 +438,63 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.ListStrategy
 				var a = (BaseDataItem)searchCol[0];
 				var b = (BaseDataItem)searchCol[1];
 				var c = modifyedCollection[dn.CurrentRow];
-//				Console.WriteLine ("{0} - {1} - {2}",a.DBValue,b.DBValue,c.DummyClass.DummyString);
 				Assert.AreEqual(a.DBValue,c.DummyClass.DummyString);
 				Assert.AreEqual(b.DBValue,c.GroupItem);
 			}
 		}
 		
-		#region Setup/TearDown
+		
+		[Test]
+		public void SubClassName_Is_Wrong ()
+		{
+			var modifyedCollection = this.ModifyCollection();
+			IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(modifyedCollection,new ReportSettings());
+			IDataNavigator dn = dm.GetNavigator;
+			ReportItemCollection searchCol = new ReportItemCollection();
+			searchCol.Add(new BaseDataItem ()
+			              {
+			              	ColumnName ="wrong.DummyString",
+							DataType = "System.Int32"		              	
+			              }
+			             );
+			
+			dn.Reset();
+			dn.MoveNext();
+
+			while (dn.MoveNext()) {
+				dn.Fill(searchCol);
+				var a = (BaseDataItem)searchCol[0];
+				Assert.That(a.DBValue.StartsWith("Error"));
+			}
+		}
+		
+		[Test]
+		public void SubPropertyName_Is_Wrong ()
+		{
+			var modifyedCollection = this.ModifyCollection();
+			IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(modifyedCollection,new ReportSettings());
+			IDataNavigator dn = dm.GetNavigator;
+			ReportItemCollection searchCol = new ReportItemCollection();
+			searchCol.Add(new BaseDataItem ()
+			              {
+			              	Name ="GroupItem",
+			              	ColumnName ="DummyClass.Wrong",
+							DataType = "System.Int32"		              	
+			              }
+			             );
+			dn.Reset();
+			dn.MoveNext();
+			while (dn.MoveNext()) {
+				dn.Fill(searchCol);
+				var a = (BaseDataItem)searchCol[0];
+				Assert.That(a.DBValue.StartsWith("Error"));
+			}
+		}
+		
 		#endregion
+		
+		#region Setup/TearDown
+	
 		[TestFixtureSetUp]
 		public void Init()
 		{