Skip to content

Tests/unit tests #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2020
Merged

Tests/unit tests #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df0b3b7
Add unit tests of BrainstormingViewModel
EdgSgroi Jul 13, 2020
247f578
Fix the convert to matrix function
VicFalcetta Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Blink/Blink.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
4F5F131124B6659A00A7D9E7 /* BrainstormingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F5F131024B6659A00A7D9E7 /* BrainstormingViewModel.swift */; };
4F5F131324B78BCB00A7D9E7 /* VotingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F5F131224B78BCB00A7D9E7 /* VotingViewModel.swift */; };
4F5F131524B8DDB500A7D9E7 /* VotingViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F5F131424B8DDB500A7D9E7 /* VotingViewModelTests.swift */; };
4F5F131724BCCE9600A7D9E7 /* BrainstormingViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F5F131624BCCE9600A7D9E7 /* BrainstormingViewModelTests.swift */; };
A418231A24B39DDF0082962F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A418231924B39DDF0082962F /* AppDelegate.swift */; };
A418231C24B39DDF0082962F /* MenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A418231B24B39DDF0082962F /* MenuView.swift */; };
A418231E24B39DE10082962F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A418231D24B39DE10082962F /* Assets.xcassets */; };
Expand Down Expand Up @@ -74,6 +75,7 @@
4F5F131024B6659A00A7D9E7 /* BrainstormingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrainstormingViewModel.swift; sourceTree = "<group>"; };
4F5F131224B78BCB00A7D9E7 /* VotingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VotingViewModel.swift; sourceTree = "<group>"; };
4F5F131424B8DDB500A7D9E7 /* VotingViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VotingViewModelTests.swift; sourceTree = "<group>"; };
4F5F131624BCCE9600A7D9E7 /* BrainstormingViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrainstormingViewModelTests.swift; sourceTree = "<group>"; };
A418231624B39DDF0082962F /* Blink.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Blink.app; sourceTree = BUILT_PRODUCTS_DIR; };
A418231924B39DDF0082962F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
A418231B24B39DDF0082962F /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -359,6 +361,7 @@
A418232E24B39DE10082962F /* BlinkTests.swift */,
A418233024B39DE10082962F /* Info.plist */,
4F5F131424B8DDB500A7D9E7 /* VotingViewModelTests.swift */,
4F5F131624BCCE9600A7D9E7 /* BrainstormingViewModelTests.swift */,
);
path = BlinkTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -575,6 +578,7 @@
buildActionMask = 2147483647;
files = (
A418232F24B39DE10082962F /* BlinkTests.swift in Sources */,
4F5F131724BCCE9600A7D9E7 /* BrainstormingViewModelTests.swift in Sources */,
4F5F131524B8DDB500A7D9E7 /* VotingViewModelTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
21 changes: 16 additions & 5 deletions Blink/Blink/Brainstorming/ViewModels/BrainstormingViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,27 @@ class BrainstormingViewModel: NSObject, ObservableObject {
/// This function is called with the following parameters:
/// - Parameter ideas: The String array that contains the ideas sent through P2P connection.
func convertIdeasArrayInMatrix(ideas: [String]) -> [[String]] {
var matrixIdeas: [[String]] = [[String]]()
var matrixIdeas: [[String]] = []
var colIndex: Int = 0
var rowIndex: Int = 0
var ideaArray: [String] = []
for idea in ideas {
if colIndex == 3 {
matrixIdeas.append(ideaArray)
ideaArray = []
colIndex = 0

if ideaArray.isEmpty {
ideaArray.append(idea)
colIndex += 1
}

} else {
ideaArray.append(idea)
colIndex += 1
}
matrixIdeas[rowIndex].append(idea)
rowIndex += 1
colIndex += 1
}
if ideaArray.isEmpty == false {
matrixIdeas.append(ideaArray)
}
return matrixIdeas
}
Expand Down
21 changes: 1 addition & 20 deletions Blink/BlinkTests/BlinkTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,5 @@ import XCTest

class BlinkTests: XCTestCase {

override func setUpWithError() throws {
// Put setup code here. This method is called before the invocation of each test method in the class.
}

override func tearDownWithError() throws {
// Put teardown code here. This method is called after the invocation of each test method in the class.
}

func testExample() throws {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}

func testPerformanceExample() throws {
// This is an example of a performance test case.
self.measure {
// Put the code you want to measure the time of here.
}
}


}
44 changes: 44 additions & 0 deletions Blink/BlinkTests/BrainstormingViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// BrainstormingViewModelTests.swift
// BlinkTests
//
// Created by Edgar Sgroi on 13/07/20.
// Copyright © 2020 Artur Carneiro. All rights reserved.
//

import XCTest
@testable import Blink

class BrainstormingViewModelTests: XCTestCase {

func testConvertIdeasArrayInMatrix() {
let viewModel = BrainstormingViewModel()
let icecreams = ["Napolitano", "Milho", "Creme", "Chocolate", "Morango", "Limão", "Banana", "Açaí", "Chiclete"]

XCTAssertFalse(icecreams.isEmpty)

let resultIcecreams = viewModel.convertIdeasArrayInMatrix(ideas: icecreams)
XCTAssertFalse(resultIcecreams.isEmpty)

let expectedResultIcecreams = [["Napolitano", "Milho", "Creme"], ["Chocolate", "Morango", "Limão"], ["Banana", "Açaí", "Chiclete"]]
for indexRow in 0..<expectedResultIcecreams.count {
for indexIdea in 0..<expectedResultIcecreams[indexRow].count {
XCTAssertEqual(expectedResultIcecreams[indexRow][indexIdea], resultIcecreams[indexRow][indexIdea])
}
}

let pizzas = ["Calabresa", "Napolitana", "Portuguesa", "Berinjela", "Toscana"]

XCTAssertFalse(pizzas.isEmpty)

let resultPizzas = viewModel.convertIdeasArrayInMatrix(ideas: pizzas)
XCTAssertFalse(resultPizzas.isEmpty)

let expectedResultPizzas = [["Calabresa", "Napolitana", "Portuguesa"], ["Berinjela", "Toscana"]]
for indexRow in 0..<expectedResultPizzas.count {
for indexIdea in 0..<expectedResultPizzas[indexRow].count {
XCTAssertEqual(expectedResultPizzas[indexRow][indexIdea], resultPizzas[indexRow][indexIdea])
}
}
}
}