diff --git a/src/test/java/io/cryostat/jmcagent/JMCAgentProbesTest.java b/src/test/java/io/cryostat/jmcagent/JMCAgentProbesTest.java index 0b39be07d..1d0a38a11 100644 --- a/src/test/java/io/cryostat/jmcagent/JMCAgentProbesTest.java +++ b/src/test/java/io/cryostat/jmcagent/JMCAgentProbesTest.java @@ -19,9 +19,7 @@ import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.Disabled; @QuarkusTest @TestHTTPEndpoint(JMCAgentProbes.class) -@Disabled("https://github.com/cryostatio/cryostat-core/issues/450") public class JMCAgentProbesTest extends AbstractTransactionalTestBase {} diff --git a/src/test/java/io/cryostat/jmcagent/JMCAgentTemplatesTest.java b/src/test/java/io/cryostat/jmcagent/JMCAgentTemplatesTest.java index ad9ab94f3..609ca7cdd 100644 --- a/src/test/java/io/cryostat/jmcagent/JMCAgentTemplatesTest.java +++ b/src/test/java/io/cryostat/jmcagent/JMCAgentTemplatesTest.java @@ -17,13 +17,15 @@ import static io.restassured.RestAssured.given; +import java.util.List; + import io.cryostat.AbstractTransactionalTestBase; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; +import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @QuarkusTest @@ -32,15 +34,20 @@ public class JMCAgentTemplatesTest extends AbstractTransactionalTestBase { @Test void testListNone() { - given().log() - .all() - .when() - .get() - .then() - .assertThat() - .contentType(ContentType.JSON) - .statusCode(200) - .body("size()", Matchers.equalTo(0)); + MatcherAssert.assertThat( + (List) + given().log() + .all() + .when() + .get() + .then() + .assertThat() + .contentType(ContentType.JSON) + .statusCode(200) + .extract() + .body() + .as(List.class), + Matchers.equalTo(List.of())); } @Test @@ -49,12 +56,12 @@ void testDeleteNone() { } @Test - @Disabled("https://github.com/cryostatio/cryostat-core/issues/450") - void testCreate() { + void testCreateAndDelete() { + var filename = "agentTemplatesProbe1"; given().log() .all() .when() - .multiPart("name", "agentTemplatesProbe1") + .multiPart("name", filename) .multiPart( "probeTemplate", """ @@ -98,6 +105,64 @@ void testCreate() { .then() .assertThat() .statusCode(201) - .body("size()", Matchers.equalTo(0)); + .body( + "fileName", + Matchers.equalTo(filename), + "classPrefix", + Matchers.equalTo("__JFREvent"), + "allowToString", + Matchers.equalTo(true), + "allowConverter", + Matchers.equalTo(true), + "events.size()", + Matchers.equalTo(2), + "events[0].id", + Matchers.equalTo("maxcao.jfr"), + "events[0].name", + Matchers.equalTo("MaxCaoEvent"), + "events[0].clazz", + Matchers.equalTo("io.cryostat.net.web.http.api.v1.RecordingsGetHandler"), + "events[0].description", + Matchers.equalTo("Event for me Max"), + "events[0].path", + Matchers.equalTo("maxcao"), + "events[0].recordStackTrace", + Matchers.equalTo(true), + "events[0].useRethrow", + Matchers.equalTo(false), + "events[0].methodName", + Matchers.equalTo("handleAuthenticated"), + "events[0].methodDescriptor", + Matchers.equalTo("(Lio/vertx/ext/web/RoutingContext;)V"), + "events[0].location", + Matchers.equalTo("ENTRY"), + "events[0].returnValue", + Matchers.nullValue(), + "events[1].id", + Matchers.equalTo("demo.jfr.test1"), + "events[1].name", + Matchers.equalTo("DemoEvent"), + "events[1].clazz", + Matchers.equalTo( + "io.cryostat.net.web.http.api.v1.TargetTemplatesGetHandler"), + "events[1].description", + Matchers.equalTo("Event for the agent plugin demo"), + "events[1].path", + Matchers.equalTo("demo"), + "events[1].recordStackTrace", + Matchers.equalTo(true), + "events[1].useRethrow", + Matchers.equalTo(false), + "events[1].methodName", + Matchers.equalTo("handleAuthenticated"), + "events[1].methodDescriptor", + Matchers.equalTo("(Lio/vertx/ext/web/RoutingContext;)V"), + "events[1].location", + Matchers.equalTo("ENTRY"), + "events[1].returnValue", + Matchers.nullValue()); + + given().log().all().when().delete(filename).then().assertThat().statusCode(204); + given().log().all().when().delete(filename).then().assertThat().statusCode(404); } }