-
Notifications
You must be signed in to change notification settings - Fork 560
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
444 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
nima/http2/http2/src/test/java/io/helidon/nima/http2/MaxFrameSizeSplitTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* | ||
| * Copyright (c) 2023 Oracle and/or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.helidon.nima.http2; | ||
|
|
||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.Arrays; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import io.helidon.common.buffers.BufferData; | ||
| import io.helidon.logging.common.LogConfig; | ||
|
|
||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
|
|
||
| import static java.lang.System.Logger.Level.DEBUG; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| class MaxFrameSizeSplitTest { | ||
|
|
||
| private static final System.Logger LOGGER = System.getLogger(MaxFrameSizeSplitTest.class.getName()); | ||
|
|
||
| private static final String TEST_STRING = "Helidon data!!!!"; | ||
| private static final byte[] TEST_DATA = TEST_STRING.getBytes(StandardCharsets.UTF_8); | ||
|
|
||
| @BeforeAll | ||
| static void beforeAll() { | ||
| LogConfig.configureRuntime(); | ||
| } | ||
|
|
||
| private static Stream<Arguments> splitMultiple() { | ||
| return Stream.of( | ||
| Arguments.of(17, 1, 16), | ||
| Arguments.of(16, 1, 16), | ||
| Arguments.of(15, 2, 1), | ||
| Arguments.of(14, 2, 2), | ||
| Arguments.of(13, 2, 3), | ||
| Arguments.of(12, 2, 4), | ||
| Arguments.of(11, 2, 5), | ||
| Arguments.of(10, 2, 6), | ||
| Arguments.of(9, 2, 7), | ||
| Arguments.of(8, 2, 8), | ||
| Arguments.of(7, 3, 2), | ||
| Arguments.of(6, 3, 4), | ||
| Arguments.of(5, 4, 1), | ||
| Arguments.of(4, 4, 4), | ||
| Arguments.of(3, 6, 1), | ||
| Arguments.of(2, 8, 2), | ||
| Arguments.of(1, 16, 1) | ||
| ); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource | ||
| void splitMultiple(int sizeOfFrames, | ||
| int numberOfFrames, | ||
| int sizeOfLastFrame) { | ||
| LOGGER.log(DEBUG, "Splitting " + Arrays.toString(TEST_DATA) + " to frames of max size " + sizeOfFrames); | ||
|
|
||
| Http2FrameData frameData = createFrameData(TEST_DATA); | ||
| Http2FrameData[] split = frameData.split(sizeOfFrames); | ||
| assertThat("Unexpected number of frames", split.length, is(numberOfFrames)); | ||
|
|
||
| BufferData joined = Stream.of(split) | ||
| .collect(() -> BufferData.create(TEST_DATA.length), | ||
| (bb, b) -> bb.write(b.data()), | ||
| (bb, bb2) -> { | ||
| }); | ||
|
|
||
| assertThat("Result after split and join differs", | ||
| joined.readString(joined.available(), StandardCharsets.UTF_8), | ||
| is(TEST_STRING)); | ||
|
|
||
| // Reload data depleted by previous test | ||
| split = createFrameData(TEST_DATA).split(sizeOfFrames); | ||
|
|
||
| for (int i = 0; i < numberOfFrames - 1; i++) { | ||
| Http2FrameData frame = split[i]; | ||
| assertThat("Only last frame can have endOfStream flag", | ||
| frame.header().flags(Http2FrameTypes.DATA).endOfStream(), | ||
| is(false)); | ||
|
|
||
| byte[] bytes = toBytes(frame); | ||
| LOGGER.log(DEBUG, i + ". frame: " + Arrays.toString(bytes)); | ||
| assertThat("Unexpected size of frame " + i, bytes.length, is(sizeOfFrames)); | ||
| } | ||
|
|
||
| Http2FrameData lastFrame = split[numberOfFrames - 1]; | ||
| assertThat("Last frame is missing endOfStream flag", | ||
| lastFrame.header().flags(Http2FrameTypes.DATA).endOfStream(), | ||
| is(true)); | ||
|
|
||
| byte[] bytes = toBytes(lastFrame); | ||
| LOGGER.log(DEBUG, numberOfFrames - 1 + ". frame: " + Arrays.toString(bytes)); | ||
| assertThat("Unexpected size of the last frame", bytes.length, is(sizeOfLastFrame)); | ||
| } | ||
|
|
||
| private Http2FrameData createFrameData(byte[] data) { | ||
| Http2FrameHeader http2FrameHeader = Http2FrameHeader.create(data.length, | ||
| Http2FrameTypes.DATA, | ||
| Http2Flag.DataFlags.create(Http2Flag.DataFlags.END_OF_STREAM), | ||
| 1); | ||
| return new Http2FrameData(http2FrameHeader, BufferData.create(data)); | ||
| } | ||
|
|
||
| private byte[] toBytes(Http2FrameData frameData) { | ||
| return toBytes(frameData.data()); | ||
| } | ||
|
|
||
| private byte[] toBytes(BufferData data) { | ||
| byte[] b = new byte[data.available()]; | ||
| data.read(b); | ||
| return b; | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
nima/http2/http2/src/test/resources/logging-test.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # | ||
| # Copyright (c) 2023 Oracle and/or its affiliates. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| handlers=io.helidon.logging.jul.HelidonConsoleHandler | ||
| # HelidonConsoleHandler uses a SimpleFormatter subclass that replaces "!thread!" with the current thread | ||
| java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$s %3$s !thread!: %5$s%6$s%n | ||
| #java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS.%1$tL %5$s%6$s%n | ||
| # Global logging level. Can be overridden by specific loggers | ||
| .level=INFO | ||
| io.helidon.nima.level=INFO | ||
| #io.helidon.nima.http2.MaxFrameSizeSplitTest.level=ALL |
Oops, something went wrong.