Fix the nesting logic

1 files changed, 5 insertions, 5 deletions

diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs
index 1f0fe79440..5092b235b7 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs
@@ -66,16 +66,16 @@ namespace MonoDevelop.UnitTesting.VsTest
 		{
 			string childNamespace = VsTestTest.FixtureTypeNamespace;
 
-			if(currentNamespace.Name != childNamespace) {
+			if (currentNamespace == null || currentNamespace.Name != childNamespace) {
 				currentNamespace = new VsTestNamespaceTestGroup (testRunner, currentNamespace, Project, childNamespace);
 				currentNamespace.AddTest (VsTestTest);
 				Tests.Add (currentNamespace);
 			} else {
-				if (currentClass == null || currentClass.FixtureTypeName != VsTestTest.FixtureTypeName) {
-					currentClass = new VsTestTestClass (testRunner, Project, VsTestTest);
-					Tests.Add (currentClass);
+				if (currentNamespace.currentClass == null || currentNamespace.currentClass.FixtureTypeName != VsTestTest.FixtureTypeName) {
+					currentNamespace.currentClass = new VsTestTestClass (testRunner, Project, VsTestTest);
+					currentNamespace.Tests.Add (currentNamespace.currentClass);
 				}
-				currentClass.Tests.Add (VsTestTest);
+				currentNamespace.currentClass.Tests.Add (VsTestTest);
 			}
 		}