Merge remote-tracking branch 'origin/master'

Proyecto/app/controllers/DatoController.java

@@ -5,6 +5,7 @@
 import models.Dato;
 import play.libs.Json;
 import play.mvc.BodyParser;
+import play.mvc.Call;
 import play.mvc.Controller;
 import play.mvc.Result;
 

Proyecto/test/Application.java

@@ -1,13 +0,0 @@
-import play.mvc.Controller;
-import play.mvc.Result;
-import views.html.index;
-
-public class Application extends Controller
-{
-
-    public Result index( )
-    {
-        return ok( index.render( "Your new application is ready." ) );
-    }
-
-}

Proyecto/test/ApplicationTest.java

@@ -1,41 +0,0 @@
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.*;
-
-import play.mvc.*;
-import play.test.*;
-import play.i18n.Lang;
-import play.libs.F;
-import play.libs.F.*;
-import play.twirl.api.Content;
-
-import static play.test.Helpers.*;
-import static org.junit.Assert.*;
-
-/**
- *
- * Simple (JUnit) tests that can call all parts of a play app.
- * If you are interested in mocking a whole application, see the wiki for more details.
- *
- */
-public class ApplicationTest {
-
-    @Test
-    public void simpleCheck() {
-        int a = 1 + 1;
-        assertEquals(2, a);
-    }
-
-    @Test
-    public void renderTemplate() {
-        Content html = views.html.index.render("Your new application is ready.");
-        assertEquals("text/html", contentType(html));
-        assertTrue(contentAsString(html).contains("Your new application is ready."));
-    }
-
-
-}

Proyecto/test/controllers/DatoControllerTest.java

@@ -4,16 +4,19 @@
 import models.Dato;
 import org.junit.Before;
 import org.junit.Test;
+import play.Application;
 import play.core.j.JavaResultExtractor;
 import play.libs.Json;
+import play.mvc.Call;
 import play.mvc.Http;
 import play.mvc.Result;
-
+import play.test.Helpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static play.test.Helpers.status;
 
 public class DatoControllerTest {
 
@@ -52,8 +55,26 @@ public void testRetrieve() {
         dato.setValor(20f);
         dato.setIdSensor(30L);
 
-        controller.create(dato.getIdSensor());
-        Result result = controller.retrieve(dato.getId());
+        Call call = new Call() {
+            @Override
+            public String url() {
+                return "/con";
+            }
+
+            @Override
+            public String method() {
+                return "GET";
+            }
+
+            @Override
+            public String fragment() {
+                return null;
+            }
+        };
+        Result result = Helpers.route(Helpers.fakeRequest(call));
+
+        //controller.create(dato.getIdSensor());
+        //Result result = controller.retrieve(dato.getId());
 
         assertEquals("El dato no fue creado correctamente.", Http.Status.OK, result.status());
         assertEquals("El resultado no es del tipo esperado", "application/json", result.contentType());