231396: refactoring: Moved CharOperation and NameConvertor

2 files changed, 89 insertions, 0 deletions

diff --git a/asm/testsrc/org/aspectj/asm/AsmModuleTests.java b/asm/testsrc/org/aspectj/asm/AsmModuleTests.java
index 52f424d99..ebb500911 100644
--- a/asm/testsrc/org/aspectj/asm/AsmModuleTests.java
+++ b/asm/testsrc/org/aspectj/asm/AsmModuleTests.java
@@ -15,6 +15,8 @@ package org.aspectj.asm;
 
 // default package
 
+import org.aspectj.asm.NameConvertorTest;
+
 import junit.framework.*;
 
 public class AsmModuleTests extends TestCase {
@@ -22,6 +24,7 @@ public class AsmModuleTests extends TestCase {
     public static TestSuite suite() { 
         TestSuite suite = new TestSuite(AsmModuleTests.class.getName());
         suite.addTestSuite(AsmModuleTests.class); 
+        suite.addTestSuite(NameConvertorTest.class);
         return suite;
     }
 
diff --git a/asm/testsrc/org/aspectj/asm/NameConvertorTest.java b/asm/testsrc/org/aspectj/asm/NameConvertorTest.java
new file mode 100644
index 000000000..c1162eed2
--- /dev/null
+++ b/asm/testsrc/org/aspectj/asm/NameConvertorTest.java
@@ -0,0 +1,86 @@
+/********************************************************************
+ * Copyright (c) 2006 Contributors. All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Eclipse Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://eclipse.org/legal/epl-v10.html 
+ *  
+ * Contributors: IBM Corporation - initial API and implementation 
+ * 				 Helen Hawkins   - initial version
+ *******************************************************************/
+package org.aspectj.asm;
+
+import org.aspectj.asm.internal.CharOperation;
+import org.aspectj.asm.internal.NameConvertor;
+
+import junit.framework.TestCase;
+
+public class NameConvertorTest extends TestCase {
+
+	public void testBoolean() {
+		checkConversion("Z","boolean");
+	}
+	
+	public void testByte() {
+		checkConversion("B","byte");
+	}
+	
+	public void testChar() {
+		checkConversion("C","char");
+	}	
+	
+	public void testDouble() {
+		checkConversion("D","double");
+	}	
+	
+	public void testFloat() {
+		checkConversion("F","float");
+	}
+	
+	public void testInt() {
+		checkConversion("I","int");
+	}
+	
+	public void testLong() {
+		checkConversion("J","long");
+	}	
+	
+	public void testShort() {
+		checkConversion("S","short");
+	}	
+	
+	public void testString() {
+		checkConversion("Ljava/lang/String;","java.lang.String");
+	}
+
+	public void testType() {
+		checkConversion("LMyClass;","MyClass");
+	}
+
+	public void testListPameterizedWithString() {
+		checkConversion("Pjava/util/List<Ljava/lang/String;>;",
+				"java.util.List<java.lang.String>");
+	}
+	public void testClassParameterizedWithStringAndType() {
+		checkConversion("PMyGenericClass<Ljava/lang/String;LMyClass;>;",
+				"MyGenericClass<java.lang.String,MyClass>");
+	}
+	public void testStringArray() {
+		checkConversion("[Ljava/lang/String;","java.lang.String[]");
+	}
+	public void testTwoDimensionalStringArray() {
+		checkConversion("[[Ljava/lang/String;","java.lang.String[][]");
+	}
+	public void testIntArray() {
+		checkConversion("[I","int[]");
+	}
+
+	private void checkConversion(String signature, String expected) {
+		char[] c = NameConvertor.convertFromSignature(signature.toCharArray());
+		assertTrue("converting " + signature + ", expected " + expected + "," +
+				"but found " + String.valueOf(c),
+				CharOperation.equals(c,expected.toCharArray()));
+	}
+
+	
+}