[jboss-cvs] JBossAS SVN: r79756 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/jbmeta117/unit and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 20 12:19:16 EDT 2008
Author: ALRubinger
Date: 2008-10-20 12:19:16 -0400 (Mon, 20 Oct 2008)
New Revision: 79756
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
Log:
[JBMETA-132] Do not run Processors from JBoss50Creator, instead this is the responsibility of the caller
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2008-10-20 16:06:32 UTC (rev 79755)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2008-10-20 16:19:16 UTC (rev 79756)
@@ -108,21 +108,6 @@
// Process annotations
processMetaData(classes, metaData);
- /*
- * Run a ProcessorChain on the merged metadata
- */
-
- // Make the chain
- ProcessorChain<JBoss50MetaData> chain = new JBossMetaDataProcessorChain<JBoss50MetaData>();
-
- // Implicit local business interface (JBMETA-40, JBMETA-122, EJBTHREE-1062)
- chain.addProcessor(SetDefaultLocalBusinessInterfaceProcessor.INSTANCE);
- // Validation Processor
- chain.addProcessor(JBoss50MetaDataValidatorChainProcessor.INSTANCE);
-
- // Process the chain
- metaData = chain.process(metaData);
-
return metaData;
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java 2008-10-20 16:06:32 UTC (rev 79755)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java 2008-10-20 16:19:16 UTC (rev 79756)
@@ -32,7 +32,9 @@
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.common.spi.ErrorCodes;
-import org.jboss.test.metadata.jbmeta117.TestBeanWithLocalBindingButNoLocalBusinessInterface;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.process.processor.ejb.jboss.JBoss50MetaDataValidatorChainProcessor;
+import org.jboss.metadata.validation.ValidationException;
import org.jboss.test.metadata.jbmeta117.TestBeanWithRemoteBindingButNoRemoteBusinessInterface;
/**
@@ -60,14 +62,14 @@
//FIXME
// We need a Validator for @LocalBinding w/ no local business interfaces
-// /**
-// * Tests that an EJB declaring a @LocalBinding with no
-// * local business interface fails creation
-// */
-// public void testLocalBindingNoLocalBusinessInterface() throws Throwable
-// {
-// this.testFailsCreation(TestBeanWithLocalBindingButNoLocalBusinessInterface.class);
-// }
+ // /**
+ // * Tests that an EJB declaring a @LocalBinding with no
+ // * local business interface fails creation
+ // */
+ // public void testLocalBindingNoLocalBusinessInterface() throws Throwable
+ // {
+ // this.testFailsCreation(TestBeanWithLocalBindingButNoLocalBusinessInterface.class);
+ // }
/**
* Tests that an EJB declaring a @RemoteBinding with no
@@ -97,23 +99,26 @@
JBoss50Creator creator = new JBoss50Creator(finder);
// Make the metadata
+ JBoss50MetaData md = creator.create(classes);
+
+ // Run the Validation Processor
try
{
- creator.create(classes);
+ JBoss50MetaDataValidatorChainProcessor.INSTANCE.process(md);
}
// Expected
- catch (Throwable t)
+ catch (ValidationException ve)
{
// Get the expected error code
- String errorCode =ErrorCodes.ERROR_CODE_JBMETA117;
-
+ String errorCode = ErrorCodes.ERROR_CODE_JBMETA117;
+
// Get the error message
- String errorMessage = t.getMessage();
-
+ String errorMessage = ve.getMessage();
+
// Ensure the code is in the error message, so we've got the right exception
- TestCase.assertTrue("Creation failed as expected, but error code of " + errorCode
+ TestCase.assertTrue("Validation failed as expected, but error code of " + errorCode
+ " was not referenced. Instead error was: " + errorMessage, errorMessage.contains(errorCode));
-
+
// Return
log.info("Obtained expected message: " + errorMessage);
return;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java 2008-10-20 16:06:32 UTC (rev 79755)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java 2008-10-20 16:19:16 UTC (rev 79756)
@@ -32,8 +32,9 @@
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.common.spi.ErrorCodes;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.process.processor.ejb.jboss.SetDefaultLocalBusinessInterfaceProcessor;
import org.jboss.metadata.validation.ValidationException;
import org.jboss.metadata.validation.validator.Validator;
import org.jboss.metadata.validation.validator.ejb.jboss.CompleteEjb2xViewValidator;
@@ -156,8 +157,12 @@
// Create
JBoss50Creator creator = new JBoss50Creator(finder);
- JBossMetaData md = creator.create(classes);
+ JBoss50MetaData md = creator.create(classes);
+ // Run the implicit local processor
+ SetDefaultLocalBusinessInterfaceProcessor processor = new SetDefaultLocalBusinessInterfaceProcessor();
+ md = processor.process(md);
+
// Get the Metadata
smd = (JBossSessionBeanMetaData) md.getEnterpriseBean(TestBean.class.getSimpleName());
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2008-10-20 16:06:32 UTC (rev 79755)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2008-10-20 16:19:16 UTC (rev 79756)
@@ -31,6 +31,7 @@
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.process.processor.ejb.jboss.SetDefaultLocalBusinessInterfaceProcessor;
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
import org.jboss.test.metadata.jbmeta40.ExpectedLocalInterface;
@@ -62,6 +63,10 @@
JBoss50Creator creator = new JBoss50Creator(finder);
jbossMetaData = creator.create(classes);
+
+ // Run the implicit local processor
+ SetDefaultLocalBusinessInterfaceProcessor processor = new SetDefaultLocalBusinessInterfaceProcessor();
+ jbossMetaData = processor.process(jbossMetaData);
assertTrue(jbossMetaData.isEJB3x());
assertEquals("3.0", jbossMetaData.getVersion());
More information about the jboss-cvs-commits
mailing list