Thomas Flucke пре 9 година
родитељ
комит
3d5aca03f8
1 измењених фајлова са 17 додато и 16 уклоњено
  1. 17 16
      server/test/test/EventTester.java

+ 17 - 16
server/test/test/EventTester.java

@@ -10,6 +10,17 @@ import models.Event;
 import play.libs.Json;
 
 public class EventTester {
+	
+	public Event makeEvent(String name, String desc, double lat, double lng)
+	{
+	    Event e = new Event();
+	    e.setName(name);
+	    e.setLat(lat);
+	    e.setLng(lng);
+	    e.setDescription(desc);
+	    return e;
+	}
+	
 	@Test
 	public void testEventSerialization()
 	{
@@ -17,12 +28,7 @@ public class EventTester {
 	    String desc = "Board games and free pizza";
 	    float lat = 7f;
 	    float lng = 0.3f;
-	    Event e = new Event();
-	    e.setName(name);
-	    e.setLat(7);
-	    e.setLng(.3);
-	    e.setDescription(desc);
-	    JsonNode jn = Json.toJson(e);
+	    JsonNode jn = Json.toJson(makeEvent(name, desc, lat, lng));
 	    assertEquals(lat, jn.get("lat").floatValue(), 0.00001);
 	    assertEquals(lng, jn.get("lng").floatValue(), 0.00001);
 	    assertEquals(name, jn.get("name").textValue());
@@ -32,16 +38,11 @@ public class EventTester {
 	@Test
 	public void testEventDeserialization()
 	{
-	    String name = "Free Pizza Knight";
-	    String desc = "Board games and free pizza";
-	    float lat = 7f;
-	    float lng = 0.3f;
-	    Event e = new Event();
-	    e.setName(name);
-	    e.setLat(7);
-	    e.setLng(.3);
-	    e.setDescription(desc);
-	    JsonNode jn = Json.toJson(e);
+	    String name = "Other Food Event";
+	    String desc = "Come get free food!";
+	    float lat = 73f;
+	    float lng = -120.3f;
+	    JsonNode jn = Json.toJson(makeEvent(name, desc, lat, lng));
 	    Event e2 = Json.fromJson(jn, Event.class);
 	    assertEquals(lat, e2.getLat(), 0.00001);
 	    assertEquals(lng, e2.getLng(), 0.00001);