adds test cases for NestHostAttribute and NestMembersAttribute.

diff --git a/build.xml b/build.xml
index 365aa6042dd32afa46a2f63fd85dc1e21fab7146..ec805b0fbac2c28c0313c33248ff7cc256c977e4 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -74,13 +74,13 @@
     </javac>
   </target>
 
-  <target name="compile16" depends="prepare">
+  <target name="compile18" depends="prepare">
     <javac srcdir="${src.dir}"
            destdir="${build.classes.dir}"
            debug="on"
            deprecation="on"
-              source="1.6"
-              target="1.6"
+              source="1.8"
+              target="1.8"
            optimize="off"
           includeantruntime="true"
            includes="**">
@@ -181,7 +181,7 @@
 to ${build.classes.dir}.</echo>
   </target>
 
-  <target name="jar" depends="compile16">
+  <target name="jar" depends="compile18">
     <jar jarfile="${target.jar}" update="true" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${build.classes.dir}">
          <include name="**/*.class"/>

diff --git a/javassist.jar b/javassist.jar
index 4ff2cc139a0b7026f65e2723b5808286710bc0c8..4c72e547ffe1d874439a14bbced4008246680cdb 100644 (file)
Binary files a/javassist.jar and b/javassist.jar differ

diff --git a/src/test/javassist/JvstTest5.java b/src/test/javassist/JvstTest5.java
index b0cbbcca0aca7e0172ad5481a3fa9cbab4d23336..ec8ff66a02673aa7d34b11c9d1ae072f7e16b3e4 100644 (file)
--- a/src/test/javassist/JvstTest5.java
+++ b/src/test/javassist/JvstTest5.java
@@ -440,4 +440,17 @@ public class JvstTest5 extends JvstTestRoot {
         assertTrue(names[0].equals("test5.NestHost$Foo") || names[0].equals("test5.NestHost$Bar"));
         assertTrue(names[1].equals("test5.NestHost$Foo") || names[1].equals("test5.NestHost$Bar"));
     }
+
+    public void testNestMembersAttributeCopy() throws Exception {
+        CtClass cc = sloader.get("test5.NestHost2");
+        cc.getClassFile().compact();
+        cc.writeFile();
+        make(cc.getName());
+    }
+
+    public void testNestHostAttributeCopy() throws Exception {
+        CtClass cc = sloader.get("test5.NestHost2$Foo");
+        cc.getClassFile().compact();
+        cc.toClass();
+    }
 }

diff --git a/src/test/test5/NestHost.java b/src/test/test5/NestHost.java
new file mode 100644 (file)
index 0000000..045d9d3
--- /dev/null
+++ b/src/test/test5/NestHost.java
@@ -0,0 +1,11 @@
+package test5;
+
+public class NestHost {
+    private int value;
+    public class Foo {
+        int foo() { return value++; } 
+    }
+    public class Bar {
+        int bar() { return value++; }
+    }
+}

diff --git a/src/test/test5/NestHost2.java b/src/test/test5/NestHost2.java
new file mode 100644 (file)
index 0000000..571059b
--- /dev/null
+++ b/src/test/test5/NestHost2.java
@@ -0,0 +1,11 @@
+package test5;
+
+public class NestHost2 {
+    private int value;
+    public class Foo {
+        int foo() { return value++; } 
+    }
+    public class Bar {
+        int bar() { return value++; }
+    }
+}