🚨 unit tests for parser and interpreter

Author: igorkulman

SwiftPascalInterpreter/SwiftPascalInterpreterTests/InterpreterTests.swift

@@ -7,28 +7,27 @@
 //
 
 import Foundation
-
 import Foundation
-import XCTest
 @testable import SwiftPascalInterpreter
+import XCTest
 
 class InterpreterTests: XCTestCase {
     func testSingleInteger() {
         let interpeter = Interpreter("3")
-        let result = interpeter.expr()
+        let result = interpeter.eval()
         XCTAssert(result == 3)
     }
 
     func testMultipleIntegers() {
         let interpeter = Interpreter("1+2*3")
-        let result = interpeter.expr()
+        let result = interpeter.eval()
         XCTAssert(result == 7)
     }
 
     func testParentheses() {
-        XCTAssert(Interpreter("2 * (7 + 3)").expr() == 20)
-        XCTAssert(Interpreter("7 + 3 * (10 / (12 / (3 + 1) - 1))").expr() == 22)
-        XCTAssert(Interpreter("7 + 3 * (10 / (12 / (3 + 1) - 1)) / (2 + 3) - 5 - 3 + (8)").expr() == 10)
-        XCTAssert(Interpreter("7 + (((3 + 2)))").expr() == 12)
+        XCTAssert(Interpreter("2 * (7 + 3)").eval() == 20)
+        XCTAssert(Interpreter("7 + 3 * (10 / (12 / (3 + 1) - 1))").eval() == 22)
+        XCTAssert(Interpreter("7 + 3 * (10 / (12 / (3 + 1) - 1)) / (2 + 3) - 5 - 3 + (8)").eval() == 10)
+        XCTAssert(Interpreter("7 + (((3 + 2)))").eval() == 12)
     }
 }

SwiftPascalInterpreter/SwiftPascalInterpreterTests/ParserTests.swift

@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import XCTest
 @testable import SwiftPascalInterpreter
+import XCTest
 
 class ParserTests: XCTestCase {
     func testNumber() {
@@ -18,6 +18,25 @@ class ParserTests: XCTestCase {
         XCTAssert(result == node)
     }
 
+    func testBinaryOperation() {
+        let three = AST.number(3)
+        let two = AST.number(2)
+        let multiplication = AST.binaryOperation(left: three, operation: .mult, right: two)
+        let node = AST.binaryOperation(left: multiplication, operation: .div, right: two)
+        let parser = Parser("3 * 2 / 2")
+        let result = parser.expr()
+        XCTAssert(result == node)
+    }
+
+    func testBinaryOperationOnSamePriority() {
+        let one = AST.number(1)
+        let sum = AST.binaryOperation(left: one, operation: .plus, right: one)
+        let node = AST.binaryOperation(left: sum, operation: .plus, right: one)
+        let parser = Parser("1 + 1 + 1")
+        let result = parser.expr()
+        XCTAssert(result == node)
+    }
+
     func testBinaryOperationOnTwoNumberAndParentheses() {
         let one = AST.number(1)
         let two = AST.number(2)