Skip to content

Commit fc8c32e

Browse files
chirinochirino
committed
Move the example related tests under the examples package.
Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>
1 parent b6fc540 commit fc8c32e

21 files changed

+112
-29
lines changed

src/test/java/io/roastedroot/proxywasm/DispatchCallOnTickTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/DispatchCallOnTickTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import com.dylibso.chicory.wasm.Parser;
6+
import io.roastedroot.proxywasm.ProxyWasm;
7+
import io.roastedroot.proxywasm.StartException;
68
import java.nio.file.Path;
79
import java.util.Map;
810
import org.junit.jupiter.api.Test;

src/test/java/io/roastedroot/proxywasm/EchoHttpBodyTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/EchoHttpBodyTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static io.roastedroot.proxywasm.Helpers.bytes;
44
import static io.roastedroot.proxywasm.Helpers.string;
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertNotNull;
77

88
import com.dylibso.chicory.wasm.Parser;
9+
import io.roastedroot.proxywasm.Action;
10+
import io.roastedroot.proxywasm.HttpContext;
11+
import io.roastedroot.proxywasm.ProxyWasm;
12+
import io.roastedroot.proxywasm.StartException;
913
import java.nio.file.Path;
1014
import org.junit.jupiter.api.AfterEach;
15+
import org.junit.jupiter.api.Assertions;
1116
import org.junit.jupiter.api.BeforeEach;
1217
import org.junit.jupiter.api.Test;
1318

@@ -43,7 +48,7 @@ public void pauseUntilEOS() throws StartException {
4348
var action = httpContext.callOnRequestBody(false /* end of stream */);
4449

4550
// Must be paused.
46-
assertEquals(Action.PAUSE, action);
51+
Assertions.assertEquals(Action.PAUSE, action);
4752
}
4853

4954
@Test

src/test/java/io/roastedroot/proxywasm/ForeignCallOnTickTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/ForeignCallOnTickTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import com.dylibso.chicory.wasm.Parser;
6+
import io.roastedroot.proxywasm.ProxyWasm;
7+
import io.roastedroot.proxywasm.StartException;
68
import java.nio.file.Path;
79
import org.junit.jupiter.api.Test;
810

src/test/java/io/roastedroot/proxywasm/HttpAuthRandomTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/HttpAuthRandomTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static io.roastedroot.proxywasm.Helpers.bytes;
44
import static io.roastedroot.proxywasm.Helpers.string;
@@ -7,9 +7,13 @@
77
import static org.junit.jupiter.api.Assertions.assertNull;
88

99
import com.dylibso.chicory.wasm.Parser;
10+
import io.roastedroot.proxywasm.Action;
11+
import io.roastedroot.proxywasm.ProxyWasm;
12+
import io.roastedroot.proxywasm.StartException;
1013
import java.nio.file.Path;
1114
import java.util.Map;
1215
import org.junit.jupiter.api.AfterEach;
16+
import org.junit.jupiter.api.Assertions;
1317
import org.junit.jupiter.api.BeforeEach;
1418
import org.junit.jupiter.api.Test;
1519

@@ -43,7 +47,7 @@ public void onHttpRequestHeaders() throws StartException {
4347
// Call OnRequestHeaders.
4448
handler.setHttpRequestHeaders(Map.of("key", "value"));
4549
var action = context.callOnRequestHeaders(false);
46-
assertEquals(Action.PAUSE, action);
50+
Assertions.assertEquals(Action.PAUSE, action);
4751

4852
// Verify DispatchHttpCall is called.
4953
var calls = handler.getHttpCalls();

src/test/java/io/roastedroot/proxywasm/HttpBodyChunkTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/HttpBodyChunkTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static io.roastedroot.proxywasm.Helpers.bytes;
44
import static org.junit.jupiter.api.Assertions.assertEquals;
55
import static org.junit.jupiter.api.Assertions.assertNotNull;
66

77
import com.dylibso.chicory.wasm.Parser;
8+
import io.roastedroot.proxywasm.Action;
9+
import io.roastedroot.proxywasm.HttpContext;
10+
import io.roastedroot.proxywasm.ProxyWasm;
11+
import io.roastedroot.proxywasm.StartException;
812
import java.nio.file.Path;
913
import java.util.Map;
1014
import org.junit.jupiter.api.AfterEach;
15+
import org.junit.jupiter.api.Assertions;
1116
import org.junit.jupiter.api.BeforeEach;
1217
import org.junit.jupiter.api.Test;
1318

@@ -38,7 +43,7 @@ void tearDown() {
3843
@Test
3944
public void pauseUntilEOS() {
4045
var action = host.callOnRequestBody(false);
41-
assertEquals(Action.PAUSE, action);
46+
Assertions.assertEquals(Action.PAUSE, action);
4247
}
4348

4449
@Test

src/test/java/io/roastedroot/proxywasm/HttpBodyTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/HttpBodyTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static io.roastedroot.proxywasm.Helpers.bytes;
44
import static io.roastedroot.proxywasm.Helpers.string;
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertNotNull;
77

88
import com.dylibso.chicory.wasm.Parser;
9+
import io.roastedroot.proxywasm.Action;
10+
import io.roastedroot.proxywasm.HttpContext;
11+
import io.roastedroot.proxywasm.ProxyWasm;
12+
import io.roastedroot.proxywasm.StartException;
913
import java.nio.charset.StandardCharsets;
1014
import java.nio.file.Path;
1115
import java.util.Map;
1216
import org.junit.jupiter.api.AfterEach;
17+
import org.junit.jupiter.api.Assertions;
1318
import org.junit.jupiter.api.BeforeEach;
1419
import org.junit.jupiter.api.Test;
1520

@@ -48,7 +53,7 @@ public void testOnHttpRequestHeadersRemoveRequestHeader() throws StartException
4853
var action = httpContext.callOnRequestHeaders(false);
4954

5055
// Must be continued.
51-
assertEquals(Action.CONTINUE, action);
56+
Assertions.assertEquals(Action.CONTINUE, action);
5257

5358
var headers = handler.getHttpRequestHeaders();
5459
assertEquals(Map.of("buffer-operation", "replace"), headers);

src/test/java/io/roastedroot/proxywasm/HttpHeadersTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/HttpHeadersTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
55

66
import com.dylibso.chicory.wasm.Parser;
7+
import io.roastedroot.proxywasm.Action;
8+
import io.roastedroot.proxywasm.ProxyWasm;
9+
import io.roastedroot.proxywasm.StartException;
710
import java.nio.file.Path;
811
import java.util.Map;
12+
import org.junit.jupiter.api.Assertions;
913
import org.junit.jupiter.api.Test;
1014

1115
/**
@@ -28,7 +32,7 @@ public void onHttpRequestHeaders() throws StartException {
2832
"key1", "value1",
2933
"key2", "value2"));
3034
var action = host.callOnRequestHeaders(false);
31-
assertEquals(Action.CONTINUE, action);
35+
Assertions.assertEquals(Action.CONTINUE, action);
3236

3337
// Check headers
3438
var httpRequestHeaders = handler.getHttpRequestHeaders();

src/test/java/io/roastedroot/proxywasm/HttpRoutingTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/HttpRoutingTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import com.dylibso.chicory.wasm.Parser;
6+
import io.roastedroot.proxywasm.Action;
7+
import io.roastedroot.proxywasm.ProxyWasm;
8+
import io.roastedroot.proxywasm.StartException;
69
import java.nio.file.Path;
710
import java.util.Map;
811
import org.junit.jupiter.api.Test;

src/test/java/io/roastedroot/proxywasm/JsonValidationTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/JsonValidationTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static io.roastedroot.proxywasm.Helpers.bytes;
44
import static org.junit.jupiter.api.Assertions.assertEquals;
55

66
import com.dylibso.chicory.wasm.Parser;
7+
import io.roastedroot.proxywasm.Action;
8+
import io.roastedroot.proxywasm.HttpContext;
9+
import io.roastedroot.proxywasm.ProxyWasm;
10+
import io.roastedroot.proxywasm.StartException;
711
import java.nio.file.Path;
812
import java.util.Map;
913
import org.junit.jupiter.api.AfterEach;

src/test/java/io/roastedroot/proxywasm/MetricsTest.java renamed to src/test/java/io/roastedroot/proxywasm/examples/MetricsTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
package io.roastedroot.proxywasm;
1+
package io.roastedroot.proxywasm.examples;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
55

66
import com.dylibso.chicory.wasm.Parser;
7+
import io.roastedroot.proxywasm.Action;
8+
import io.roastedroot.proxywasm.MetricType;
9+
import io.roastedroot.proxywasm.ProxyWasm;
10+
import io.roastedroot.proxywasm.StartException;
711
import java.nio.file.Path;
812
import java.util.Map;
13+
import org.junit.jupiter.api.Assertions;
914
import org.junit.jupiter.api.Test;
1015

1116
/**
@@ -37,7 +42,7 @@ public void testMetric() throws StartException {
3742
handler.getMetric(
3843
"custom_header_value_counts_value=foo_reporter=wasmgosdk");
3944
assertNotNull(metric);
40-
assertEquals(MetricType.COUNTER, metric.type);
45+
Assertions.assertEquals(MetricType.COUNTER, metric.type);
4146
assertEquals(expectedCount, metric.value);
4247
}
4348
}

0 commit comments

Comments
 (0)