[jboss-cvs] JBossAS SVN: r75679 - in trunk/testsuite: imports/sections and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 11 07:00:53 EDT 2008
Author: stalep
Date: 2008-07-11 07:00:53 -0400 (Fri, 11 Jul 2008)
New Revision: 75679
Added:
trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAnnotatedTestCase.java
trunk/testsuite/src/resources/aop/jdk15annotated/scoped/
trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/
trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-service.xml
Modified:
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/src/main/org/jboss/test/aop/test/AnnotatedTestCase.java
Log:
[JBAS-5757] added scoped annotated testes
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2008-07-11 10:54:31 UTC (rev 75678)
+++ trunk/testsuite/imports/sections/aop.xml 2008-07-11 11:00:53 UTC (rev 75679)
@@ -278,7 +278,31 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
-
+
+ <!-- Create jars for scoped annotation tests -->
+ <jar destfile="${build.lib}/aop-scoped-annotated.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/jdk15annotated/*.class"/>
+ <exclude name="org/jboss/test/aop/jdk15annotated/AnnotatedTester.class" />
+ <exclude name="org/jboss/test/aop/jdk15annotated/AnnotatedTesterMBean.class" />
+ </fileset>
+ <fileset dir="${build.resources}/aop/jdk15annotated/scoped">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/aop-scoped-annotated.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/jdk15annotated/AnnotatedTester.class" />
+ <include name="org/jboss/test/aop/jdk15annotated/AnnotatedTesterMBean.class" />
+ </fileset>
+ <fileset dir="${build.lib}">
+ <include name="aop-scoped-annotated.aop" />
+ </fileset>
+ <fileset dir="${build.resources}/aop/jdk15annotated/scoped">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
<!-- jars for scoped test -->
<jar destfile="${build.lib}/aop-scopedtest1.aop">
<fileset dir="${build.classes}">
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-07-11 10:54:31 UTC (rev 75678)
+++ trunk/testsuite/imports/server-config.xml 2008-07-11 11:00:53 UTC (rev 75679)
@@ -11,7 +11,10 @@
be valid for the platform.
-->
<property name="jboss.dist"
+ value="/opt/jboss-5.0.0.CR1"/>
+ <!--
value="${project.root}${/}build${/}output${/}jboss-${version}"/>
+ -->
<property name="jboss.test.deploy.dir"
value="${project.root}${/}testsuite${/}output${/}lib"/>
<!-- Override for non-Sun compatible JDK layouts -->
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/AnnotatedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/AnnotatedTestCase.java 2008-07-11 10:54:31 UTC (rev 75678)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/AnnotatedTestCase.java 2008-07-11 11:00:53 UTC (rev 75679)
@@ -29,6 +29,11 @@
import org.jboss.test.JBossTestCase;
+/**
+ *
+ * @author <a href="stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision$
+ */
public class AnnotatedTestCase extends JBossTestCase
{
Added: trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAnnotatedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAnnotatedTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAnnotatedTestCase.java 2008-07-11 11:00:53 UTC (rev 75679)
@@ -0,0 +1,169 @@
+/*
+* 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.test;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ *
+ * @author <a href="stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision$
+ */
+public class ScopedAnnotatedTestCase extends JBossTestCase
+{
+
+ public ScopedAnnotatedTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testBinding() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testBinding", params, sig);
+ }
+
+ public void testCompostition() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testCompostition", params, sig);
+ }
+
+ public void testMixin() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testMixin", params, sig);
+ }
+
+ public void testIntroduction() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testIntroduction", params, sig);
+ }
+
+ public void testInterceptorDef() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testInterceptorDef", params, sig);
+ }
+
+ public void testTypedef() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testTypedef", params, sig);
+ }
+
+ public void testCFlow() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testCFlow", params, sig);
+ }
+
+ public void testPrepare() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testPrepare", params, sig);
+ }
+
+ public void testPrepareAtClassLevel() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testPrepareAtClassLevel", params, sig);
+ }
+
+ public void testDynamicCFlow() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testDynamicCFlow", params, sig);
+ }
+
+ public void testAnnotationIntroduction() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testAnnotationIntroduction", params, sig);
+ }
+ public void testPrecedence() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testPrecedence", params, sig);
+ }
+ public void testAspectFactory() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedAnnotatedTester");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testAspectFactory", params, sig);
+ }
+
+ public static Test suite() throws Exception
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new TestSuite(ScopedAnnotatedTestCase.class));
+
+ AOPTestSetup setup = new AOPTestSetup(suite, "aop-scoped-annotated.sar");
+ return setup;
+ }
+
+}
Added: trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-aop.xml (rev 0)
+++ trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-aop.xml 2008-07-11 11:00:53 UTC (rev 75679)
@@ -0,0 +1,3 @@
+<aop>
+ <loader-repository>aop.loading:loader=scopedannotated</loader-repository>
+</aop>
Added: trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-service.xml (rev 0)
+++ trunk/testsuite/src/resources/aop/jdk15annotated/scoped/META-INF/jboss-service.xml 2008-07-11 11:00:53 UTC (rev 75679)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <loader-repository>
+ aop.loading:loader=scopedannotated
+ <loader-repository-config>java2ParentDelegation=true</loader-repository-config>
+ </loader-repository>
+ <mbean code="org.jboss.test.aop.jdk15annotated.AnnotatedTester" name="jboss.aop:name=ScopedAnnotatedTester"/>
+</server>
More information about the jboss-cvs-commits
mailing list