Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RESTEASY-3418] Migrate the resteasy-wadl-undertow-connector module to JUnit 5 #3888

Merged
merged 1 commit into from
Oct 31, 2023
Merged

[RESTEASY-3418] Migrate the resteasy-wadl-undertow-connector module to JUnit 5 #3888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions resteasy-wadl-undertow-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@

<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...nnector/src/test/java/org/jboss/resteasy/test/nextgen/wadl/WADLTestExistenceVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.jboss.resteasy.test.nextgen.wadl;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -49,7 +49,7 @@ public void verify(List targets, Class targetClass, String fetchKeyMethod)
}
}

assertTrue(data.toString(), allTrue());
assertTrue(allTrue(), data.toString());
}

public boolean allTrue() {
Expand Down
50 changes: 24 additions & 26 deletions ...nnector/src/test/java/org/jboss/resteasy/test/nextgen/wadl/WADLUndertowContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.jboss.resteasy.test.nextgen.wadl;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.util.HashSet;
import java.util.Set;

Expand All @@ -22,9 +18,10 @@
import org.jboss.resteasy.wadl.ResteasyWadlDefaultResource;
import org.jboss.resteasy.wadl.ResteasyWadlWriter;
import org.jboss.resteasy.wadl.undertow.WadlUndertowConnector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

/**
* Created by weli on 6/14/16.
Expand All @@ -46,12 +43,12 @@ public void basicTest() throws Exception {
// get Application
org.jboss.resteasy.wadl.jaxb.Application application = response
.readEntity(org.jboss.resteasy.wadl.jaxb.Application.class);
assertNotNull("application not null", application);
assertEquals(1, application.getResources().size());
Assertions.assertNotNull(application, "application not null");
Assertions.assertEquals(1, application.getResources().size());

// get BasicResource
org.jboss.resteasy.wadl.jaxb.Resource basicResource = findResourceByName(application, "/basic");
assertNotNull("basic resouce not null", basicResource);
Assertions.assertNotNull(basicResource, "basic resouce not null");

{
// verify the existence of params
Expand All @@ -67,14 +64,14 @@ public void basicTest() throws Exception {

// verify 'post' method has expected id and name
org.jboss.resteasy.wadl.jaxb.Method post = findMethodById(basicResource, "post");
assertNotNull("post method not null", post);
assertEquals("POST", post.getName());
assertNotNull("post response not null", post.getResponse());
assertNotNull("post response representation not null", post.getResponse().get(0).getRepresentation());
Assertions.assertNotNull(post, "post method not null");
Assertions.assertEquals("POST", post.getName());
Assertions.assertNotNull(post.getResponse(), "post response not null");
Assertions.assertNotNull(post.getResponse().get(0).getRepresentation(), "post response representation not null");

// verify 'get' method
org.jboss.resteasy.wadl.jaxb.Method get = findMethodById(basicResource, "get");
assertEquals("GET", get.getName());
Assertions.assertEquals("GET", get.getName());
}

{
Expand All @@ -88,8 +85,8 @@ public void basicTest() throws Exception {

// verify resource 'intr/{foo}'
org.jboss.resteasy.wadl.jaxb.Resource compositeResource = findResourceByName(basicResource, compositeResourceName);
assertNotNull(compositeResource);
assertEquals(compositeResourceName, compositeResource.getPath());
Assertions.assertNotNull(compositeResource);
Assertions.assertEquals(compositeResourceName, compositeResource.getPath());

WADLTestExistenceVerifier paramExistenceVerifier = new WADLTestExistenceVerifier();
paramExistenceVerifier.createVerifier("pathParam", "matrixParam");
Expand All @@ -103,9 +100,10 @@ public void basicTest() throws Exception {
org.jboss.resteasy.wadl.jaxb.Method compositeMethod = findMethodById(compositeResource, "composite");

// verify response
assertTrue(compositeResourceName + " response contains respresentation",
compositeMethod.getResponse().get(0).getRepresentation().size() > 0);
assertEquals("text/plain", compositeMethod.getResponse().get(0).getRepresentation().get(0).getMediaType());
Assertions.assertTrue(compositeMethod.getResponse().get(0).getRepresentation().size() > 0,
compositeResourceName + " response contains respresentation");
Assertions.assertEquals("text/plain",
compositeMethod.getResponse().get(0).getRepresentation().get(0).getMediaType());

WADLTestExistenceVerifier requestVerifier = new WADLTestExistenceVerifier();
requestVerifier.createVerifier("headerParam", "queryParam", "Cookie");
Expand All @@ -128,21 +126,21 @@ public void test1246() {
.readEntity(org.jboss.resteasy.wadl.jaxb.Application.class);
org.jboss.resteasy.wadl.jaxb.Method multipleProvides1 = findMethodById(
findResourceByName(findResourceByName(application, "/issues/1246"), "/provides1"), "multipleProvides1");
assertEquals("Multiple representations should be present", 2,
multipleProvides1.getResponse().get(0).getRepresentation().size());
Assertions.assertEquals(2, multipleProvides1.getResponse().get(0).getRepresentation().size(),
"Multiple representations should be present");
org.jboss.resteasy.wadl.jaxb.Method multipleProvides2 = findMethodById(
findResourceByName(findResourceByName(application, "/issues/1246"), "/provides2"), "multipleProvides2");
assertEquals("Multiple representations should be present", 2,
multipleProvides2.getResponse().get(0).getRepresentation().size());
Assertions.assertEquals(2, multipleProvides2.getResponse().get(0).getRepresentation().size(),
"Multiple representations should be present");
client.close();
}

@Before
@BeforeEach
public void before() throws Exception {
server = new UndertowJaxrsServer().start();
}

@After
@AfterEach
public void after() throws Exception {
server.stop();
server = null;
Expand Down