Merge branch 'master' of github.com:ops4j/org.ops4j.pax.exam2

carrot-garden · Aug 22, 2012 · 2b65b62 · 2b65b62
2 parents 106a784 + 1fad1a0
commit 2b65b62
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/core/pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/intern/TestProbeBuilderImpl.java b/core/pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/intern/TestProbeBuilderImpl.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -55,7 +56,7 @@ public class TestProbeBuilderImpl implements TestProbeBuilder {
     private static Logger LOG = LoggerFactory.getLogger( TestProbeBuilderImpl.class );
     private static final String DEFAULT_PROBE_METHOD_NAME = "probe";
 
-    private final Map<TestAddress, TestInstantiationInstruction> m_probeCalls = new HashMap<TestAddress, TestInstantiationInstruction>();
+    private final Map<TestAddress, TestInstantiationInstruction> m_probeCalls = new LinkedHashMap<TestAddress, TestInstantiationInstruction>();
     private final List<Class> m_anchors;
     private final Properties m_extraProperties;
     private final Set<String> m_ignorePackages = new HashSet<String>();

diff --git a/.../pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/reactors/AllConfinedStagedReactor.java b/.../pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/reactors/AllConfinedStagedReactor.java
@@ -15,7 +15,7 @@
  */
 package org.ops4j.pax.exam.spi.reactors;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
 import org.ops4j.pax.exam.TestAddress;
@@ -31,7 +31,7 @@ public class AllConfinedStagedReactor implements StagedExamReactor
 {
 
     final private List<TestProbeProvider> m_probes;
-    final private HashMap<TestAddress, TestContainer> m_map;
+    final private LinkedHashMap<TestAddress, TestContainer> m_map;
 
     /**
      * @param containers to be used
@@ -40,7 +40,7 @@ public class AllConfinedStagedReactor implements StagedExamReactor
     public AllConfinedStagedReactor( List<TestContainer> containers, List<TestProbeProvider> mProbes )
     {
         m_probes = mProbes;
-        m_map = new HashMap<TestAddress, TestContainer>();
+        m_map = new LinkedHashMap<TestAddress, TestContainer>();
         // todo: don't do this here.
         for ( TestContainer container : containers )
         {

diff --git a/.../pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/reactors/EagerSingleStagedReactor.java b/.../pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/reactors/EagerSingleStagedReactor.java
@@ -18,7 +18,7 @@
 package org.ops4j.pax.exam.spi.reactors;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
 import org.slf4j.Logger;
@@ -40,15 +40,15 @@ public class EagerSingleStagedReactor implements StagedExamReactor {
     private static Logger LOG = LoggerFactory.getLogger( EagerSingleStagedReactor.class );
 
     final private List<TestContainer> m_targetContainer;
-    final private HashMap<TestAddress, TestContainer> m_map;
+    final private LinkedHashMap<TestAddress, TestContainer> m_map;
 
     /**
      * @param containers to be used
      * @param mProbes    to be installed on all probes
      */
     public EagerSingleStagedReactor( List<TestContainer> containers, List<TestProbeProvider> mProbes )
     {
-        m_map = new HashMap<TestAddress, TestContainer>();
+        m_map = new LinkedHashMap<TestAddress, TestContainer>();
         m_targetContainer = containers;
 
         for( TestContainer container : containers ) {

diff --git a/drivers/pax-exam-junit4/src/main/java/org/ops4j/pax/exam/junit/ExamFactory.java b/drivers/pax-exam-junit4/src/main/java/org/ops4j/pax/exam/junit/ExamFactory.java
@@ -18,6 +18,7 @@
 package org.ops4j.pax.exam.junit;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -28,6 +29,7 @@
  */
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { ElementType.TYPE } )
+@Inherited
 public @interface ExamFactory
 {
     Class<? extends TestContainerFactory> value();

diff --git a/drivers/pax-exam-junit4/src/main/java/org/ops4j/pax/exam/junit/ExamReactorStrategy.java b/drivers/pax-exam-junit4/src/main/java/org/ops4j/pax/exam/junit/ExamReactorStrategy.java
@@ -16,6 +16,7 @@
 package org.ops4j.pax.exam.junit;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -27,6 +28,7 @@
  */
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { ElementType.TYPE } )
+@Inherited
 public @interface ExamReactorStrategy
 {
 

diff --git a/drivers/pax-exam-junit4/src/main/java/org/ops4j/pax/exam/junit/JUnit4TestRunner.java b/drivers/pax-exam-junit4/src/main/java/org/ops4j/pax/exam/junit/JUnit4TestRunner.java
@@ -25,6 +25,7 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -73,8 +74,8 @@ public class JUnit4TestRunner extends BlockJUnit4ClassRunner {
     private static Logger LOG = LoggerFactory.getLogger( JUnit4TestRunner.class );
 
     final private StagedExamReactor m_reactor;
-    final private Map<TestAddress, FrameworkMethod> m_map = new HashMap<TestAddress, FrameworkMethod>();
-    final private Map<FrameworkMethod, TestAddress> m__childs = new HashMap<FrameworkMethod, TestAddress>();
+    final private Map<TestAddress, FrameworkMethod> m_map = new LinkedHashMap<TestAddress, FrameworkMethod>();
+    final private Map<FrameworkMethod, TestAddress> m__childs = new LinkedHashMap<FrameworkMethod, TestAddress>();
 
 	private ExamSystem m_system;