mavenizing asm module - wip

19 files changed, 120 insertions, 0 deletions

diff --git a/asm/src/org/aspectj/asm/AsmManager.java b/asm/src/main/java/org/aspectj/asm/AsmManager.java
index 2ab34c862..2ab34c862 100644
--- a/asm/src/org/aspectj/asm/AsmManager.java
+++ b/asm/src/main/java/org/aspectj/asm/AsmManager.java
diff --git a/asm/src/org/aspectj/asm/HierarchyWalker.java b/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
index 7629f7c68..7629f7c68 100644
--- a/asm/src/org/aspectj/asm/HierarchyWalker.java
+++ b/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
diff --git a/asm/src/org/aspectj/asm/IElementHandleProvider.java b/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
index c071f0337..c071f0337 100644
--- a/asm/src/org/aspectj/asm/IElementHandleProvider.java
+++ b/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
diff --git a/asm/src/org/aspectj/asm/IHierarchy.java b/asm/src/main/java/org/aspectj/asm/IHierarchy.java
index 6674cdaea..6674cdaea 100644
--- a/asm/src/org/aspectj/asm/IHierarchy.java
+++ b/asm/src/main/java/org/aspectj/asm/IHierarchy.java
diff --git a/asm/src/org/aspectj/asm/IHierarchyListener.java b/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
index 12bf724da..12bf724da 100644
--- a/asm/src/org/aspectj/asm/IHierarchyListener.java
+++ b/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
diff --git a/asm/src/org/aspectj/asm/IModelFilter.java b/asm/src/main/java/org/aspectj/asm/IModelFilter.java
index cfae6e7b7..cfae6e7b7 100644
--- a/asm/src/org/aspectj/asm/IModelFilter.java
+++ b/asm/src/main/java/org/aspectj/asm/IModelFilter.java
diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/main/java/org/aspectj/asm/IProgramElement.java
index 19e6d95ac..19e6d95ac 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/main/java/org/aspectj/asm/IProgramElement.java
diff --git a/asm/src/org/aspectj/asm/IRelationship.java b/asm/src/main/java/org/aspectj/asm/IRelationship.java
index 86633cf36..86633cf36 100644
--- a/asm/src/org/aspectj/asm/IRelationship.java
+++ b/asm/src/main/java/org/aspectj/asm/IRelationship.java
diff --git a/asm/src/org/aspectj/asm/IRelationshipMap.java b/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
index e4159dce8..e4159dce8 100644
--- a/asm/src/org/aspectj/asm/IRelationshipMap.java
+++ b/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 6019964c6..6019964c6 100644
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java
diff --git a/asm/src/org/aspectj/asm/internal/CharOperation.java b/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
index bf5330a11..bf5330a11 100644
--- a/asm/src/org/aspectj/asm/internal/CharOperation.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
diff --git a/asm/src/org/aspectj/asm/internal/HandleProviderDelimiter.java b/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
index 9bbfc307c..9bbfc307c 100644
--- a/asm/src/org/aspectj/asm/internal/HandleProviderDelimiter.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index 3751dfc1b..3751dfc1b 100644
--- a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
diff --git a/asm/src/org/aspectj/asm/internal/NameConvertor.java b/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
index 340d41586..340d41586 100644
--- a/asm/src/org/aspectj/asm/internal/NameConvertor.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
index 51aafd936..51aafd936 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
diff --git a/asm/src/org/aspectj/asm/internal/Relationship.java b/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
index 8bd4a7e66..8bd4a7e66 100644
--- a/asm/src/org/aspectj/asm/internal/Relationship.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
diff --git a/asm/src/org/aspectj/asm/internal/RelationshipMap.java b/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
index 1fea7bb85..1fea7bb85 100644
--- a/asm/src/org/aspectj/asm/internal/RelationshipMap.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
diff --git a/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java b/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
new file mode 100644
index 000000000..ebb500911
--- /dev/null
+++ b/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
@@ -0,0 +1,34 @@
+package org.aspectj.asm;
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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://www.eclipse.org/legal/epl-v10.html 
+ *  
+ * Contributors: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+
+// default package
+
+import org.aspectj.asm.NameConvertorTest;
+
+import junit.framework.*;
+
+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;
+    }
+
+    public AsmModuleTests(String name) { super(name); }
+
+    public void testNothing() {}
+}  
diff --git a/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java b/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java
new file mode 100644
index 000000000..22ac3fb79
--- /dev/null
+++ b/asm/src/test/java/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 junit.framework.TestCase;
+
+import org.aspectj.asm.internal.CharOperation;
+import org.aspectj.asm.internal.NameConvertor;
+
+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()));
+	}
+
+}