Fixed FilexWagon instantiation strategy

FilexWagon was marked as singleton and was retaining state from one
test invocation to the next, which resulted in unexpected/unwanted
crosstalk among tests. Changed FilexWagon instantiation policy to
per-lookup and cleanup any static state as part of test setUp.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java
index dd92108e..d7d66e49 100644
--- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java
+++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java
@@ -139,6 +139,8 @@ public abstract class AbstractMavenProjectTestCase extends TestCase {
     LifecycleMappingFactory.setDefaultLifecycleMappingMetadataSource(null);
 
     WorkspaceHelpers.cleanWorkspace();
+    FilexWagon.setRequestFailPattern(null);
+    FilexWagon.setRequestFilterPattern(null, true);
   }
 
   protected void tearDown() throws Exception {
@@ -470,7 +472,7 @@ public abstract class AbstractMavenProjectTestCase extends TestCase {
       descriptor.setRoleClass(Wagon.class);
       descriptor.setImplementationClass(FilexWagon.class);
       descriptor.setRoleHint("filex");
-      descriptor.setInstantiationStrategy("singleton");
+      descriptor.setInstantiationStrategy("per-lookup");
       container.addComponentDescriptor(descriptor);
     }
   }