diff --git a/src/main/Main.java b/src/main/Main.java index 1ebcd11..cfe80ec 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -3,7 +3,7 @@ import testcase.*; public class Main { - static final String token = "ya29.GltxBrlNG1CnuccnM6c8-uSBKv9gvVsDjq4jbaNduxRaN9ei8CXYGTzEoVNV-gnAKqiLpL9WxJIZ_Jy6KT7oQKLbHbBiRzaXdHXBrZEm-xWX_EAM_-G2-NIlDz3G"; + static final String token = "ya29.GltyBjRFhtNUq8yk7VF_7IMz2RUmzyW3opMZi4h7oncteCGn4CXSCtnUqZu5wG8jXaV2g9WBmDmtj-3ORqAr-cclO_k4-QMpAfs5NCN9cC_tBJDHsN-uQDKN9WxX"; @SuppressWarnings("unused") public static void main(String[] args) { diff --git a/src/testcase/TestCactus.java b/src/testcase/TestCactus.java index ab2e76d..8722b31 100644 --- a/src/testcase/TestCactus.java +++ b/src/testcase/TestCactus.java @@ -1,21 +1,9 @@ package testcase; -import java.util.ArrayList; - -import restfulchecker.RestChecker; -import restfulchecker.RestParam; - -abstract public class TestCactus { - protected RestChecker check = new RestChecker(); - protected ArrayList query = new ArrayList<>(); - protected ArrayList form = new ArrayList<>(); - protected ArrayList path = new ArrayList<>(); +abstract public class TestCactus extends TestCase { protected TestCactus() { - check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); } - public void start() { - check.doRestTest(); - } } diff --git a/src/testcase/TestCase.java b/src/testcase/TestCase.java new file mode 100644 index 0000000..ed1e64d --- /dev/null +++ b/src/testcase/TestCase.java @@ -0,0 +1,21 @@ +package testcase; + +import java.util.ArrayList; + +import restfulchecker.RestChecker; +import restfulchecker.RestParam; + +public abstract class TestCase { + protected RestChecker check = new RestChecker(); + protected ArrayList query = new ArrayList<>(); + protected ArrayList form = new ArrayList<>(); + protected ArrayList path = new ArrayList<>(); + + protected TestCase(String url) { + check.setAccount(url); + } + + public void start() { + check.doRestTest(); + } +} diff --git a/src/testcase/TestYouTube.java b/src/testcase/TestYouTube.java index a13fe20..8dbb01b 100644 --- a/src/testcase/TestYouTube.java +++ b/src/testcase/TestYouTube.java @@ -1,23 +1,13 @@ package testcase; -import java.util.ArrayList; - -import restfulchecker.RestChecker; import restfulchecker.RestParam; -abstract public class TestYouTube { - protected RestChecker check = new RestChecker(); - protected ArrayList query = new ArrayList<>(); - protected ArrayList form = new ArrayList<>(); - protected ArrayList path = new ArrayList<>(); +abstract public class TestYouTube extends TestCase { protected TestYouTube(String token) { - check.setAccount("https://www.googleapis.com/youtube/v3"); + super("https://www.googleapis.com/youtube/v3"); query.add(new RestParam("access_token", token)); check.getResourceParam().setQueryParams(new RestParam("access_token", token)); } - public void start() { - check.doRestTest(); - } }