X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem%2FTest%2FMicrosoft.CSharp%2FCodeGeneratorIdentifierTest.cs;h=417a25cb28ef35470653c5bdf5c9d97156db4190;hb=ba3384aa88a389c308d8258e4ae66caaa2856221;hp=cfce7621ceafb2f3899bcc9ab64c4c955749f223;hpb=9d61782c6e2392d7ceec2006b35be582598a70ae;p=mono.git

diff --git a/mcs/class/System/Test/Microsoft.CSharp/CodeGeneratorIdentifierTest.cs b/mcs/class/System/Test/Microsoft.CSharp/CodeGeneratorIdentifierTest.cs
index cfce7621cea..417a25cb28e 100644
--- a/mcs/class/System/Test/Microsoft.CSharp/CodeGeneratorIdentifierTest.cs
+++ b/mcs/class/System/Test/Microsoft.CSharp/CodeGeneratorIdentifierTest.cs
@@ -14,7 +14,7 @@ using Microsoft.CSharp;
 namespace MonoTests.Microsoft.CSharp
 {
 	[TestFixture]
-	public class CodeGeneratorIdentifierTest : Assertion
+	public class CodeGeneratorIdentifierTest
 	{
 		private ICodeGenerator gen;
 
@@ -34,18 +34,18 @@ namespace MonoTests.Microsoft.CSharp
 		public void TestCreateValidIdentifier ()
 		{
 		
-			AssertEquals ("a", gen.CreateValidIdentifier ("a"));
-			AssertEquals ("_int", gen.CreateValidIdentifier ("int"));
-			AssertEquals ("_", gen.CreateValidIdentifier ("_"));
-			AssertEquals ("1", gen.CreateValidIdentifier ("1"));
-			AssertEquals ("1a", gen.CreateValidIdentifier ("1a"));
-			AssertEquals ("1*2", gen.CreateValidIdentifier ("1*2"));
-			AssertEquals ("-", gen.CreateValidIdentifier ("-"));
-			AssertEquals ("+", gen.CreateValidIdentifier ("+"));
-			AssertEquals ("", gen.CreateValidIdentifier (""));
-			AssertEquals ("--", gen.CreateValidIdentifier ("--"));
-			AssertEquals ("++", gen.CreateValidIdentifier ("++"));
-			AssertEquals ("\u3042", gen.CreateValidIdentifier ("\u3042"));
+			Assert.AreEqual ("a", gen.CreateValidIdentifier ("a"));
+			Assert.AreEqual ("_int", gen.CreateValidIdentifier ("int"));
+			Assert.AreEqual ("_", gen.CreateValidIdentifier ("_"));
+			Assert.AreEqual ("1", gen.CreateValidIdentifier ("1"));
+			Assert.AreEqual ("1a", gen.CreateValidIdentifier ("1a"));
+			Assert.AreEqual ("1*2", gen.CreateValidIdentifier ("1*2"));
+			Assert.AreEqual ("-", gen.CreateValidIdentifier ("-"));
+			Assert.AreEqual ("+", gen.CreateValidIdentifier ("+"));
+			Assert.AreEqual ("", gen.CreateValidIdentifier (""));
+			Assert.AreEqual ("--", gen.CreateValidIdentifier ("--"));
+			Assert.AreEqual ("++", gen.CreateValidIdentifier ("++"));
+			Assert.AreEqual ("\u3042", gen.CreateValidIdentifier ("\u3042"));
 		}
 
 		[Test]
@@ -59,18 +59,39 @@ namespace MonoTests.Microsoft.CSharp
 		public void TestCreateEscapedIdentifier ()
 		{
 		
-			AssertEquals ("a", gen.CreateEscapedIdentifier ("a"));
-			AssertEquals ("@int", gen.CreateEscapedIdentifier ("int"));
-			AssertEquals ("_", gen.CreateEscapedIdentifier ("_"));
-			AssertEquals ("1", gen.CreateEscapedIdentifier ("1"));
-			AssertEquals ("1a", gen.CreateEscapedIdentifier ("1a"));
-			AssertEquals ("1*2", gen.CreateEscapedIdentifier ("1*2"));
-			AssertEquals ("-", gen.CreateEscapedIdentifier ("-"));
-			AssertEquals ("+", gen.CreateEscapedIdentifier ("+"));
-			AssertEquals ("", gen.CreateEscapedIdentifier (""));
-			AssertEquals ("--", gen.CreateEscapedIdentifier ("--"));
-			AssertEquals ("++", gen.CreateEscapedIdentifier ("++"));
-			AssertEquals ("\u3042", gen.CreateEscapedIdentifier ("\u3042"));
+			Assert.AreEqual ("a", gen.CreateEscapedIdentifier ("a"));
+			Assert.AreEqual ("@int", gen.CreateEscapedIdentifier ("int"));
+			Assert.AreEqual ("_", gen.CreateEscapedIdentifier ("_"));
+			Assert.AreEqual ("1", gen.CreateEscapedIdentifier ("1"));
+			Assert.AreEqual ("1a", gen.CreateEscapedIdentifier ("1a"));
+			Assert.AreEqual ("1*2", gen.CreateEscapedIdentifier ("1*2"));
+			Assert.AreEqual ("-", gen.CreateEscapedIdentifier ("-"));
+			Assert.AreEqual ("+", gen.CreateEscapedIdentifier ("+"));
+			Assert.AreEqual ("", gen.CreateEscapedIdentifier (""));
+			Assert.AreEqual ("--", gen.CreateEscapedIdentifier ("--"));
+			Assert.AreEqual ("++", gen.CreateEscapedIdentifier ("++"));
+			Assert.AreEqual ("\u3042", gen.CreateEscapedIdentifier ("\u3042"));
+		}
+
+		[Test]
+		public void TestIsValidIdentifier ()
+		{
+			Assert.AreEqual (true, gen.IsValidIdentifier ("_a"));
+			Assert.AreEqual (true, gen.IsValidIdentifier ("_"));
+			Assert.AreEqual (true, gen.IsValidIdentifier ("@return"));
+			Assert.AreEqual (true, gen.IsValidIdentifier ("d1"));
+			Assert.AreEqual (true, gen.IsValidIdentifier ("_1"));
+			Assert.AreEqual (true, gen.IsValidIdentifier ("_a_1"));
+			Assert.AreEqual (true, gen.IsValidIdentifier ("@a"));
+			Assert.AreEqual (false, gen.IsValidIdentifier ("1"));
+			Assert.AreEqual (false, gen.IsValidIdentifier (" "));
+			Assert.AreEqual (false, gen.IsValidIdentifier ("?"));
+			Assert.AreEqual (false, gen.IsValidIdentifier (":_:"));
+			Assert.AreEqual (false, gen.IsValidIdentifier ("_ "));
+			Assert.AreEqual (false, gen.IsValidIdentifier ("@ "));
+			Assert.AreEqual (false, gen.IsValidIdentifier ("1*2"));
+			Assert.AreEqual (false, gen.IsValidIdentifier ("1_2"));
+			Assert.AreEqual (gen.IsValidIdentifier ("a, b"), false);
 		}
 	}
 }