Skip to content
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

Jump to bottom

#100 add more tests #107

Merged
merged 5 commits into from
Mar 13, 2024
Merged

#100 add more tests #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a798d3
Sort Tests
DragonCat4012 Mar 13, 2024
96e30a4
Add Tests
DragonCat4012 Mar 13, 2024
6963742
Add Json tests
DragonCat4012 Mar 13, 2024
e38e1c4
remove feedbackservice
DragonCat4012 Mar 13, 2024
f196a3b
rejove feedbackService
DragonCat4012 Mar 13, 2024
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
2 changes: 1 addition & 1 deletion .swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ disabled_rules:
- function_body_length
- for_where
- multiple_closures_with_trailing_closure
- class_delegate_protocol

excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
Expand All @@ -21,4 +22,3 @@ excluded: # paths to ignore during linting. Takes precedence over `included`.
- UserTest+CoreDataProperties.swift
- GradeType+CoreDataProperties.swift
- AppSettings+CoreDataProperties.swift
- class_delegate_protocol
24 changes: 20 additions & 4 deletions Calq.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
F1A53D002A196BFF0045C5B0 /* ListBackgroundModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A53CFF2A196BFF0045C5B0 /* ListBackgroundModifier.swift */; };
F1A53D032A196C220045C5B0 /* WeightViewmodel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A53D022A196C220045C5B0 /* WeightViewmodel.swift */; };
F1A59A3E2A6347880039C95E /* ToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A59A3D2A6347880039C95E /* ToastView.swift */; };
F1A6BC422B543A59001BD833 /* FeedbackService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A6BC412B543A59001BD833 /* FeedbackService.swift */; };
F1A6BC442B543B47001BD833 /* Reachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A6BC432B543B47001BD833 /* Reachability.swift */; };
F1A6BC462B543DBB001BD833 /* Util+Sorting.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A6BC452B543DBB001BD833 /* Util+Sorting.swift */; };
F1A7102B2A4345BF00255F10 /* NewGradeVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A7102A2A4345BF00255F10 /* NewGradeVM.swift */; };
Expand Down Expand Up @@ -99,6 +98,9 @@
F1B8018B2AADD9EA003DBE47 /* exampleData_v2.json in Resources */ = {isa = PBXBuildFile; fileRef = F1B8018A2AADD9EA003DBE47 /* exampleData_v2.json */; };
F1BC83E92AA78F17000D7CD2 /* JSONTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BC83E82AA78F17000D7CD2 /* JSONTests.swift */; };
F1BD15712BA1A7FE00CE570D /* NSManagedObjectExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD15702BA1A7FE00CE570D /* NSManagedObjectExtension.swift */; };
F1BD15752BA1B83800CE570D /* GradeTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD15742BA1B83800CE570D /* GradeTypeTests.swift */; };
F1BD15772BA1B86600CE570D /* SubjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD15762BA1B86600CE570D /* SubjectTests.swift */; };
F1BD15792BA1B87300CE570D /* CoreDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD15782BA1B87300CE570D /* CoreDataTests.swift */; };
F1BD65A32B6296DB003B8D34 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD65A22B6296DB003B8D34 /* DateExtension.swift */; };
F1BD65A52B6296FB003B8D34 /* BackupJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD65A42B6296FB003B8D34 /* BackupJSON.swift */; };
F1BD65A62B629991003B8D34 /* BackupJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BD65A42B6296FB003B8D34 /* BackupJSON.swift */; };
Expand Down Expand Up @@ -207,7 +209,6 @@
F1A53CFF2A196BFF0045C5B0 /* ListBackgroundModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListBackgroundModifier.swift; sourceTree = "<group>"; };
F1A53D022A196C220045C5B0 /* WeightViewmodel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightViewmodel.swift; sourceTree = "<group>"; };
F1A59A3D2A6347880039C95E /* ToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastView.swift; sourceTree = "<group>"; };
F1A6BC412B543A59001BD833 /* FeedbackService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackService.swift; sourceTree = "<group>"; };
F1A6BC432B543B47001BD833 /* Reachability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reachability.swift; sourceTree = "<group>"; };
F1A6BC452B543DBB001BD833 /* Util+Sorting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Util+Sorting.swift"; sourceTree = "<group>"; };
F1A7102A2A4345BF00255F10 /* NewGradeVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewGradeVM.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -243,6 +244,9 @@
F1B8018A2AADD9EA003DBE47 /* exampleData_v2.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = exampleData_v2.json; sourceTree = "<group>"; };
F1BC83E82AA78F17000D7CD2 /* JSONTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONTests.swift; sourceTree = "<group>"; };
F1BD15702BA1A7FE00CE570D /* NSManagedObjectExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSManagedObjectExtension.swift; sourceTree = "<group>"; };
F1BD15742BA1B83800CE570D /* GradeTypeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradeTypeTests.swift; sourceTree = "<group>"; };
F1BD15762BA1B86600CE570D /* SubjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubjectTests.swift; sourceTree = "<group>"; };
F1BD15782BA1B87300CE570D /* CoreDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataTests.swift; sourceTree = "<group>"; };
F1BD65A22B6296DB003B8D34 /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = "<group>"; };
F1BD65A42B6296FB003B8D34 /* BackupJSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackupJSON.swift; sourceTree = "<group>"; };
F1BE91C12A41DF2A00E85494 /* SubjectListVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubjectListVM.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -372,7 +376,6 @@
F14140472A476408007E4648 /* AppStoreRating.swift */,
F1A05C5E2A642670003734F2 /* StringExtension.swift */,
F1C2CAD72B22620E00C51D15 /* SegmentedPickerView.swift */,
F1A6BC412B543A59001BD833 /* FeedbackService.swift */,
F1A6BC432B543B47001BD833 /* Reachability.swift */,
F1A6BC452B543DBB001BD833 /* Util+Sorting.swift */,
F1BD65A22B6296DB003B8D34 /* DateExtension.swift */,
Expand Down Expand Up @@ -484,6 +487,7 @@
F1B386452A1CFE6800F0C5AC /* CalqTests */ = {
isa = PBXGroup;
children = (
F1BD15732BA1B81700CE570D /* Util */,
F1B52D162A323BCB0082DEBE /* MockCoreDataStack.swift */,
F1B386462A1CFE6800F0C5AC /* CalqTests.swift */,
F1B292DE2A3BC1DF00AF2ACD /* MockDataProvider.swift */,
Expand All @@ -505,6 +509,16 @@
path = Backup;
sourceTree = "<group>";
};
F1BD15732BA1B81700CE570D /* Util */ = {
isa = PBXGroup;
children = (
F1BD15742BA1B83800CE570D /* GradeTypeTests.swift */,
F1BD15762BA1B86600CE570D /* SubjectTests.swift */,
F1BD15782BA1B87300CE570D /* CoreDataTests.swift */,
);
path = Util;
sourceTree = "<group>";
};
F1BE91C32A41DF3200E85494 /* SubjectList */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -811,7 +825,6 @@
F17F4442298C4DDF000A3993 /* TabView.swift in Sources */,
F1B0B16A299648A200F3D1FD /* EditSubjectScreen.swift in Sources */,
F1A7723F2A1795C6004B8DCC /* UserTest+CoreDataProperties.swift in Sources */,
F1A6BC422B543A59001BD833 /* FeedbackService.swift in Sources */,
F1B0B16E29968D4700F3D1FD /* FirstLaunchScreen.swift in Sources */,
F192DD24299D10CB0077B905 /* NewSubject.swift in Sources */,
F1B2732429B5F53900E841F4 /* ButtonStyle.swift in Sources */,
Expand Down Expand Up @@ -844,12 +857,15 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F1BD15772BA1B86600CE570D /* SubjectTests.swift in Sources */,
F1BD15752BA1B83800CE570D /* GradeTypeTests.swift in Sources */,
F1B52D172A323BCB0082DEBE /* MockCoreDataStack.swift in Sources */,
F1DD87EE2AA795910095C057 /* LineChartTests.swift in Sources */,
F1B292DF2A3BC1DF00AF2ACD /* MockDataProvider.swift in Sources */,
F1B386472A1CFE6800F0C5AC /* CalqTests.swift in Sources */,
F1DD87F02AA799700095C057 /* BarChartTests.swift in Sources */,
F1BC83E92AA78F17000D7CD2 /* JSONTests.swift in Sources */,
F1BD15792BA1B87300CE570D /* CoreDataTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
35 changes: 0 additions & 35 deletions Calq/Screens/SettingsScreens/SettingsScreen/SettingsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ struct SettingsScreen: View {
}
}
}
.sheet(isPresented: $vm.showFeedbackSheet, content: {
feeedbackSheet()
})
.alert(isPresented: $vm.deleteAlert) {
settingsAlert()
}
Expand Down Expand Up @@ -137,10 +134,6 @@ struct SettingsScreen: View {
UIApplication.shared.open(url)
}
})

/* SettingsIcon(color: Color(hexString: "c14f9f"), icon: "bubble.right.fill", text: "settings.feedback.title") {
vm.showFeedbackSheet = true
}*/
}
}

Expand Down Expand Up @@ -219,34 +212,6 @@ struct SettingsScreen: View {
}.buttonStyle(MenuPickerDestructive())
}
}

func feeedbackSheet() -> some View {
VStack {
Text("settings.feedback.title")
.font(.headline)

if vm.feedbackError {
Text("settings.feedback.error")
.foregroundColor(.red)
}

TextEditor(text: $vm.feedbackContent)
.multilineTextAlignment(.leading)
.background(Color.gray.opacity(0.3))
.cornerRadius(8)
.frame(minHeight: 50)
.shadow(radius: 5)

Text("\(vm.feedbackContent.count)settings.feedback.textlimit")
.foregroundColor(vm.feedbackContent.count >= 1000 ? .red : .gray)
.font(.footnote)

Button("settings.feedback.button", action: {
vm.sendFeedback()
}).disabled(vm.feedbackContent.count >= 1000)
.buttonStyle(PrimaryStyle())
}.padding()
}
}

struct SettingsIcon: View {
Expand Down
10 changes: 0 additions & 10 deletions Calq/Screens/SettingsScreens/SettingsScreen/SettingsVM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,4 @@ class SettingsViewModel: ObservableObject {
selectedSubjet = subject
editSubjectPresented = true
}

func sendFeedback() {
if FeedbackService.sendFeedback(feedbackContent) {
showFeedbackSheet = false
feedbackContent = "ABC"
feedbackError = false
} else {
feedbackError = true
}
}
}
54 changes: 0 additions & 54 deletions Calq/lib/FeedbackService.swift
View file
Open in desktop

This file was deleted.

149 changes: 3 additions & 146 deletions CalqTests/CalqTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,148 +69,13 @@ final class CalqTests: XCTestCase {
XCTAssertEqual( UserDefaults.standard.integer(forKey: UD_primaryType), 1)
}

// MARK: CoreData
func testDeleteData() {
Util.deleteSettings()

let count = Util.getAllSubjects().count
XCTAssertEqual(count, 0)
let types = Util.getTypes().count
XCTAssertEqual(types, 2)
}

// MARK: Averages
func testAverageString() {
let average = Util.averageString(MockDataProvider.getSubjectWithTests())
XCTAssertEqual(average, "-- 11 -- -- ")
}

func testAverageString_WithoutTests() {
let average = Util.averageString(MockDataProvider.getSubjectWithoutTests())
XCTAssertEqual(average, "-- -- -- -- ")
}

// MARK: Inactive Year funcs
func testDeactivateHalfyear() {
JSON.loadDemoData()

let before = Util.getinactiveYears(getExampleSub())
XCTAssertEqual(before.count, 0)

let subject = Util.addYear(getExampleSub(), 3)
let after = Util.getinactiveYears(subject)

XCTAssertEqual(after.count, 1)
let subject = getExampleSub()
XCTAssertEqual(Util.averageString(subject), "15 15 14 15")
}

func testAddInactiveHalfyearTwice() {
JSON.loadDemoData()

Util.addYear(getExampleSub(), 3)
let firstResult = Util.getinactiveYears(getExampleSub())
XCTAssertEqual(firstResult.count, 1)

Util.addYear(getExampleSub(), 3)

let secondResult = Util.getinactiveYears(getExampleSub())
XCTAssertEqual(secondResult.count, 1)
}

func testRemoveNotAddedInactiveHalfyear() {
JSON.loadDemoData()

Util.addYear(getExampleSub(), 3)
let firstResult = Util.getinactiveYears(getExampleSub())
XCTAssertEqual(firstResult.count, 1)

Util.removeYear(getExampleSub(), 4)

let secondResult = Util.getinactiveYears(getExampleSub())
XCTAssertEqual(secondResult.count, 1)
}

func testLastActiveYear() {
JSON.loadDemoData()
let lastYear = Util.lastActiveYear(getExampleSub())
XCTAssertEqual(lastYear, 4)
}

// MARK: Subjects
func testDeleteSubject() {
JSON.loadDemoData()

guard let subject = Util.getAllSubjects().randomElement() else {
return assertionFailure("No Subject")
}
Util.deleteSubject(subject)
XCTAssertTrue(Util.getAllSubjects().filter { $0.name == subject.name}.isEmpty)
}

// MARK: GradeTypes
func testGetDefaultTypes() {
let types = Util.getTypes()
XCTAssertEqual(types.count, 2)
XCTAssertEqual(types.filter {$0.name == "Test" || $0.name == "Klausur"}.count, 2)
}

func testAddType_MoreThen100Percent() {
Util.addType(name: "someName", weigth: 0)
XCTAssertNotNil(Util.getTypes().filter {$0.name == "someName"})
}

func testAddType() {
Util.addType(name: "someName", weigth: 200)
XCTAssertNotNil(Util.getTypes().filter {$0.name == "someName"})
}

func testDeleteType() {
guard let gradeType = Util.getTypes().first else {
return assertionFailure("No type :c")
}
Util.deleteType(type: gradeType)
XCTAssertTrue(Util.getTypes().filter {$0.name == gradeType.name}.isEmpty)
}

func testDeleteTypeById() {
guard let gradeType = Util.getTypes().first else {
return assertionFailure("No type :c")
}
Util.deleteType(type: gradeType.id)
XCTAssertTrue(Util.getTypes().filter {$0.name == gradeType.name}.isEmpty)
}

func testEditTypes() {
// add type
Util.addType(name: "someName", weigth: 0)
let type = Util.getTypes().filter {$0.name == "someName"}[0]
// remove random type
Util.deleteType(type: type.id)
XCTAssertTrue(Util.getTypes().filter {$0.name == "someName"}.isEmpty)
}

func testGetTypes() {
XCTAssertGreaterThan(Util.getTypes().count, 1)
}

func testGetTypes_WhenOnly1Exists() {
Util.deleteSettings()
JSON.loadDemoData()

let type = Util.getTypes().first!
Util.deleteType(type: type)
XCTAssertEqual(Util.getTypes().count, 2)
}

func testgetTypeGrades() {
XCTAssertNotNil(Util.getTypeGrades(0))
}

func testIsPrimaryType() {
JSON.loadDemoData()
let type = Util.getTypes().filter { $0.name == "Klausur"}.first!
XCTAssertTrue(Util.isPrimaryType(type))
}

// MARK: idk random
func testGetSubjectAverage() {
JSON.loadDemoData()
if let sub = Util.getAllSubjects().filter({ $0.name == "Kunst"}).first {
Expand Down Expand Up @@ -279,12 +144,4 @@ final class CalqTests: XCTestCase {

XCTAssertEqual(Util.generalAverage(), 0.0)
}

func testDeleteTest() {
let sub = MockDataProvider.getSubjectWithTests()
XCTAssertEqual(sub.subjecttests?.count, 1)

Util.deleteTest((sub.subjecttests?.allObjects.first!)! as! UserTest)
XCTAssertEqual(sub.subjecttests?.count, 0)
}
}
Loading
Loading