From b73830333b273ac44f38dcf9c252fa22af788384 Mon Sep 17 00:00:00 2001
From: kosyloa <alekskosylo@gmail.com>
Date: Fri, 12 Apr 2024 14:57:50 +0200
Subject: [PATCH] add test for normalize symbol

---
 .../Events/Market/Candles/CandleSymbol.swift  | 10 ++++++++++
 .../Market/Candles/MarketEventSymbols.swift   |  4 ++++
 DXFeedFrameworkTests/CandleTests.swift        | 20 +++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/DXFeedFramework/Events/Market/Candles/CandleSymbol.swift b/DXFeedFramework/Events/Market/Candles/CandleSymbol.swift
index dca9d8f22..30061a86f 100644
--- a/DXFeedFramework/Events/Market/Candles/CandleSymbol.swift
+++ b/DXFeedFramework/Events/Market/Candles/CandleSymbol.swift
@@ -105,6 +105,16 @@ public class CandleSymbol: CustomStringConvertible {
     public static func valueOf(_ symbol: String, _ properties: [ICandleSymbolProperty]) -> CandleSymbol {
         return CandleSymbol(symbol, properties)
     }
+
+    /// Converts the given string symbol into the candle symbol object with the specified attribute set.
+    ///
+    /// - Parameters:
+    ///  - symbol:The string symbol.
+    ///  - attributes: The attributes variadic.
+    /// - Throws: ArgumentException/invalidOperationException(_:)
+    public static func valueOf(_ symbol: String, _ properties: ICandleSymbolProperty...) -> CandleSymbol {
+        return CandleSymbol(symbol, properties)
+    }
 }
 
 extension CandleSymbol: Equatable {
diff --git a/DXFeedFramework/Events/Market/Candles/MarketEventSymbols.swift b/DXFeedFramework/Events/Market/Candles/MarketEventSymbols.swift
index 43ded71eb..2186fb885 100644
--- a/DXFeedFramework/Events/Market/Candles/MarketEventSymbols.swift
+++ b/DXFeedFramework/Events/Market/Candles/MarketEventSymbols.swift
@@ -292,6 +292,8 @@ public class MarketEventSymbols {
                         symbol[0..<index] +
                         "\(key)\(Separtors.value.rawValue)\(value)" +
                         symbol[jindex-1..<symbol.length]
+                        added = true
+                        index += key.length + value.length + 2
                     }
                 } else {
                     if current > key && !added {
@@ -306,6 +308,8 @@ public class MarketEventSymbols {
                         index = jindex
                     }
                 }
+            } else {
+                print("NULLL")
             }
         }
         return added ? symbol : (symbol[0..<index-1] +
diff --git a/DXFeedFrameworkTests/CandleTests.swift b/DXFeedFrameworkTests/CandleTests.swift
index 5d26aedfa..66b42084d 100644
--- a/DXFeedFrameworkTests/CandleTests.swift
+++ b/DXFeedFrameworkTests/CandleTests.swift
@@ -239,6 +239,26 @@ final class CandleTests: XCTestCase {
         XCTAssert(testSymbol?.period?.type == .day && testSymbol?.period?.value == 12)
         XCTAssert(testSymbol == CandleSymbol.valueOf("TEST123", [CandlePeriod.valueOf(value: 12, type: .day)]))
         XCTAssert(CandleSymbol.valueOf("TEST1", [CandlePrice.ask]).toString() == "TEST1{price=ask}")
+
+
+    }
+
+    func testNormalize() {
+        XCTAssertEqual("IBM&E", CandleSymbol.valueOf("IBM", CandleExchange.valueOf("E")).toString())
+        XCTAssertEqual("IBM", CandleSymbol.valueOf("IBM", CandleExchange.composite).toString())
+
+        XCTAssertEqual("IBM{=d}", CandleSymbol.valueOf("IBM", CandlePeriod.day).toString())
+        XCTAssertEqual("IBM", CandleSymbol.valueOf("IBM", CandlePeriod.tick).toString())
+
+        XCTAssertEqual("IBM{price=ask}", CandleSymbol.valueOf("IBM", [CandlePrice.ask]).toString())
+        XCTAssertEqual("IBM", CandleSymbol.valueOf("IBM", [CandlePrice.last]).toString())
+
+        XCTAssertEqual("EUR/USD{=2h,price=bid,source=bank}",
+                       CandleSymbol.valueOf("EUR/USD{source=bank}",
+                                            [CandlePrice.bid, CandlePeriod.valueOf(value: 2, type: CandleType.hour)]).toString())
+        XCTAssertEqual("IBM{=15m,aa=zz,price=bid}",
+                       CandleSymbol.valueOf("IBM{aa=zz,price=b}",
+                                            [CandlePeriod.valueOf(value: 15, type: CandleType.minute)]).toString())
     }
 }