CLOUDSTACK-9456: Fix failing tests due to spring upgrade

* Fix test DeploymentPlanningManagerImplTest * Fix GloboDNS test
apache · Aug 17, 2016 · b3adbd1 · b3adbd1
1 parent 186fbf7
commit b3adbd1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
@@ -34,26 +34,4 @@
       <version>0.0.20</version>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-testCompile</id>
-            <phase>test-compile</phase>
-            <configuration>
-              <testExcludes>
-                <exclude>com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java</exclude>
-              </testExcludes>
-            </configuration>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/...k-elements/globodns/test/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java b/...k-elements/globodns/test/com/globo/globodns/cloudstack/resource/GloboDnsResourceTest.java
@@ -37,13 +37,9 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.cloud.agent.api.Answer;
 import com.globo.globodns.client.GloboDns;
@@ -57,8 +53,6 @@
 import com.globo.globodns.cloudstack.commands.RemoveDomainCommand;
 import com.globo.globodns.cloudstack.commands.RemoveRecordCommand;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
 @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 public class GloboDnsResourceTest {
 
@@ -75,7 +69,6 @@ public class GloboDnsResourceTest {
 
     @Before
     public void setUp() throws Exception {
-        // ComponentContext.initComponentsLifeCycle();
 
         String name = "GloboDNS";
         Map<String, Object> params = new HashMap<String, Object>();

diff --git a/server/pom.xml b/server/pom.xml
@@ -197,7 +197,6 @@
             <exclude>com/cloud/vpc/VpcTestConfiguration.java</exclude>
             <exclude>com/cloud/vpc/VpcApiUnitTest.java</exclude>
             <exclude>com/cloud/vpc/VpcManagerTest.java</exclude>
-            <exclude>com/cloud/vm/DeploymentPlanningManagerImplTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>

diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
@@ -31,7 +31,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
@@ -121,7 +123,7 @@ public class DeploymentPlanningManagerImplTest {
     @Inject
     DataCenterDao _dcDao;
 
-    @Inject
+    @Mock
     FirstFitPlanner _planner;
 
     @Inject
@@ -140,6 +142,8 @@ public static void setUp() throws ConfigurationException {
 
     @Before
     public void testSetUp() {
+        MockitoAnnotations.initMocks(this);
+
         ComponentContext.initComponentsLifeCycle();
 
         PlannerHostReservationVO reservationVO = new PlannerHostReservationVO(200L, 1L, 2L, 3L, PlannerResourceUsage.Shared);