From 9c8eba1da3ee4499d5fb2edc0c732ffa34298d36 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <trippie@gmail.com>
Date: Fri, 7 Dec 2012 17:34:14 +0100
Subject: [PATCH] Fix the tests

Note to self, surefire actually runs with assertions enabled where junit
inside eclipse doesn't. Sure surefire will mark tests as failed when an
assertion is triggered. Take care when mocking stuff.
---
 .../test/com/cloud/network/nicira/NiciraNvpApiTest.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
index 51d961864a0..42eb96e42d8 100644
--- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
+++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
@@ -161,6 +161,7 @@ public class NiciraNvpApiTest {
 		when(header.getValue()).thenReturn("text/html");
 		when(_method.getResponseHeader("Content-Type")).thenReturn(header);
 		when(_method.getResponseBodyAsString()).thenReturn("Off to timbuktu, won't be back later.");
+		when(_method.isRequestSent()).thenReturn(true);
 		try {
 			ls = _api.executeCreateObject(ls, LogicalSwitch.class, "/", Collections.<String, String> emptyMap());
 		} finally {
@@ -204,6 +205,7 @@ public class NiciraNvpApiTest {
 		when(header.getValue()).thenReturn("text/html");
 		when(_method.getResponseHeader("Content-Type")).thenReturn(header);
 		when(_method.getResponseBodyAsString()).thenReturn("Off to timbuktu, won't be back later.");
+		when(_method.isRequestSent()).thenReturn(true);
 		try {
 			_api.executeUpdateObject(ls, "/", Collections.<String, String> emptyMap());
 		} finally {
@@ -241,6 +243,7 @@ public class NiciraNvpApiTest {
 		when(header.getValue()).thenReturn("text/html");
 		when(_method.getResponseHeader("Content-Type")).thenReturn(header);
 		when(_method.getResponseBodyAsString()).thenReturn("Off to timbuktu, won't be back later.");
+		when(_method.isRequestSent()).thenReturn(true);
 		try {
 			_api.executeDeleteObject("/");
 		} finally {
@@ -279,6 +282,7 @@ public class NiciraNvpApiTest {
 		when(header.getValue()).thenReturn("text/html");
 		when(_method.getResponseHeader("Content-Type")).thenReturn(header);
 		when(_method.getResponseBodyAsString()).thenReturn("Off to timbuktu, won't be back later.");
+		when(_method.isRequestSent()).thenReturn(true);
 		try {
 			_api.executeRetrieveObject(LogicalSwitch.class, "/", Collections.<String, String> emptyMap());
 		} finally {