Skip to content

Use assertj in tests #746

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

Open
ok2c wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use assertj in tests #746

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions httpcore5-h2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
33 changes: 15 additions & 18 deletions httpcore5-h2/src/test/java/org/apache/hc/core5/http2/config/H2ConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@

package org.apache.hc.core5.http2.config;

import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.assertj.core.api.Assertions;
import org.assertj.core.api.SoftAssertions;
import org.junit.jupiter.api.Test;

class H2ConfigTest {
Expand All @@ -42,7 +39,7 @@ void builder() {
final H2Config h2Config = H2Config.custom()
.setPushEnabled(false)
.build();
assertNotNull(h2Config);
Assertions.assertThat(h2Config).isNotNull();
}

@Test
Expand All @@ -56,11 +53,11 @@ void checkValues() {
.setCompressionEnabled(true)
.build();

assertEquals(1, h2Config.getHeaderTableSize());
assertEquals(1, h2Config.getMaxConcurrentStreams());
assertEquals(16384, h2Config.getMaxFrameSize());
assertTrue(h2Config.isPushEnabled());
assertTrue(h2Config.isCompressionEnabled());
Assertions.assertThat(h2Config.getHeaderTableSize()).isEqualTo(1);
Assertions.assertThat(h2Config.getMaxConcurrentStreams()).isEqualTo(1);
Assertions.assertThat(h2Config.getMaxFrameSize()).isEqualTo(16384);
Assertions.assertThat(h2Config.isPushEnabled()).isTrue();
Assertions.assertThat(h2Config.isCompressionEnabled()).isTrue();
}

@Test
Expand All @@ -77,13 +74,13 @@ void copy() {
final H2Config.Builder builder = H2Config.copy(h2Config);
final H2Config h2Config2 = builder.build();

assertAll(
() -> assertEquals(h2Config.getHeaderTableSize(), h2Config2.getHeaderTableSize()),
() -> assertEquals(h2Config.getInitialWindowSize(), h2Config2.getInitialWindowSize()),
() -> assertEquals(h2Config.getMaxConcurrentStreams(), h2Config2.getMaxConcurrentStreams()),
() -> assertEquals(h2Config.getMaxFrameSize(), h2Config2.getMaxFrameSize()),
() -> assertEquals(h2Config.getMaxHeaderListSize(), h2Config2.getMaxHeaderListSize())
);
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(h2Config2.getHeaderTableSize()).isEqualTo(h2Config.getHeaderTableSize());
softly.assertThat(h2Config2.getInitialWindowSize()).isEqualTo(h2Config.getInitialWindowSize());
softly.assertThat(h2Config2.getMaxConcurrentStreams()).isEqualTo(h2Config.getMaxConcurrentStreams());
softly.assertThat(h2Config2.getMaxFrameSize()).isEqualTo(h2Config.getMaxFrameSize());
softly.assertThat(h2Config2.getMaxHeaderListSize()).isEqualTo(h2Config.getMaxHeaderListSize());
});

}

Expand Down
44 changes: 22 additions & 22 deletions httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestDefaultFrameFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.apache.hc.core5.http2.H2Error;
import org.apache.hc.core5.http2.config.H2Param;
import org.apache.hc.core5.http2.config.H2Setting;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

class TestDefaultFrameFactory {
Expand All @@ -45,9 +45,9 @@ void testDataFrame() {
final byte[] data = new byte[]{'a', 'b', 'c', 'd', 'e', 'f'};
final Frame<ByteBuffer> dataFrame = frameFactory.createData(23, ByteBuffer.wrap(data), true);

Assertions.assertEquals(FrameType.DATA.value, dataFrame.getType());
Assertions.assertEquals(23, dataFrame.getStreamId());
Assertions.assertEquals(1L, dataFrame.getFlags());
Assertions.assertThat(dataFrame.getType()).isEqualTo(FrameType.DATA.value);
Assertions.assertThat(dataFrame.getStreamId()).isEqualTo(23);
Assertions.assertThat(dataFrame.getFlags()).isEqualTo(1L);
}

@Test
Expand All @@ -58,12 +58,12 @@ void testSettingFrame() {
new H2Setting(H2Param.HEADER_TABLE_SIZE, 1024),
new H2Setting(H2Param.MAX_CONCURRENT_STREAMS, 1));

Assertions.assertEquals(FrameType.SETTINGS.value, settingsFrame.getType());
Assertions.assertEquals(0, settingsFrame.getStreamId());
Assertions.assertEquals(0, settingsFrame.getFlags());
Assertions.assertThat(settingsFrame.getType()).isEqualTo(FrameType.SETTINGS.value);
Assertions.assertThat(settingsFrame.getStreamId()).isEqualTo(0);
Assertions.assertThat(settingsFrame.getFlags()).isEqualTo(0);
final ByteBuffer payload = settingsFrame.getPayload();
Assertions.assertNotNull(payload);
Assertions.assertEquals(12, payload.remaining());
Assertions.assertThat(payload).isNotNull();
Assertions.assertThat(payload.remaining()).isEqualTo(12);
}

@Test
Expand All @@ -72,13 +72,13 @@ void testResetStreamFrame() {
final FrameFactory frameFactory = new DefaultFrameFactory();
final Frame<ByteBuffer> rstStreamFrame = frameFactory.createResetStream(12, H2Error.INTERNAL_ERROR);

Assertions.assertEquals(FrameType.RST_STREAM.value, rstStreamFrame.getType());
Assertions.assertEquals(12, rstStreamFrame.getStreamId());
Assertions.assertEquals(0, rstStreamFrame.getFlags());
Assertions.assertThat(rstStreamFrame.getType()).isEqualTo(FrameType.RST_STREAM.value);
Assertions.assertThat(rstStreamFrame.getStreamId()).isEqualTo(12);
Assertions.assertThat(rstStreamFrame.getFlags()).isEqualTo(0);
final ByteBuffer payload = rstStreamFrame.getPayload();
Assertions.assertNotNull(payload);
Assertions.assertEquals(4, payload.remaining());
Assertions.assertEquals(H2Error.INTERNAL_ERROR.getCode(), payload.getInt());
Assertions.assertThat(payload).isNotNull();
Assertions.assertThat(payload.remaining()).isEqualTo(4);
Assertions.assertThat(payload.getInt()).isEqualTo(H2Error.INTERNAL_ERROR.getCode());
}

@Test
Expand All @@ -87,16 +87,16 @@ void testGoAwayFrame() {
final FrameFactory frameFactory = new DefaultFrameFactory();
final Frame<ByteBuffer> goAwayFrame = frameFactory.createGoAway(13, H2Error.INTERNAL_ERROR, "Oopsie");

Assertions.assertEquals(FrameType.GOAWAY.value, goAwayFrame.getType());
Assertions.assertEquals(0, goAwayFrame.getStreamId());
Assertions.assertEquals(0, goAwayFrame.getFlags());
Assertions.assertThat(goAwayFrame.getType()).isEqualTo(FrameType.GOAWAY.value);
Assertions.assertThat(goAwayFrame.getStreamId()).isEqualTo(0);
Assertions.assertThat(goAwayFrame.getFlags()).isEqualTo(0);
final ByteBuffer payload = goAwayFrame.getPayload();
Assertions.assertNotNull(payload);
Assertions.assertEquals(13, payload.getInt());
Assertions.assertEquals(H2Error.INTERNAL_ERROR.getCode(), payload.getInt());
Assertions.assertThat(payload).isNotNull();
Assertions.assertThat(payload.getInt()).isEqualTo(13);
Assertions.assertThat(payload.getInt()).isEqualTo(H2Error.INTERNAL_ERROR.getCode());
final byte[] tmp = new byte[payload.remaining()];
payload.get(tmp);
Assertions.assertEquals("Oopsie", new String(tmp, StandardCharsets.US_ASCII));
Assertions.assertThat(new String(tmp, StandardCharsets.US_ASCII)).isEqualTo("Oopsie");
}

}
4 changes: 2 additions & 2 deletions httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestFrameFlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
package org.apache.hc.core5.http2.frame;

import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

class TestFrameFlag {
Expand All @@ -35,7 +35,7 @@ class TestFrameFlag {
void testFrameFlagBasics() {

final int flags = FrameFlag.of(FrameFlag.END_STREAM, FrameFlag.PADDED, FrameFlag.PRIORITY);
Assertions.assertEquals(0x01 | 0x08 | 0x20, flags);
Assertions.assertThat(flags).isEqualTo(0x01 | 0x08 | 0x20);
}

}
18 changes: 9 additions & 9 deletions httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@

import org.apache.hc.core5.http2.config.H2Param;
import org.apache.hc.core5.http2.config.H2Setting;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

class TestH2Settings {

@Test
void testH2ParamBasics() {
for (final H2Param param: H2Param.values()) {
Assertions.assertEquals(param, H2Param.valueOf(param.getCode()));
Assertions.assertEquals(param.name(), H2Param.toString(param.getCode()));
Assertions.assertThat(H2Param.valueOf(param.getCode())).isEqualTo(param);
Assertions.assertThat(H2Param.toString(param.getCode())).isEqualTo(param.name());
}
Assertions.assertNull(H2Param.valueOf(0));
Assertions.assertNull(H2Param.valueOf(10));
Assertions.assertEquals("0", H2Param.toString(0));
Assertions.assertEquals("10", H2Param.toString(10));
Assertions.assertThat(H2Param.valueOf(0)).isNull();
Assertions.assertThat(H2Param.valueOf(10)).isNull();
Assertions.assertThat(H2Param.toString(0)).isEqualTo("0");
Assertions.assertThat(H2Param.toString(10)).isEqualTo("10");
}

@Test
Expand All @@ -51,8 +51,8 @@ void testH2SettingBasics() {
final H2Setting setting1 = new H2Setting(H2Param.ENABLE_PUSH, 0);
final H2Setting setting2 = new H2Setting(H2Param.INITIAL_WINDOW_SIZE, 1024);

Assertions.assertEquals("ENABLE_PUSH: 0", setting1.toString());
Assertions.assertEquals("INITIAL_WINDOW_SIZE: 1024", setting2.toString());
Assertions.assertThat(setting1.toString()).isEqualTo("ENABLE_PUSH: 0");
Assertions.assertThat(setting2.toString()).isEqualTo("INITIAL_WINDOW_SIZE: 1024");
}

}
104 changes: 52 additions & 52 deletions httpcore5-h2/src/test/java/org/apache/hc/core5/http2/hpack/TestFifoBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

package org.apache.hc.core5.http2.hpack;

import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

class TestFifoBuffer {
Expand All @@ -43,47 +43,47 @@ void testAddRemoveCycle() {
final HPackHeader h4 = new HPackHeader("h", "4");

for (int i = 0; i < 20; i++) {
Assertions.assertEquals(0, fifoBuffer.size());
Assertions.assertSame(null, fifoBuffer.getFirst());
Assertions.assertSame(null, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(0);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(null);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(null);
fifoBuffer.addFirst(h1);
Assertions.assertSame(h1, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertEquals(1, fifoBuffer.size());
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h1);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);
Assertions.assertThat(fifoBuffer.size()).isEqualTo(1);
fifoBuffer.addFirst(h2);
Assertions.assertEquals(2, fifoBuffer.size());
Assertions.assertSame(h2, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(2);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h2);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);
fifoBuffer.addFirst(h3);
Assertions.assertEquals(3, fifoBuffer.size());
Assertions.assertSame(h3, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(3);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h3);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);
fifoBuffer.addFirst(h4);
Assertions.assertEquals(4, fifoBuffer.size());
Assertions.assertSame(h4, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(4);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h4);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);

Assertions.assertSame(h4, fifoBuffer.get(0));
Assertions.assertSame(h3, fifoBuffer.get(1));
Assertions.assertSame(h2, fifoBuffer.get(2));
Assertions.assertSame(h1, fifoBuffer.get(3));
Assertions.assertThat(fifoBuffer.get(0)).isSameAs(h4);
Assertions.assertThat(fifoBuffer.get(1)).isSameAs(h3);
Assertions.assertThat(fifoBuffer.get(2)).isSameAs(h2);
Assertions.assertThat(fifoBuffer.get(3)).isSameAs(h1);

fifoBuffer.removeLast();
Assertions.assertEquals(3, fifoBuffer.size());
Assertions.assertSame(h4, fifoBuffer.getFirst());
Assertions.assertSame(h2, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(3);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h4);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h2);
fifoBuffer.removeLast();
Assertions.assertEquals(2, fifoBuffer.size());
Assertions.assertSame(h4, fifoBuffer.getFirst());
Assertions.assertSame(h3, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(2);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h4);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h3);
fifoBuffer.removeLast();
Assertions.assertEquals(1, fifoBuffer.size());
Assertions.assertSame(h4, fifoBuffer.getFirst());
Assertions.assertSame(h4, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(1);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h4);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h4);
fifoBuffer.removeLast();
Assertions.assertEquals(0, fifoBuffer.size());
Assertions.assertSame(null, fifoBuffer.getFirst());
Assertions.assertSame(null, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(0);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(null);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(null);
}
}

Expand All @@ -105,30 +105,30 @@ void testExpand() {
fifoBuffer.removeLast();
}

Assertions.assertEquals(0, fifoBuffer.size());
Assertions.assertSame(null, fifoBuffer.getFirst());
Assertions.assertSame(null, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(0);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(null);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(null);
fifoBuffer.addFirst(h1);
Assertions.assertSame(h1, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertEquals(1, fifoBuffer.size());
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h1);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);
Assertions.assertThat(fifoBuffer.size()).isEqualTo(1);
fifoBuffer.addFirst(h2);
Assertions.assertEquals(2, fifoBuffer.size());
Assertions.assertSame(h2, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(2);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h2);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);
fifoBuffer.addFirst(h3);
Assertions.assertEquals(3, fifoBuffer.size());
Assertions.assertSame(h3, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());
Assertions.assertThat(fifoBuffer.size()).isEqualTo(3);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h3);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);
fifoBuffer.addFirst(h4);
Assertions.assertEquals(4, fifoBuffer.size());
Assertions.assertSame(h4, fifoBuffer.getFirst());
Assertions.assertSame(h1, fifoBuffer.getLast());

Assertions.assertSame(h4, fifoBuffer.get(0));
Assertions.assertSame(h3, fifoBuffer.get(1));
Assertions.assertSame(h2, fifoBuffer.get(2));
Assertions.assertSame(h1, fifoBuffer.get(3));
Assertions.assertThat(fifoBuffer.size()).isEqualTo(4);
Assertions.assertThat(fifoBuffer.getFirst()).isSameAs(h4);
Assertions.assertThat(fifoBuffer.getLast()).isSameAs(h1);

Assertions.assertThat(fifoBuffer.get(0)).isSameAs(h4);
Assertions.assertThat(fifoBuffer.get(1)).isSameAs(h3);
Assertions.assertThat(fifoBuffer.get(2)).isSameAs(h2);
Assertions.assertThat(fifoBuffer.get(3)).isSameAs(h1);
}
}

Expand Down
Loading
Loading