Skip to content

Commit ef8c4ec

Browse files
author
Damian Staszewski
committed
Test session is now done #3
1 parent 2496dec commit ef8c4ec

File tree

2 files changed

+178
-40
lines changed

2 files changed

+178
-40
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-surefire-plugin</artifactId>
55-
<version>2.20</version>
55+
<version>2.19.1</version>
5656
<dependencies>
5757
<dependency>
5858
<groupId>org.junit.platform</groupId>
5959
<artifactId>junit-platform-surefire-provider</artifactId>
60-
<version>1.0.0-M5</version>
60+
<version>1.0.0-M4</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.junit.jupiter</groupId>
6464
<artifactId>junit-jupiter-engine</artifactId>
65-
<version>5.0.0-M5</version>
65+
<version>5.0.0-M4</version>
6666
</dependency>
6767
</dependencies>
6868
</plugin>
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>org.junit.jupiter</groupId>
8585
<artifactId>junit-jupiter-api</artifactId>
86-
<version>5.0.0-M5</version>
86+
<version>5.0.0-M4</version>
8787
</dependency>
8888
</dependencies>
8989
</project>
Lines changed: 174 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,203 @@
11
package pl.stachu540;
22

33
import org.junit.jupiter.api.*;
4-
import pl.stachu540.hirezstudios.HiRezGames;
54
import pl.stachu540.hirezstudios.Paladins;
65
import pl.stachu540.hirezstudios.Smite;
6+
import pl.stachu540.util.StringData;
77

8-
import java.util.Arrays;
9-
import java.util.HashMap;
10-
8+
@DisplayName("Testing API")
119
class HiRezAPITest {
1210

13-
static HiRezAPI api;
14-
static HashMap<String, HiRezGames> games = new HashMap<String, HiRezGames>();
11+
static class HiRezTest extends HiRezAPI{
12+
13+
HiRezTest(String devId, String authKey) {
14+
super(devId, authKey);
15+
}
16+
17+
StringData ping(Smite.Platform platform) {
18+
return new StringData(smite(platform).ping());
19+
}
20+
21+
StringData test(Smite.Platform platform) {
22+
return new StringData(smite(platform).testSession());
23+
}
24+
25+
StringData patch(Smite.Platform platform) {
26+
return smite(platform).getPatchInfo();
27+
}
28+
29+
StringData ping(Paladins.Platform platform) {
30+
return new StringData(paladins(platform).ping());
31+
}
32+
33+
StringData test(Paladins.Platform platform) {
34+
return new StringData(paladins(platform).testSession());
35+
}
36+
37+
StringData patch(Paladins.Platform platform) {
38+
return paladins(platform).getPatchInfo();
39+
}
40+
}
41+
42+
static HiRezTest apitest;
1543

1644
@BeforeAll
17-
static void prepare(){
45+
static void setUp() {
1846
String dev_id = System.getenv("DEV_ID");
1947
String auth_key = System.getenv("AUTH_KEY");
20-
if (!dev_id.isEmpty() || !auth_key.isEmpty()) api = new HiRezAPI(dev_id, auth_key);
21-
else if (dev_id.isEmpty()) throw new Error("Developer ID is empty.");
48+
if (dev_id.isEmpty()) throw new Error("Developer ID is empty.");
2249
else if (auth_key.isEmpty()) throw new Error("Authorization Key empty.");
23-
Arrays.asList(Smite.Platform.values()).forEach(platform -> games.put("SMITE_" + platform.name(), api.smite(platform)));
24-
Arrays.asList(Paladins.Platform.values()).forEach(platform -> games.put("PALADINS_" + platform.name(), api.paladins(platform)));
50+
apitest = new HiRezTest(dev_id, auth_key);
2551
}
2652

27-
@BeforeEach
28-
void setUp() {
53+
@Test
54+
@DisplayName("Smite PC")
55+
void smitePc() {
56+
Assertions.assertAll(
57+
() -> {
58+
String data = apitest.ping(Smite.Platform.PC).toString();
59+
Assertions.assertTrue(data.contains("Ping successful."), "Ping API");
60+
System.out.println(data);
61+
},
62+
() -> {
63+
String data = apitest.test(Smite.Platform.PC).toString();
64+
Assertions.assertTrue(
65+
data.contains("This was a successful test with the following parameters added:"),
66+
"Session Test");
67+
System.out.println(data);
68+
},
69+
() -> {
70+
StringData data = apitest.patch(Smite.Platform.PC);
71+
Assertions.assertTrue(
72+
data.toJsonObject().get("ret_msg").equals(null) && !data.toJsonObject().getString("version_string").isEmpty(),
73+
"Patch Notes Test");
74+
System.out.println(data.toJsonObject().toString());
75+
});
2976
}
30-
31-
3277
@Test
33-
@DisplayName("Ping Test")
34-
void pingTesting() {
35-
games.forEach((s, api_data) -> {
36-
System.out.println(api_data.ping());
37-
});
78+
@DisplayName("Smite XBOX")
79+
void smiteXbox() {
80+
Assertions.assertAll(
81+
() -> {
82+
String data = apitest.ping(Smite.Platform.XBOX).toString();
83+
Assertions.assertTrue(data.contains("Ping successful."), "Ping API");
84+
System.out.println(data);
85+
},
86+
() -> {
87+
String data = apitest.test(Smite.Platform.XBOX).toString();
88+
Assertions.assertTrue(
89+
data.contains("This was a successful test with the following parameters added:"),
90+
"Session Test");
91+
System.out.println(data);
92+
},
93+
() -> {
94+
StringData data = apitest.patch(Smite.Platform.XBOX);
95+
Assertions.assertTrue(
96+
data.toJsonObject().get("ret_msg").equals(null) && !data.toJsonObject().getString("version_string").isEmpty(),
97+
"Patch Notes Test");
98+
System.out.println(data.toJsonObject().toString());
99+
});
38100
}
39-
40101
@Test
41-
@DisplayName("Session Test")
42-
void sessionTesting() {
43-
games.forEach((s, api_data) -> {
44-
System.out.println(api_data.testSession().toJsonArray().toString());
45-
});
102+
@DisplayName("Smite PS4")
103+
void smitePs4() {
104+
Assertions.assertAll(
105+
() -> {
106+
String data = apitest.ping(Smite.Platform.PS4).toString();
107+
Assertions.assertTrue(data.contains("Ping successful."), "Ping API");
108+
System.out.println(data);
109+
},
110+
() -> {
111+
String data = apitest.test(Smite.Platform.PS4).toString();
112+
Assertions.assertTrue(
113+
data.contains("This was a successful test with the following parameters added:"),
114+
"Session Test");
115+
System.out.println(data);
116+
},
117+
() -> {
118+
StringData data = apitest.patch(Smite.Platform.PS4);
119+
Assertions.assertTrue(
120+
data.toJsonObject().get("ret_msg").equals(null) && !data.toJsonObject().getString("version_string").isEmpty(),
121+
"Patch Notes Test");
122+
System.out.println(data.toJsonObject().toString());
123+
});
46124
}
47125

48126
@Test
49-
@DisplayName("List Patches Test")
50-
void patchesTesting() {
51-
games.forEach((s, api_data) -> {
52-
System.out.println(api_data.getPatchInfo().toJsonArray().toString());
53-
});
127+
@DisplayName("Paladins PC")
128+
void paladinsPc() {
129+
Assertions.assertAll(
130+
() -> {
131+
String data = apitest.ping(Paladins.Platform.PC).toString();
132+
Assertions.assertTrue(data.contains("Ping successful."), "Ping API");
133+
System.out.println(data);
134+
},
135+
() -> {
136+
String data = apitest.test(Paladins.Platform.PC).toString();
137+
Assertions.assertTrue(
138+
data.contains("This was a successful test with the following parameters added:"),
139+
"Session Test");
140+
System.out.println(data);
141+
},
142+
() -> {
143+
StringData data = apitest.patch(Paladins.Platform.PC);
144+
Assertions.assertTrue(
145+
data.toJsonObject().get("ret_msg").equals(null) && !data.toJsonObject().getString("version_string").isEmpty(),
146+
"Patch Notes Test");
147+
System.out.println(data.toJsonObject().toString());
148+
});
149+
}
150+
@Test
151+
@DisplayName("Paladins XBOX")
152+
void paladinsXbox() {
153+
Assertions.assertAll(
154+
() -> {
155+
String data = apitest.ping(Paladins.Platform.XBOX).toString();
156+
Assertions.assertTrue(data.contains("Ping successful."), "Ping API");
157+
System.out.println(data);
158+
},
159+
() -> {
160+
String data = apitest.test(Paladins.Platform.XBOX).toString();
161+
Assertions.assertTrue(
162+
data.contains("This was a successful test with the following parameters added:"),
163+
"Session Test");
164+
System.out.println(data);
165+
},
166+
() -> {
167+
StringData data = apitest.patch(Paladins.Platform.XBOX);
168+
Assertions.assertTrue(
169+
data.toJsonObject().get("ret_msg").equals(null) && !data.toJsonObject().getString("version_string").isEmpty(),
170+
"Patch Notes Test");
171+
System.out.println(data.toJsonObject().toString());
172+
});
173+
}
174+
@Test
175+
@DisplayName("Paladins PS4")
176+
void paladinsPs4() {
177+
Assertions.assertAll(
178+
() -> {
179+
String data = apitest.ping(Paladins.Platform.PS4).toString();
180+
Assertions.assertTrue(data.contains("Ping successful."), "Ping API");
181+
System.out.println(data);
182+
},
183+
() -> {
184+
String data = apitest.test(Paladins.Platform.PS4).toString();
185+
Assertions.assertTrue(
186+
data.contains("This was a successful test with the following parameters added:"),
187+
"Session Test");
188+
System.out.println(data);
189+
},
190+
() -> {
191+
StringData data = apitest.patch(Paladins.Platform.PS4);
192+
Assertions.assertTrue(
193+
data.toJsonObject().get("ret_msg").equals(null) && !data.toJsonObject().getString("version_string").isEmpty(),
194+
"Patch Notes Test");
195+
System.out.println(data.toJsonObject().toString());
196+
});
54197
}
55198

56199
@AfterEach
57200
void tearDown() {
58201

59202
}
60-
@AfterAll
61-
static void release() {
62-
63-
}
64-
65203
}

0 commit comments

Comments
 (0)