Skip to content
Snippets Groups Projects
Commit 87bab76b authored by Lukas Domeisen's avatar Lukas Domeisen
Browse files

fixed test

parent 8fcaf292
No related branches found
No related tags found
1 merge request!17Implement Marks Module
Pipeline #2616 passed with stages
in 25 minutes and 27 seconds
......@@ -73,10 +73,8 @@ public class MarksOverviewViewModelTest
[Test]
public void OnSelectedSemesterChangedTest()
{
Thread.Sleep(1000); // wait for ContinueWith to finish in constructor (better alternative?)
vm.SelectedSemester = semester2;
Thread.Sleep(1000); // wait for ContinueWith to finish in LoadSemesterOverview (better alternative?)
var actualId = vm.Marks[0].Id;
var expectedId= semester2Marks[0].Id;
Assert.That(actualId, Is.EqualTo(expectedId));
......
......@@ -56,29 +56,24 @@ public partial class MarksOverviewViewModel : ObservableObject
LoadSemesterOverview();
}
private void InitializeSemesterData()
private async void InitializeSemesterData()
{
//CreateMockData(); // TODO: remove this when not needed anymore
_semesterRepository.GetAll().ContinueWith(t =>
{
Semesters = new ObservableCollection<Semester>(t.Result);
SelectedSemester = Semesters[0]; // TODO: get actual current semester
});
var result = await _semesterRepository.GetAll();
Semesters = new ObservableCollection<Semester>(result);
SelectedSemester = Semesters[0]; // TODO: get actual current
}
private void LoadSemesterOverview()
private async void LoadSemesterOverview()
{
// TODO: if SelectedSemester is null, show text 'Select a semester'
var result = await _courseRepository.GetAll();
var semesterCourses = result.Where(c => c.SemesterId == SelectedSemester.Id).ToList();
var semesterMarks = GetMarksFromCourses(semesterCourses);
_courseRepository.GetAll().ContinueWith(t =>
{
var semesterCourses = t.Result.Where(c => c.SemesterId == SelectedSemester.Id).ToList();
var semesterMarks = GetMarksFromCourses(semesterCourses);
Marks = new ObservableCollection<Mark>(semesterMarks);
SemesterEcts = GetObtainedEcts(semesterCourses);
SemesterAverageMark = AverageMarkConverter.MarksToAverage(semesterMarks);
});
Marks = new ObservableCollection<Mark>(semesterMarks);
SemesterEcts = GetObtainedEcts(semesterCourses);
SemesterAverageMark = AverageMarkConverter.MarksToAverage(semesterMarks);
}
private void LoadTotalOverview()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment