diff --git a/src/zutil/net/ws/rest/RestHttpPage.java b/src/zutil/net/ws/rest/RESTHttpPage.java similarity index 97% rename from src/zutil/net/ws/rest/RestHttpPage.java rename to src/zutil/net/ws/rest/RESTHttpPage.java index 3962c9c..763f48f 100755 --- a/src/zutil/net/ws/rest/RestHttpPage.java +++ b/src/zutil/net/ws/rest/RESTHttpPage.java @@ -41,7 +41,7 @@ import java.util.Map; /** * User: Ziver */ -public class RestHttpPage implements HttpPage { +public class RESTHttpPage implements HttpPage { /** The object that the functions will be invoked from **/ private WebServiceDef wsDef; @@ -49,7 +49,7 @@ public class RestHttpPage implements HttpPage { private WSInterface ws; - public RestHttpPage( WSInterface wsObject ){ + public RESTHttpPage(WSInterface wsObject ){ this.ws = wsObject; this.wsDef = new WebServiceDef(ws.getClass()); } diff --git a/test/zutil/net/ws/rest/RESTHttpPageTest.java b/test/zutil/net/ws/rest/RESTHttpPageTest.java new file mode 100755 index 0000000..029b37b --- /dev/null +++ b/test/zutil/net/ws/rest/RESTHttpPageTest.java @@ -0,0 +1,49 @@ +package zutil.net.ws.rest; + +import org.junit.Test; +import zutil.net.ws.WSInterface; + +import java.util.HashMap; + +import static org.junit.Assert.assertEquals; + +/** + * Created by Ziver on 2016-09-27. + */ +public class RESTHttpPageTest { + + public static class TestClass implements WSInterface{ + public String hello(){ + return "hello world"; + } + } + + @Test + public void noInput() throws Throwable { + RESTHttpPage rest = new RESTHttpPage(new TestClass()); + + HashMap input = new HashMap<>(); + String output = rest.execute("hello", input); + assertEquals("\"hello world\"", output); + } + + + + + public static class TestEchoClass implements WSInterface{ + public String echo(@WSParamName("input") String input){ + return "echo: "+input; + } + } + + @Test + public void oneInput() throws Throwable { + RESTHttpPage rest = new RESTHttpPage(new TestEchoClass()); + + HashMap input = new HashMap<>(); + input.put("input", "test input"); + String output = rest.execute("echo", input); + assertEquals("\"echo: test input\"", output); + } + +} \ No newline at end of file