[liferay-labs#7] Fix tests

cgoncas · Oct 24, 2016 · ca8779f · ca8779f
1 parent f8783e5
commit ca8779f
Showing 1 changed file with 14 additions and 28 deletions.
diff --git a/...va/org/arquillian/container/osgi/remote/deploy/processor/test/OSGiAllInProcessorTest.java b/...va/org/arquillian/container/osgi/remote/deploy/processor/test/OSGiAllInProcessorTest.java
@@ -576,26 +576,6 @@ private OSGiAllInProcessor getProcessor(ServiceLoader serviceLoader)
 			iae.printStackTrace();
 		}
 
-		Field importPackageManagerInstance =
-			OSGiAllInProcessor.class.getDeclaredField(
-				"_importPackageManagerInstance");
-
-		importPackageManagerInstance.setAccessible(true);
-
-		DummyInstanceProducerImpl importPackageManagerDummyInstance =
-			new DummyInstanceProducerImpl();
-
-		importPackageManagerDummyInstance.set(new ImportPackageManagerImpl());
-
-		try {
-			importPackageManagerInstance.set(
-				addAllExtensionsToApplicationArchiveProcessor,
-				importPackageManagerDummyInstance);
-		}
-		catch (IllegalAccessException iae) {
-			iae.printStackTrace();
-		}
-
 		Field manifestManagerInstance =
 			OSGiAllInProcessor.class.getDeclaredField(
 				"_manifestManagerInstance");
@@ -605,7 +585,9 @@ private OSGiAllInProcessor getProcessor(ServiceLoader serviceLoader)
 		DummyInstanceProducerImpl manifestManagerDummyInstance =
 			new DummyInstanceProducerImpl();
 
-		manifestManagerDummyInstance.set(new ManifestManagerImpl());
+		ManifestManagerImpl manifestManager = new ManifestManagerImpl();
+
+		manifestManagerDummyInstance.set(manifestManager);
 
 		try {
 			manifestManagerInstance.set(
@@ -616,16 +598,20 @@ private OSGiAllInProcessor getProcessor(ServiceLoader serviceLoader)
 			iae.printStackTrace();
 		}
 
-		Field manifestManagerInstanceinImportPackageManager =
-			ImportPackageManagerImpl.class.getDeclaredField(
-				"_manifestManagerInstance");
+		Field importPackageManagerInstance =
+			ManifestManagerImpl.class.getDeclaredField(
+				"_importPackageManagerInstance");
 
-		manifestManagerInstanceinImportPackageManager.setAccessible(true);
+		importPackageManagerInstance.setAccessible(true);
+
+		DummyInstanceProducerImpl importPackageManagerDummyInstance =
+			new DummyInstanceProducerImpl();
+
+		importPackageManagerDummyInstance.set(new ImportPackageManagerImpl());
 
 		try {
-			manifestManagerInstanceinImportPackageManager.set(
-				importPackageManagerDummyInstance.get(),
-				manifestManagerDummyInstance);
+			importPackageManagerInstance.set(
+				manifestManager, importPackageManagerDummyInstance);
 		}
 		catch (IllegalAccessException iae) {
 			iae.printStackTrace();