Browse Source

fix CSharpAmbienceTests

pull/297/head
Siegfried Pammer 12 years ago
parent
commit
8d89e242d2
  1. 10
      src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CSharpAmbienceTests.cs

10
src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CSharpAmbienceTests.cs

@ -48,7 +48,7 @@ namespace ICSharpCode.NRefactory.CSharp
public void GenericType() public void GenericType()
{ {
var typeDef = compilation.FindType(typeof(Dictionary<,>)).GetDefinition(); var typeDef = compilation.FindType(typeof(Dictionary<,>)).GetDefinition();
ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.ShowTypeParameterList; ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedMemberNames | ConversionFlags.ShowTypeParameterList;
string result = ambience.ConvertEntity(typeDef); string result = ambience.ConvertEntity(typeDef);
Assert.AreEqual("System.Collections.Generic.Dictionary<TKey, TValue>", result); Assert.AreEqual("System.Collections.Generic.Dictionary<TKey, TValue>", result);
@ -68,7 +68,7 @@ namespace ICSharpCode.NRefactory.CSharp
public void SimpleType() public void SimpleType()
{ {
var typeDef = compilation.FindType(typeof(Object)).GetDefinition(); var typeDef = compilation.FindType(typeof(Object)).GetDefinition();
ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.ShowTypeParameterList; ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedMemberNames | ConversionFlags.ShowTypeParameterList;
string result = ambience.ConvertEntity(typeDef); string result = ambience.ConvertEntity(typeDef);
Assert.AreEqual("System.Object", result); Assert.AreEqual("System.Object", result);
@ -78,7 +78,7 @@ namespace ICSharpCode.NRefactory.CSharp
public void SimpleTypeDefinition() public void SimpleTypeDefinition()
{ {
var typeDef = compilation.FindType(typeof(Object)).GetDefinition(); var typeDef = compilation.FindType(typeof(Object)).GetDefinition();
ambience.ConversionFlags = ConversionFlags.All & ~(ConversionFlags.UseFullyQualifiedTypeNames); ambience.ConversionFlags = ConversionFlags.All & ~(ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.UseFullyQualifiedMemberNames);
string result = ambience.ConvertEntity(typeDef); string result = ambience.ConvertEntity(typeDef);
Assert.AreEqual("public class Object", result); Assert.AreEqual("public class Object", result);
@ -88,7 +88,7 @@ namespace ICSharpCode.NRefactory.CSharp
public void SimpleTypeDefinitionWithoutModifiers() public void SimpleTypeDefinitionWithoutModifiers()
{ {
var typeDef = compilation.FindType(typeof(Object)).GetDefinition(); var typeDef = compilation.FindType(typeof(Object)).GetDefinition();
ambience.ConversionFlags = ConversionFlags.All & ~(ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.ShowModifiers | ConversionFlags.ShowAccessibility); ambience.ConversionFlags = ConversionFlags.All & ~(ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.UseFullyQualifiedMemberNames | ConversionFlags.ShowModifiers | ConversionFlags.ShowAccessibility);
string result = ambience.ConvertEntity(typeDef); string result = ambience.ConvertEntity(typeDef);
Assert.AreEqual("class Object", result); Assert.AreEqual("class Object", result);
@ -128,7 +128,7 @@ namespace ICSharpCode.NRefactory.CSharp
public void GenericTypeWithNested() public void GenericTypeWithNested()
{ {
var typeDef = compilation.FindType(typeof(List<>.Enumerator)).GetDefinition(); var typeDef = compilation.FindType(typeof(List<>.Enumerator)).GetDefinition();
ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.ShowTypeParameterList; ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames | ConversionFlags.UseFullyQualifiedMemberNames | ConversionFlags.ShowTypeParameterList;
string result = ambience.ConvertEntity(typeDef); string result = ambience.ConvertEntity(typeDef);
Assert.AreEqual("System.Collections.Generic.List<T>.Enumerator", result); Assert.AreEqual("System.Collections.Generic.List<T>.Enumerator", result);

Loading…
Cancel
Save