Рефакторинг

This commit is contained in:
serega6531
2020-04-14 14:55:14 +03:00
parent 6976253666
commit 4e5d6e3eb8
10 changed files with 510 additions and 399 deletions

View File

@@ -4,7 +4,9 @@ import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
import ru.serega6531.packmate.model.CtfService;
import ru.serega6531.packmate.model.Packet;
import ru.serega6531.packmate.service.StreamOptimizer;
import ru.serega6531.packmate.service.optimization.HttpGzipProcessor;
import ru.serega6531.packmate.service.optimization.HttpUrldecodeProcessor;
import ru.serega6531.packmate.service.optimization.PacketsMerger;
import java.util.ArrayList;
import java.util.Base64;
@@ -21,14 +23,11 @@ class StreamOptimizerTest {
final byte[] gzipped = Base64.getDecoder().decode(encoded);
final byte[] content = ArrayUtils.addAll("HTTP/1.1 200 OK\r\nContent-Encoding: gzip\r\nContent-Length: 26\r\n\r\n".getBytes(), gzipped);
CtfService service = new CtfService();
service.setUngzipHttp(true);
Packet p = createPacket(content, false);
List<Packet> list = new ArrayList<>();
list.add(p);
list = new StreamOptimizer(service, list).optimizeStream();
new HttpGzipProcessor(list).unpackGzip();
final String processed = list.get(0).getContentString();
assertTrue(processed.contains("aaabbb"));
}
@@ -42,7 +41,7 @@ class StreamOptimizerTest {
List<Packet> list = new ArrayList<>();
list.add(p);
list = new StreamOptimizer(service, list).optimizeStream();
new HttpUrldecodeProcessor(list).urldecodeRequests();
final String processed = list.get(0).getContentString();
assertTrue(processed.contains("а б"));
}
@@ -67,7 +66,7 @@ class StreamOptimizerTest {
list.add(p5);
list.add(p6);
list = new StreamOptimizer(service, list).optimizeStream();
new PacketsMerger(list).mergeAdjacentPackets();
assertEquals(4, list.size());
assertEquals(2, list.get(1).getContent().length);