From 28e211f3ceb01f1c2c1bb09a3e2d040b9a8ebc3e Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Wed, 1 Jan 2014 16:51:35 +0000
Subject: [PATCH] Update tests for EnvDTE.CodeInterface

---
 .../Project/Src/EnvDTE/CodeInterface.cs       | 22 ++----
 .../Test/Src/EnvDTE/CodeInterfaceTests.cs     | 68 +++++++++----------
 2 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs
index bae90e8320..ef7752d632 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs
@@ -15,23 +15,11 @@ namespace ICSharpCode.PackageManagement.EnvDTE
 			: base(context, typeDefinition, typeArguments)
 		{
 		}
-//		
-//		public override global::EnvDTE.vsCMElement Kind {
-//			get { return global::EnvDTE.vsCMElement.vsCMElementInterface; }
-//		}
-//		
-//		/// <summary>
-//		/// Returns null if base type is not an interface.
-//		/// </summary>
-//		public static CodeInterface CreateFromBaseType(IProjectContent projectContent, IReturnType baseType)
-//		{
-//			IClass baseTypeClass = baseType.GetUnderlyingClass();
-//			if (baseTypeClass.ClassType == ClassType.Interface) {
-//				return new CodeInterface(projectContent, baseType, baseTypeClass);
-//			}
-//			return null;
-//		}
-//		
+		
+		public override global::EnvDTE.vsCMElement Kind {
+			get { return global::EnvDTE.vsCMElement.vsCMElementInterface; }
+		}
+		
 		public global::EnvDTE.CodeFunction AddFunction(string name, global::EnvDTE.vsCMFunction kind, object type, object Position = null, global::EnvDTE.vsCMAccess Access = global::EnvDTE.vsCMAccess.vsCMAccessPublic)
 		{
 		//	var codeGenerator = new ClassCodeGenerator(Class);
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs
index 379b139885..d66b78d7d8 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs
@@ -1,34 +1,34 @@
-//// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-//// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-//
-//using System;
-//using ICSharpCode.PackageManagement.EnvDTE;
-//using ICSharpCode.SharpDevelop.Dom;
-//using NUnit.Framework;
-//using PackageManagement.Tests.Helpers;
-//
-//namespace PackageManagement.Tests.EnvDTE
-//{
-//	[TestFixture]
-//	public class CodeInterfaceTests : CodeModelTestBase
-//	{
-//		CodeInterface codeInterface;
-//		
-//		void CreateInterface(string code)
-//		{
-//			AddCodeFile("interface.cs", code);
-//			ITypeDefinitionModel typeModel = assemblyModel.TopLevelTypeDefinitions.Single();
-//			codeInterface = new CodeInterface(codeModelContext, typeModel);
-//		}
-//		
-//		[Test]
-//		public void Kind_Interface_ReturnsInterface()
-//		{
-//			CreateInterface("interface MyInterface {}");
-//			
-//			global::EnvDTE.vsCMElement kind = codeInterface.Kind;
-//			
-//			Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementInterface, kind);
-//		}
-//	}
-//}
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.PackageManagement.EnvDTE;
+using NUnit.Framework;
+
+namespace PackageManagement.Tests.EnvDTE
+{
+	[TestFixture]
+	public class CodeInterfaceTests : CodeModelTestBase
+	{
+		CodeInterface codeInterface;
+		
+		void CreateInterface(string code)
+		{
+			AddCodeFile("interface.cs", code);
+			ITypeDefinition typeDefinition = assemblyModel.TopLevelTypeDefinitions.First().Resolve();
+			codeInterface = new CodeInterface(codeModelContext, typeDefinition);
+		}
+		
+		[Test]
+		public void Kind_Interface_ReturnsInterface()
+		{
+			CreateInterface("interface MyInterface {}");
+			
+			global::EnvDTE.vsCMElement kind = codeInterface.Kind;
+			
+			Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementInterface, kind);
+		}
+	}
+}