diff --git a/clients/derivatives-trading-coin-futures/src/test/java/com/binance/connector/client/derivatives_trading_coin_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java b/clients/derivatives-trading-coin-futures/src/test/java/com/binance/connector/client/derivatives_trading_coin_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java index f8a77b5e..3e6d17ea 100644 --- a/clients/derivatives-trading-coin-futures/src/test/java/com/binance/connector/client/derivatives_trading_coin_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java +++ b/clients/derivatives-trading-coin-futures/src/test/java/com/binance/connector/client/derivatives_trading_coin_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java @@ -147,7 +147,7 @@ public void aggregateTradeStreamsTest() throws ApiException, URISyntaxException, URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@aggTrade-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@aggTrade-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -330,7 +330,7 @@ public void continuousContractKlineCandlestickStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/_@continuousKline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/pair_contractType@continuousKline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -399,7 +399,7 @@ public void diffBookDepthStreamsTest() throws ApiException, URISyntaxException, URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@depth-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@depthupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -436,7 +436,7 @@ public void indexKlineCandlestickStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@indexPriceKline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/pair@indexPriceKline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -471,7 +471,7 @@ public void indexPriceStreamTest() throws ApiException, URISyntaxException, IOEx URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@indexPrice-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/pair@indexPriceupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -508,7 +508,7 @@ public void individualSymbolBookTickerStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@bookTicker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@bookTicker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -546,7 +546,7 @@ public void individualSymbolMiniTickerStreamTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@miniTicker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@miniTicker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -583,7 +583,7 @@ public void individualSymbolTickerStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -620,7 +620,7 @@ public void klineCandlestickStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -658,7 +658,7 @@ public void liquidationOrderStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@forceOrder-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@forceOrder-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -695,7 +695,7 @@ public void markPriceKlineCandlestickStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@markPriceKline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceKline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -732,7 +732,7 @@ public void markPriceOfAllSymbolsOfAPairTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/pair@markPriceupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -767,7 +767,7 @@ public void markPriceStreamTest() throws ApiException, URISyntaxException, IOExc URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -805,7 +805,7 @@ public void partialBookDepthStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@depth-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@indexPriceKline_-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair@indexPriceKline_interval-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@indexPriceKline_-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair@indexPriceKline_interval-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@indexPrice-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair@indexPriceupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@indexPrice-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair@indexPriceupdateSpeed-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair@markPriceupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair@markPriceupdateSpeed-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/_@continuousKline_-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair_contractType@continuousKline_interval-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/_@continuousKline_-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair_contractType@continuousKline_interval-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@aggTrade-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@aggTrade-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@aggTrade-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@aggTrade-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@bookTicker-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@bookTicker-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@bookTicker-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@bookTicker-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthupdateSpeed-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@forceOrder-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@forceOrder-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@forceOrder-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@forceOrder-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPriceKline_-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceKline_interval-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPriceKline_-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceKline_interval-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceupdateSpeed-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@miniTicker-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@miniTicker-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@miniTicker-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@miniTicker-test.json diff --git a/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json b/clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json similarity index 100% rename from clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json rename to clients/derivatives-trading-coin-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json diff --git a/clients/derivatives-trading-options/src/test/java/com/binance/connector/client/derivatives_trading_options/websocket/stream/api/WebsocketMarketStreamsApiTest.java b/clients/derivatives-trading-options/src/test/java/com/binance/connector/client/derivatives_trading_options/websocket/stream/api/WebsocketMarketStreamsApiTest.java index 47cb60eb..9afcacde 100644 --- a/clients/derivatives-trading-options/src/test/java/com/binance/connector/client/derivatives_trading_options/websocket/stream/api/WebsocketMarketStreamsApiTest.java +++ b/clients/derivatives-trading-options/src/test/java/com/binance/connector/client/derivatives_trading_options/websocket/stream/api/WebsocketMarketStreamsApiTest.java @@ -125,7 +125,7 @@ public void indexPriceStreamsTest() throws ApiException, URISyntaxException, IOE URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@index-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@index-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -162,7 +162,7 @@ public void klineCandlestickStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -197,7 +197,7 @@ public void markPriceTest() throws ApiException, URISyntaxException, IOException URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@markPrice-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -266,7 +266,7 @@ public void openInterestTest() throws ApiException, URISyntaxException, IOExcept URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@openInterest@-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@openInterest@expirationDate-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -304,7 +304,7 @@ public void partialBookDepthStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@depth-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -339,7 +339,7 @@ public void ticker24HourTest() throws ApiException, URISyntaxException, IOExcept URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -384,7 +384,7 @@ public void ticker24HourByUnderlyingAssetAndExpirationDataTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@ticker@-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@ticker@expirationDate-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -420,7 +420,7 @@ public void tradeStreamsTest() throws ApiException, URISyntaxException, IOExcept URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@trade-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@trade-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@index-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@index-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@index-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@index-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@trade-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@trade-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@trade-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@trade-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@markPrice-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@markPrice-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@openInterest@-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@openInterest@expirationDate-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@openInterest@-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@openInterest@expirationDate-test.json diff --git a/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker@-test.json b/clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@ticker@expirationDate-test.json similarity index 100% rename from clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker@-test.json rename to clients/derivatives-trading-options/src/test/resources/expected/stream/WebsocketMarketStreamsApi/underlyingAsset@ticker@expirationDate-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/java/com/binance/connector/client/derivatives_trading_usds_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java b/clients/derivatives-trading-usds-futures/src/test/java/com/binance/connector/client/derivatives_trading_usds_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java index 293cdb97..62f0e7d7 100644 --- a/clients/derivatives-trading-usds-futures/src/test/java/com/binance/connector/client/derivatives_trading_usds_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java +++ b/clients/derivatives-trading-usds-futures/src/test/java/com/binance/connector/client/derivatives_trading_usds_futures/websocket/stream/api/WebsocketMarketStreamsApiTest.java @@ -147,7 +147,7 @@ public void aggregateTradeStreamsTest() throws ApiException, URISyntaxException, URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@aggTrade-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@aggTrade-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -328,7 +328,7 @@ public void compositeIndexSymbolInformationStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@compositeIndex-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@compositeIndex-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -370,7 +370,7 @@ public void continuousContractKlineCandlestickStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/_@continuousKline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/pair_contractType@continuousKline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -439,7 +439,7 @@ public void diffBookDepthStreamsTest() throws ApiException, URISyntaxException, URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@depth-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@depthupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -476,7 +476,7 @@ public void individualSymbolBookTickerStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@bookTicker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@bookTicker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -514,7 +514,7 @@ public void individualSymbolMiniTickerStreamTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@miniTicker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@miniTicker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -551,7 +551,7 @@ public void individualSymbolTickerStreamsTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -588,7 +588,7 @@ public void klineCandlestickStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -626,7 +626,7 @@ public void liquidationOrderStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@forceOrder-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@forceOrder-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -661,7 +661,7 @@ public void markPriceStreamTest() throws ApiException, URISyntaxException, IOExc URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -696,7 +696,7 @@ public void markPriceStreamForAllMarketTest() URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/!markPrice@arr-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/markPrice@arrupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } @@ -768,7 +768,7 @@ public void partialBookDepthStreamsTest() throws ApiException, URISyntaxExceptio URL resource = WebsocketMarketStreamsApiTest.class.getResource( - "/expected/stream/WebsocketMarketStreamsApi/@depth-test.json"); + "/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); } diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/!markPrice@arr-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/markPrice@arrupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/!markPrice@arr-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/markPrice@arrupdateSpeed-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/_@continuousKline_-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair_contractType@continuousKline_interval-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/_@continuousKline_-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/pair_contractType@continuousKline_interval-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@aggTrade-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@aggTrade-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@aggTrade-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@aggTrade-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@bookTicker-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@bookTicker-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@bookTicker-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@bookTicker-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@compositeIndex-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@compositeIndex-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@compositeIndex-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@compositeIndex-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthlevelsupdateSpeed-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@depth-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@depthupdateSpeed-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@forceOrder-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@forceOrder-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@forceOrder-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@forceOrder-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@kline_-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@kline_interval-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceupdateSpeed-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@markPrice-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@markPriceupdateSpeed-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@miniTicker-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@miniTicker-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@miniTicker-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@miniTicker-test.json diff --git a/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json b/clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json similarity index 100% rename from clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/@ticker-test.json rename to clients/derivatives-trading-usds-futures/src/test/resources/expected/stream/WebsocketMarketStreamsApi/symbol@ticker-test.json diff --git a/clients/spot/src/test/java/com/binance/connector/client/spot/websocket/stream/api/WebSocketStreamsApiTest.java b/clients/spot/src/test/java/com/binance/connector/client/spot/websocket/stream/api/WebSocketStreamsApiTest.java index bdfec7ac..a0b95fd1 100644 --- a/clients/spot/src/test/java/com/binance/connector/client/spot/websocket/stream/api/WebSocketStreamsApiTest.java +++ b/clients/spot/src/test/java/com/binance/connector/client/spot/websocket/stream/api/WebSocketStreamsApiTest.java @@ -133,7 +133,7 @@ public void aggTradeTest() throws ApiException, URISyntaxException, IOException URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@aggTrade-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@aggTrade-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -168,7 +168,7 @@ public void allMarketRollingWindowTickerTest() URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/!ticker_@arr-test.json"); + "/expected/stream/WebSocketStreamsApi/ticker_window-size@arr-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -261,7 +261,7 @@ public void avgPriceTest() throws ApiException, URISyntaxException, IOException URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@avgPrice-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@avgPrice-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -294,7 +294,7 @@ public void bookTickerTest() throws ApiException, URISyntaxException, IOExceptio URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@bookTicker-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@bookTicker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -326,7 +326,7 @@ public void diffBookDepthTest() throws ApiException, URISyntaxException, IOExcep URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@depth-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@depthupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -362,7 +362,7 @@ public void klineTest() throws ApiException, URISyntaxException, IOException { URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@kline_-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@kline_interval-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -404,7 +404,7 @@ public void klineOffsetTest() throws ApiException, URISyntaxException, IOExcepti URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@kline_@+08:00-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@kline_interval@+0800-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -436,7 +436,7 @@ public void miniTickerTest() throws ApiException, URISyntaxException, IOExceptio URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@miniTicker-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@miniTicker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -470,7 +470,7 @@ public void partialBookDepthTest() throws ApiException, URISyntaxException, IOEx URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@depth-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@depthlevelsupdateSpeed-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -498,7 +498,7 @@ public void partialBookDepthUpdateSpeedTest() URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@depth-test_update_speed.json"); + "/expected/stream/WebSocketStreamsApi/symbol@depthlevelsupdateSpeed-test_update_speed.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -531,7 +531,7 @@ public void rollingWindowTickerTest() throws ApiException, URISyntaxException, I URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@ticker_-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@ticker_window-size-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -563,7 +563,7 @@ public void tickerTest() throws ApiException, URISyntaxException, IOException { URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@ticker-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@ticker-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); @@ -594,7 +594,7 @@ public void tradeTest() throws ApiException, URISyntaxException, IOException { URL resource = WebSocketStreamsApiTest.class.getResource( - "/expected/stream/WebSocketStreamsApi/@trade-test.json"); + "/expected/stream/WebSocketStreamsApi/symbol@trade-test.json"); String expectedJson = Files.readString(Paths.get(resource.toURI())); JSONAssert.assertEquals(expectedJson, sentPayload, true); diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@aggTrade-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@aggTrade-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@aggTrade-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@aggTrade-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@avgPrice-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@avgPrice-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@avgPrice-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@avgPrice-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@bookTicker-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@bookTicker-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@bookTicker-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@bookTicker-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@depth-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@depthlevelsupdateSpeed-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@depth-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@depthlevelsupdateSpeed-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@depth-test_update_speed.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@depthlevelsupdateSpeed-test_update_speed.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@depth-test_update_speed.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@depthlevelsupdateSpeed-test_update_speed.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@depth-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@depthupdateSpeed-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@depth-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@depthupdateSpeed-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@kline_-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@kline_interval-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@kline_-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@kline_interval-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@kline_@+08:00-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@kline_interval@+0800-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@kline_@+08:00-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@kline_interval@+0800-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@miniTicker-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@miniTicker-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@miniTicker-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@miniTicker-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@ticker-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@ticker-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@ticker-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@ticker-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@ticker_-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@ticker_window-size-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@ticker_-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@ticker_window-size-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@trade-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@trade-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/@trade-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/symbol@trade-test.json diff --git a/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/!ticker_@arr-test.json b/clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/ticker_window-size@arr-test.json similarity index 100% rename from clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/!ticker_@arr-test.json rename to clients/spot/src/test/resources/expected/stream/WebSocketStreamsApi/ticker_window-size@arr-test.json