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.

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

Development: Shorten e2e test duration #6833

Merged
merged 6 commits into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
10 changes: 5 additions & 5 deletions src/test/cypress/e2e/course/CourseCommunication.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('Course communication', () => {
courseCommunication.newPost();
courseCommunication.selectContextInModal(CourseWideContext.ORGANIZATION);
courseCommunication.setTitleInModal('Cypress Test Post');
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
courseCommunication.setContentInModal(text);
});
courseCommunication.save();
Expand Down Expand Up @@ -257,7 +257,7 @@ describe('Course communication', () => {
it('students should be able to create posts within exercises', () => {
cy.login(studentOne, `/courses/${course.id}/exercises/${textExercise.id}`);
courseCommunication.newPost();
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
courseCommunication.setContentInline(text);
});
courseCommunication.save();
Expand Down Expand Up @@ -373,7 +373,7 @@ describe('Course communication', () => {
it('students should be able to create posts within lectures', () => {
cy.login(studentOne, `/courses/${course.id}/lectures/${lecture.id}`);
courseCommunication.newPost();
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
courseCommunication.setContentInline(text);
});
courseCommunication.save();
Expand Down Expand Up @@ -494,7 +494,7 @@ describe('Course communication', () => {
it('students should be able to create messages within exercises', () => {
cy.login(studentOne, `/courses/${courseWithMessaging.id}/exercises/${textExercise.id}`);
courseCommunication.newPost();
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
courseCommunication.setContentInline(text);
});
courseCommunication.saveMessage();
Expand Down Expand Up @@ -565,7 +565,7 @@ describe('Course communication', () => {
it('students should be able to create messages within lecture', () => {
cy.login(studentOne, `/courses/${courseWithMessaging.id}/lectures/${lecture.id}`);
courseCommunication.newPost();
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
courseCommunication.setContentInline(text);
});
courseCommunication.saveMessage();
Expand Down
4 changes: 2 additions & 2 deletions src/test/cypress/e2e/exam/ExamAssessment.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('Exam assessment', () => {
// For some reason the typing of cypress gets slower the longer the test runs, so we test the programming exercise first
describe('Programming exercise assessment', () => {
before('Prepare exam', () => {
examEnd = dayjs().add(3, 'minutes');
examEnd = dayjs().add(1, 'minutes');
prepareExam(course, examEnd, EXERCISE_TYPE.Programming);
});

Expand Down Expand Up @@ -188,7 +188,7 @@ function prepareExam(course: Course, end: dayjs.Dayjs, exerciseType: EXERCISE_TY
additionalData = { submission: partiallySuccessful, progExerciseAssessmentType: ProgrammingExerciseAssessmentType.SEMI_AUTOMATIC };
break;
case EXERCISE_TYPE.Text:
additionalData = { textFixture: 'loremIpsum.txt' };
additionalData = { textFixture: 'loremIpsum-short.txt' };
break;
case EXERCISE_TYPE.Quiz:
additionalData = { quizExerciseID: 0 };
Expand Down
4 changes: 2 additions & 2 deletions src/test/cypress/e2e/exam/ExamDateVerification.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('Exam date verification', () => {
cy.contains(exam.title!).should('be.visible');
examStartEnd.startExam();
examNavigation.openExerciseAtIndex(0);
cy.fixture('loremIpsum.txt').then((submission) => {
cy.fixture('loremIpsum-short.txt').then((submission) => {
textExerciseEditor.typeSubmission(exercise.id, submission);
});
examNavigation.clickSave();
Expand All @@ -111,7 +111,7 @@ describe('Exam date verification', () => {
cy.contains(exam.title!).should('be.visible');
examStartEnd.startExam();
examNavigation.openExerciseAtIndex(0);
cy.fixture('loremIpsum.txt').then((submissionText) => {
cy.fixture('loremIpsum-short.txt').then((submissionText) => {
textExerciseEditor.typeSubmission(exercise.id, submissionText);
});
examNavigation.clickSave();
Expand Down
6 changes: 3 additions & 3 deletions src/test/cypress/e2e/exam/ExamParticipation.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { admin, instructor, studentOne, studentThree, studentTwo, tutor, users }

// Common primitives
const textFixture = 'loremIpsum.txt';
const textFixtureAlternative = 'loremIpsum-alternative.txt';
const textFixtureShort = 'loremIpsum-short.txt';

describe('Exam participation', () => {
let course: Course;
Expand Down Expand Up @@ -179,11 +179,11 @@ describe('Exam participation', () => {
examStartEnd.clickContinue();
examNavigation.openExerciseAtIndex(textExerciseIndex);
textExerciseEditor.clearSubmission(textExercise.id);
examParticipation.makeTextExerciseSubmission(textExercise.id, textFixtureAlternative);
examParticipation.makeTextExerciseSubmission(textExercise.id, textFixtureShort);
examParticipation.clickSaveAndContinue();

examParticipation.handInEarly();
examParticipation.verifyTextExerciseOnFinalPage(textFixtureAlternative);
examParticipation.verifyTextExerciseOnFinalPage(textFixtureShort);
examParticipation.checkExamTitle(examTitle);

cy.login(instructor);
Expand Down
2 changes: 1 addition & 1 deletion src/test/cypress/e2e/exam/ExamTestRun.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { courseManagementRequest, examExerciseGroupCreation, examManagement, exa
import { admin, instructor } from '../../support/users';

// Common primitives
const textFixture = 'loremIpsum.txt';
const textFixture = 'loremIpsum-short.txt';
const examTitle = 'exam' + generateUUID();

describe('Exam test run', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { courseManagementRequest } from 'src/test/cypress/support/requests/Artem
import { Interception } from 'cypress/types/net-stubbing';

// Common primitives
const textFixture = 'loremIpsum.txt';
const textFixture = 'loremIpsum-short.txt';

describe('Test exam participation', () => {
let course: Course;
Expand Down
8 changes: 4 additions & 4 deletions src/test/cypress/e2e/exercises/ExerciseImport.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ describe('Import exercises', () => {
cy.login(studentOne, `/courses/${secondCourse.id}`);
courseOverview.startExercise(exercise.id!);
courseOverview.openRunningExercise(exercise.id!);
cy.fixture('loremIpsum.txt').then((submission) => {
cy.fixture('loremIpsum-short.txt').then((submission) => {
textExerciseEditor.shouldShowNumberOfWords(0);
textExerciseEditor.shouldShowNumberOfCharacters(0);
textExerciseEditor.typeSubmission(exercise.id!, submission);
textExerciseEditor.shouldShowNumberOfWords(100);
textExerciseEditor.shouldShowNumberOfCharacters(591);
textExerciseEditor.shouldShowNumberOfWords(16);
textExerciseEditor.shouldShowNumberOfCharacters(83);
textExerciseEditor.submit().then((request: Interception) => {
expect(request.response!.body.text).to.eq(submission);
expect(request.response!.body.submitted).to.be.true;
Expand Down Expand Up @@ -158,7 +158,7 @@ describe('Import exercises', () => {
cy.login(studentOne, `/courses/${secondCourse.id}`);
courseOverview.startExercise(exercise.id!);
courseOverview.openRunningExercise(exercise.id!);
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, exercise.packageName!, partiallySuccessful, () => {
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, partiallySuccessful, () => {
programmingExerciseEditor.getResultScore().contains(partiallySuccessful.expectedResult).and('be.visible');
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,23 @@ describe('Programming exercise participation', () => {
it('Makes a failing submission', () => {
programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentOne);
const submission = buildError;
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, exercise.packageName!, submission, () => {
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
});
});

it('Makes a partially successful submission', () => {
programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentTwo);
const submission = partiallySuccessful;
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, exercise.packageName!, submission, () => {
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
});
});

it('Makes a successful submission', () => {
programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentThree);
const submission = allSuccessful;
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, exercise.packageName!, submission, () => {
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('Static code analysis tests', () => {

// Make submission with SCA errors
programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentOne);
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, exercise.packageName!, scaSubmission, () => {
programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, scaSubmission, () => {
programmingExerciseEditor.getResultScore().contains(scaSubmission.expectedResult).and('be.visible').click();
programmingExerciseScaFeedback.shouldShowPointChart();
// We have to verify those static texts here. If we don't verify those messages the only difference between the SCA and normal programming exercise
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('Text exercise assessment', () => {
exercise = textResponse.body;
cy.login(studentOne);
courseManagementRequest.startExerciseParticipation(exercise.id!);
cy.fixture('loremIpsum.txt').then((submission) => {
cy.fixture('loremIpsum-short.txt').then((submission) => {
courseManagementRequest.makeTextExerciseSubmission(exercise.id!, submission);
});
});
Expand All @@ -53,8 +53,8 @@ describe('Text exercise assessment', () => {
textExerciseAssessment.getInstructionsRootElement().contains(exercise.exampleSolution!).should('be.visible');
textExerciseAssessment.getInstructionsRootElement().contains(exercise.gradingInstructions!).should('be.visible');
// Assert the correct word and character count without relying on translations
textExerciseAssessment.getWordCountElement().should('contain.text', 100).and('be.visible');
textExerciseAssessment.getCharacterCountElement().should('contain.text', 591).and('be.visible');
textExerciseAssessment.getWordCountElement().should('contain.text', 16).and('be.visible');
textExerciseAssessment.getCharacterCountElement().should('contain.text', 83).and('be.visible');
textExerciseAssessment.provideFeedbackOnTextSection(1, tutorTextFeedbackPoints, tutorTextFeedback);
textExerciseAssessment.addNewFeedback(tutorFeedbackPoints, tutorFeedback);
textExerciseAssessment.submit().then((request: Interception) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ describe('Text exercise participation', () => {
textExerciseEditor.shouldShowNumberOfWords(0);
textExerciseEditor.shouldShowNumberOfCharacters(0);
textExerciseEditor.typeSubmission(exercise.id!, submission);
textExerciseEditor.shouldShowNumberOfWords(100);
textExerciseEditor.shouldShowNumberOfCharacters(591);
textExerciseEditor.shouldShowNumberOfWords(74);
textExerciseEditor.shouldShowNumberOfCharacters(451);
textExerciseEditor.submit().then((request: Interception) => {
expect(request.response!.body.text).to.eq(submission);
expect(request.response!.body.submitted).to.be.true;
Expand Down
4 changes: 2 additions & 2 deletions src/test/cypress/e2e/lecture/LectureManagement.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('Lecture management', () => {
lectureManagement.getLectures().click();
lectureManagement.clickCreateLecture();
lectureCreation.setTitle(lectureTitle);
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
lectureCreation.typeDescription(text);
});
lectureCreation.setStartDate(dayjs());
Expand Down Expand Up @@ -65,7 +65,7 @@ describe('Lecture management', () => {
it('Adds a text unit to the lecture', () => {
cy.login(instructor, '/course-management/' + course.id + '/lectures');
lectureManagement.openUnitsPage(lecture.id!);
cy.fixture('loremIpsum.txt').then((text) => {
cy.fixture('loremIpsum-short.txt').then((text) => {
lectureManagement.addTextUnit('Text unit', text);
});
cy.contains('Text unit').should('be.visible');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
package ${packageName};
package de.test;

import java.util.*;

public class BubbleSort implements SortStrategy {

/**
* Sorts dates with BubbleSort.
*
* @param input the List of Dates to be sorted
*/
public void performSort(List<Date> input) {

for (int i = input.size() - 1; i >= 0; i--) {
for (int j = 0; j < i; j++) {
if (input.get(j).compareTo(input.get(j + 1)) > 0) {
Date temp = input.get(j);
input.set(j, input.get(j + 1));
input.set(j + 1, temp);
}
}
}

}

/**
* Sorts dates with BubbleSort.
*
* @param input the List of Dates to be sorted
*/
public void performSort(List<Date> input) {
for (int i = input.size() - 1; i >= 0; i--) {
for (int j = 0; j < i; j++) {
if (input.get(j).compareTo(input.get(j + 1)) > 0) {
Date temp = input.get(j);
input.set(j, input.get(j + 1));
input.set(j + 1, temp);
}
}
}
}
}
Loading