[jboss-cvs] JBossAS SVN: r105921 - in projects/ejb3/trunk/deployers/src: test/java/org/jboss/ejb3/deployers/test and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2010-06-10 05:06:30 -0400 (Thu, 10 Jun 2010)
New Revision: 105921

Added:
   projects/ejb3/trunk/deployers/src/test/java/org/jboss/ejb3/deployers/test/ejbthree2111/
   projects/ejb3/trunk/deployers/src/test/java/org/jboss/ejb3/deployers/test/ejbthree2111/ProcessorOrderingTestCase.java
Modified:
   projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java
Log:
EJBTHREE-2111: keep processorFactories ordered

Modified: projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java
===================================================================
--- projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java	2010-06-10 08:58:08 UTC (rev 105920)
+++ projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java	2010-06-10 09:06:30 UTC (rev 105921)
@@ -21,9 +21,6 @@
  */
 package org.jboss.ejb3.deployers;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
@@ -37,6 +34,9 @@
 import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
 import org.jboss.metadata.validation.chain.ValidatorChain;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Ejb3MetadataProcessingDeployer
  *
@@ -73,7 +73,7 @@
     *  to create processors {@link JBossMetaDataProcessor} to process the merged {@link JBossMetaData}
     *  
     */
-   private Set<JBossMetaDataProcessorFactory<JBossMetaData>> processorFactories = new HashSet<JBossMetaDataProcessorFactory<JBossMetaData>>();
+   private List<JBossMetaDataProcessorFactory<JBossMetaData>> processorFactories = new ArrayList<JBossMetaDataProcessorFactory<JBossMetaData>>();
    
    /**
     * A metadata validator chain which will be used to validate the merged metadata,

Added: projects/ejb3/trunk/deployers/src/test/java/org/jboss/ejb3/deployers/test/ejbthree2111/ProcessorOrderingTestCase.java
===================================================================
--- projects/ejb3/trunk/deployers/src/test/java/org/jboss/ejb3/deployers/test/ejbthree2111/ProcessorOrderingTestCase.java	                        (rev 0)
+++ projects/ejb3/trunk/deployers/src/test/java/org/jboss/ejb3/deployers/test/ejbthree2111/ProcessorOrderingTestCase.java	2010-06-10 09:06:30 UTC (rev 105921)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2010, 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.ejb3.deployers.test.ejbthree2111;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
+import org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer;
+import org.jboss.ejb3.deployers.metadata.processor.JBossMetaDataProcessorFactory;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
+import org.junit.Test;
+import org.mockito.InOrder;
+
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public class ProcessorOrderingTestCase
+{
+   @Test
+   public void testOrder() throws Exception
+   {
+      Ejb3MetadataProcessingDeployer deployer = new Ejb3MetadataProcessingDeployer();
+
+      DeploymentUnit du = mock(DeploymentUnit.class);
+      JBossMetaData metaData = new JBossMetaData();
+      metaData.setEjbVersion("3.0");
+      when(du.getAttachment(AttachmentNames.MERGED_METADATA, JBossMetaData.class)).thenReturn(metaData);
+
+      JBossMetaDataProcessorFactory<JBossMetaData> processorFactory1 = mock(JBossMetaDataProcessorFactory.class);
+      JBossMetaDataProcessor<JBossMetaData> processor1 = mock(JBossMetaDataProcessor.class);
+      when(processorFactory1.create(eq(du))).thenReturn(processor1);
+      when(processor1.process(eq(metaData))).thenReturn(metaData);
+
+      JBossMetaDataProcessorFactory<JBossMetaData> processorFactory2 = mock(JBossMetaDataProcessorFactory.class);
+      JBossMetaDataProcessor<JBossMetaData> processor2 = mock(JBossMetaDataProcessor.class);
+      when(processorFactory2.create(eq(du))).thenReturn(processor2);
+      when(processor2.process(eq(metaData))).thenReturn(metaData);
+
+      deployer.addProcessorFactory(processorFactory1);
+      deployer.addProcessorFactory(processorFactory2);
+
+      deployer.deploy(du);
+
+      InOrder inOrder = inOrder(processor1, processor2);
+      
+      inOrder.verify(processor1).process(eq(metaData));
+      inOrder.verify(processor2).process(eq(metaData));
+   }
+}