Просмотр исходного кода

Enabled CargoAdminControllerTest by updating the servlet-api version.

marlin 11 лет назад
Родитель
Сommit
462bf5b2af

+ 7
- 7
pom.xml Просмотреть файл

@@ -223,13 +223,13 @@
223 223
       <artifactId>hsqldb</artifactId>
224 224
       <version>1.8.0.7</version>
225 225
     </dependency>
226
-    <dependency>
227
-      <groupId>javax.servlet</groupId>
228
-      <artifactId>servlet-api</artifactId>
229
-      <version>2.5</version>
230
-      <scope>provided</scope>
231
-    </dependency>
232
-    <dependency>
226
+      <dependency>
227
+          <groupId>javax.servlet</groupId>
228
+          <artifactId>javax.servlet-api</artifactId>
229
+          <version>3.1.0</version>
230
+          <scope>provided</scope>
231
+      </dependency>
232
+      <dependency>
233 233
       <groupId>taglibs</groupId>
234 234
       <artifactId>standard</artifactId>
235 235
       <version>1.1.2</version>

+ 12
- 20
src/test/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminControllerTest.java Просмотреть файл

@@ -1,30 +1,22 @@
1 1
 package se.citerus.dddsample.interfaces.booking.web;
2 2
 
3
-import junit.framework.TestCase;
4 3
 import org.easymock.EasyMock;
4
+import org.junit.Test;
5 5
 import org.springframework.mock.web.MockHttpServletRequest;
6 6
 import org.springframework.mock.web.MockHttpServletResponse;
7 7
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
8 8
 
9
-/*public class CargoAdminControllerTest extends TestCase {
9
+public class CargoAdminControllerTest {
10 10
 
11
-  CargoAdminController controller;
12
-  BookingServiceFacade bookingServiceFacade;
13
-  MockHttpServletRequest request;
14
-  MockHttpServletResponse response;
11
+    @Test
12
+    public void testAssignItinerary() throws Exception {
13
+        CargoAdminController cargoAdminController = new CargoAdminController();
14
+        BookingServiceFacade bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
15
+        cargoAdminController.setBookingServiceFacade(bookingServiceFacade);
15 16
 
16
-  public CargoAdminControllerTest() {
17
-    controller = new CargoAdminController();
18
-    bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
19
-    controller.setBookingServiceFacade(bookingServiceFacade);
20
-  }
17
+        MockHttpServletRequest request = new MockHttpServletRequest("GET", "assignItinerary.html");
18
+        MockHttpServletResponse response = new MockHttpServletResponse();
21 19
 
22
-  public void testAssignItinerary() throws Exception {
23
-    request = new MockHttpServletRequest("GET","assignItinerary.html");
24
-    response = new MockHttpServletResponse();
25
-
26
-    controller.handleRequest(request, response);
27
-  }
28
-
29
-}
30
-*/
20
+        cargoAdminController.handleRequest(request, response);
21
+    }
22
+}