[jboss-cvs] JBossAS SVN: r57518 - in projects/aop/trunk/aop: . src/resources/test/field src/test/org/jboss/test/aop/field
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 9 19:36:07 EDT 2006
Author: stalep
Date: 2006-10-09 19:36:00 -0400 (Mon, 09 Oct 2006)
New Revision: 57518
Added:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java
Modified:
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/src/resources/test/field/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java
Log:
[JBAOP-284]
Extended the test to confirm that shadowing works with the latest
javassist from cvs.
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2006-10-09 22:19:25 UTC (rev 57517)
+++ projects/aop/trunk/aop/build.xml 2006-10-09 23:36:00 UTC (rev 57518)
@@ -1454,50 +1454,6 @@
</junit>
</target>
-<!--
- <target name="annotatedfield" depends="jdk15-precompiled-tests">
- -->
- <target name="annotatedfield" depends="compile-jdk15-tests">
-
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </path>
-
- <aopc compilerclasspathref="aop.task.classpath">
- <sysproperty key="jboss.aop.debug.classes" value="true"/>
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <src path="${build.tests.classes}"/>
- <include name="org/jboss/test/aop/field/*"/>
- <aoppath path="${source.res}/test/field/jboss-aop.xml"/>
- <aopclasspath path="${build.tests.classes}"/>
- </aopc>
- <property name="report.dir" value="${build.reports}"/>
- <mkdir dir="${report.dir}"/>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/field/jboss-aop.xml"/>
- <sysproperty key="jboss.aop.debug.classes" value="false"/>
- <sysproperty key="jboss.aop.verbose" value="true"/>
- <!--
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"/>
- -->
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.field.FieldTestCase" />
- </junit>
- </target>
-
<target name="jdk15-precompiled-tests" depends="compile-jdk15-tests">
<property name="report.dir" value="${build.reports}"/>
Modified: projects/aop/trunk/aop/src/resources/test/field/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/field/jboss-aop.xml 2006-10-09 22:19:25 UTC (rev 57517)
+++ projects/aop/trunk/aop/src/resources/test/field/jboss-aop.xml 2006-10-09 23:36:00 UTC (rev 57518)
@@ -3,4 +3,7 @@
<bind pointcut="field(* org.jboss.test.aop.field.POJO->field)">
<interceptor class="org.jboss.test.aop.field.TraceInterceptor"/>
</bind>
+ <bind pointcut="field(* org.jboss.test.aop.field.SubSubPOJO->field)">
+ <interceptor class="org.jboss.test.aop.field.TraceInterceptor"/>
+ </bind>
</aop>
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java 2006-10-09 22:19:25 UTC (rev 57517)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java 2006-10-09 23:36:00 UTC (rev 57518)
@@ -64,4 +64,10 @@
assertEquals("Field is not set correctly", spojo.getPOJOField(), (spojo.getSubPOJOField()/2));
}
+ public void testField2()
+ {
+ System.out.println("*** testField2");
+ SubSubPOJO spojo = new SubSubPOJO(4);
+ assertEquals("Field is not set correctly", spojo.getSubSubPOJOField()/2, (spojo.getSubPOJOField()));
+ }
}
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java 2006-10-09 22:19:25 UTC (rev 57517)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java 2006-10-09 23:36:00 UTC (rev 57518)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.aop.field;
+
+/**
+ *
+ * @author <a href="mailto:stalep at conduct.no">Stale W. Pedersen</a>
+ * @version $Revision
+ */
+public class SubSubPOJO extends SubPOJO
+{
+ public int field;
+
+ public SubSubPOJO(int i)
+ {
+ super(i);
+ field = i * 2;
+ }
+
+ public int getSubSubPOJOField()
+ {
+ return field;
+ }
+
+
+}
More information about the jboss-cvs-commits
mailing list