Index: test/Common/DelftTools.TestUtils/TestReferenceHelper/TestReferenceHelper.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r20088e1db819ebac9cc8a6bc68f5875f24c076f2
--- test/Common/DelftTools.TestUtils/TestReferenceHelper/TestReferenceHelper.cs (.../TestReferenceHelper.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ test/Common/DelftTools.TestUtils/TestReferenceHelper/TestReferenceHelper.cs (.../TestReferenceHelper.cs) (revision 20088e1db819ebac9cc8a6bc68f5875f24c076f2)
@@ -126,110 +126,6 @@
}
///
- /// UNTESTED!! Use at own risk! Should be used for debugging purposes only.
- ///
- ///
- ///
- ///
- public static List SearchObjectInObjectGraph(object target, object graph)
- {
- var root = BuildReferenceTree(graph);
- return SearchObjectInObjectGraph(target, root);
- }
-
- public static List SearchObjectInObjectGraph(object target, ReferenceNode root)
- {
- var list = new List();
- var comparerNode = new ReferenceEqualsComparer();
- var comparerObj = new ReferenceEqualsComparer();
-
- var visitedNodes = new Dictionary(comparerNode);
- var queue = new Queue();
- queue.Enqueue(root);
-
- var uniqueFrom = new List();
-
- while (queue.Count > 0)
- {
- var activeNode = queue.Dequeue();
-
- foreach (var link in activeNode.Links)
- {
- if (!visitedNodes.ContainsKey(link.To))
- {
- queue.Enqueue(link.To);
- visitedNodes.Add(link.To, null);
- }
-
- if (ReferenceEquals(link.To.Object, target))
- {
- if (!uniqueFrom.Contains(link.From.Object, comparerObj))
- {
- uniqueFrom.Add(link.From.Object);
- list.Add(link.ToPathString());
- }
- }
- }
- }
- return list;
- }
-
- public static void AssertStringRepresentationOfGraphIsEqual(object network, object clone)
- {
- var objectsInReal = GetReferenceNodesInTree(network).ToList();
- var objectsInClone = GetReferenceNodesInTree(clone).ToList();
-
- for (var i = 0; i < objectsInReal.Count && i < objectsInClone.Count; i++)
- {
- var expected = objectsInReal[i];
- var actual = objectsInClone[i];
-
- if (!Equals(expected.Object.ToString(), actual.Object.ToString()))
- {
- Assert.Fail("Unexpected object at index {0}:\n {1}\n{2}\n", i, expected, actual);
- }
- }
-
- if (objectsInReal.Count != objectsInClone.Count)
- {
- for (var i = 0; i < objectsInReal.Count || i < objectsInClone.Count; i++)
- {
- var expected = objectsInReal[i].ToString();
- var actual = objectsInClone[i].ToString();
-
- if (expected != actual)
- {
- Assert.Fail("Unexpected object:\n {0}\n{1}\n", expected, actual);
- }
- }
-
- Assert.Fail("Number of objects in the original object tree ({0}) is not equal to the number of objects in the cloned tree ({1})", objectsInReal.Count, objectsInClone.Count);
- }
- }
-
- ///
- /// Searches for event subscriptions on the given object (only its own events). Works with normal events and PostSharp events.
- /// See FindEventSubscriptionsAdvanced to check entire object graphs. This call is equivalent to FindEventSubscriptionsAdvanced
- /// with depth 0.
- ///
- /// The object to check the number of event subscribers for.
- /// optional: print subscriptions to console
- ///
- public static int FindEventSubscriptions(object target, bool printSubscriptions = false)
- {
- var subscriptions = new List();
- var count = FindEventSubscriptionsAdvanced(target, subscriptions, 0);
-
- if (printSubscriptions)
- {
- Console.WriteLine("===");
- subscriptions.ForEach(Console.WriteLine);
- }
-
- return count;
- }
-
- ///
/// NOTE: No guarantees!
///
/// Object (graph) to find subscriptions on
Index: test/Common/DelftTools.Utils.Tests/TestReferenceHelperTest.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r20088e1db819ebac9cc8a6bc68f5875f24c076f2
--- test/Common/DelftTools.Utils.Tests/TestReferenceHelperTest.cs (.../TestReferenceHelperTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ test/Common/DelftTools.Utils.Tests/TestReferenceHelperTest.cs (.../TestReferenceHelperTest.cs) (revision 20088e1db819ebac9cc8a6bc68f5875f24c076f2)
@@ -91,15 +91,15 @@
}
[Entity]
- public class TestClass
+ private class TestClass
{
public TestClass Parent { get; set; }
}
[Entity]
- public class SuperTestClass : TestClass
+ private class SuperTestClass : TestClass
{
- public TestClass Other { get; set; }
+
}
}
}
\ No newline at end of file
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs
===================================================================
diff -u -r65f2e7d6ac377e64d885b6379ba3553a2deef981 -r20088e1db819ebac9cc8a6bc68f5875f24c076f2
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs (.../VectorLayerAttributeTableViewTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs (.../VectorLayerAttributeTableViewTest.cs) (revision 20088e1db819ebac9cc8a6bc68f5875f24c076f2)
@@ -1,6 +1,5 @@
using System.Collections;
using System.Collections.Generic;
-using System.ComponentModel;
using DelftTools.Utils;
using DelftTools.Utils.Collections.Generic;
using DelftTools.Utils.ComponentModel;
@@ -155,7 +154,6 @@
this.city = city;
}
- [DisplayName("Name (read-only)")]
public string Name
{
get
@@ -164,7 +162,6 @@
}
}
- [DisplayFormat("0 people")]
public int Population
{
get