Skip to content

Commit

Permalink
Development: Remove angular mock test modules (#10274)
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-lippert authored Feb 7, 2025
1 parent 419ebe1 commit d6a73b6
Show file tree
Hide file tree
Showing 33 changed files with 45 additions and 282 deletions.
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ module.exports = {
// TODO: in the future, the following values should increase to at least 90%
statements: 88.72,
branches: 74.38,
functions: 82.89,
lines: 88.78,
functions: 82.87,
lines: 88.76,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { SortDirective } from 'app/shared/sort/sort.directive';
import { ItemCountComponent } from 'app/shared/pagination/item-count.component';
import { MockRouter } from '../../../helpers/mocks/mock-router';
import { MockRouterLinkDirective } from '../../../helpers/mocks/directive/mock-router-link.directive';
import { NgbPaginationMocksModule } from '../../../helpers/mocks/directive/ngbPaginationMocks.module';
import '@angular/localize/init';

describe('SystemNotificationManagementComponent', () => {
Expand All @@ -31,7 +30,7 @@ describe('SystemNotificationManagementComponent', () => {
router.setUrl('');

await TestBed.configureTestingModule({
imports: [ArtemisTestModule, NgbPaginationMocksModule],
imports: [ArtemisTestModule],
declarations: [
SystemNotificationManagementComponent,
MockPipe(ArtemisDatePipe),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { CodeEditorHeaderComponent } from 'app/exercises/programming/shared/code-editor/header/code-editor-header.component';
import { ArtemisTestModule } from '../../test.module';
import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module';

import { MAX_TAB_SIZE } from 'app/shared/monaco-editor/monaco-editor.component';

Expand All @@ -11,7 +10,7 @@ describe('CodeEditorHeaderComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, NgbDropdownMocksModule],
imports: [ArtemisTestModule],
declarations: [],
providers: [],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { TranslateService } from '@ngx-translate/core';
import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module';
import { CompetencyAccordionComponent } from 'app/course/competencies/competency-accordion/competency-accordion.component';
import { CompetencyRingsComponent } from 'app/course/competencies/competency-rings/competency-rings.component';
import { CompetencyMetrics, ExerciseInformation, ExerciseMetrics, LectureUnitInformation, LectureUnitStudentMetricsDTO, StudentMetrics } from 'app/entities/student-metrics.model';
Expand All @@ -16,7 +15,7 @@ describe('CompetencyAccordionComponent', () => {
let component: CompetencyAccordionComponent;
beforeEach(() => {
TestBed.configureTestingModule({
imports: [NgbTooltipMocksModule],
imports: [],
declarations: [CompetencyAccordionComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockComponent(CompetencyRingsComponent)],
providers: [MockProvider(TranslateService)],
schemas: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { ArtemisTestModule } from '../../../test.module';
import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { CompetencyTaxonomy } from 'app/entities/competency.model';
import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';
import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module';
import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive';
import { TranslateDirective } from 'app/shared/language/translate.directive';
import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
Expand All @@ -20,7 +18,7 @@ describe('CompetencyRecommendationDetailComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, ReactiveFormsModule, NgbTooltipMocksModule, NgbCollapseMocksModule],
imports: [ArtemisTestModule, ReactiveFormsModule],
declarations: [
CompetencyRecommendationDetailComponent,
ButtonComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
import { ArtemisTestModule } from '../../../test.module';
import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component';
import { ReactiveFormsModule } from '@angular/forms';
import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';
import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive';
import { TranslateDirective } from 'app/shared/language/translate.directive';
import { IrisLogoButtonComponent } from 'app/iris/iris-logo-button/iris-logo-button.component';
Expand All @@ -16,7 +15,7 @@ describe('CourseDescriptionFormComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, ReactiveFormsModule, NgbTooltipMocksModule],
imports: [ArtemisTestModule, ReactiveFormsModule],
declarations: [
CourseDescriptionFormComponent,
MockPipe(ArtemisTranslatePipe),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockPipe } from 'ng-mocks';
import { CompetencySearchComponent } from 'app/course/competencies/import/competency-search.component';
import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module';
import { ButtonComponent } from 'app/shared/components/button.component';
import { ArtemisFormsModule } from '../../../../../../main/webapp/app/forms/artemis-forms.module';
import { CourseCompetencyFilter } from 'app/shared/table/pageable-table';
Expand All @@ -14,7 +13,7 @@ describe('CompetencySearchComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, ArtemisFormsModule, NgbCollapseMocksModule],
imports: [ArtemisTestModule, ArtemisFormsModule],
declarations: [CompetencySearchComponent, MockPipe(ArtemisTranslatePipe), ButtonComponent],
providers: [],
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FeatureToggleHideDirective } from 'app/shared/feature-toggle/feature-toggle-hide.directive';
import { MetisConversationService } from 'app/shared/metis/metis-conversation.service';
import { EMPTY, Observable, Subject, of, throwError } from 'rxjs';
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { EMPTY, Observable, of, Subject, throwError } from 'rxjs';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { CourseManagementService } from 'app/course/manage/course-management.service';
import { ArtemisTestModule } from '../../test.module';
import { HttpHeaders, HttpResponse } from '@angular/common/http';
Expand Down Expand Up @@ -54,7 +54,6 @@ import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-
import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
import { ExamParticipationService } from 'app/exam/participate/exam-participation.service';
import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module';
import { CourseSidebarService } from 'app/overview/course-sidebar.service';

const endDate1 = dayjs().add(1, 'days');
Expand Down Expand Up @@ -164,14 +163,7 @@ describe('CourseOverviewComponent', () => {
router = new MockRouter();

TestBed.configureTestingModule({
imports: [
RouterModule.forRoot([]),
ArtemisTestModule,
MockModule(MatSidenavModule),
MockModule(NgbTooltipModule),
MockModule(BrowserAnimationsModule),
NgbDropdownMocksModule,
],
imports: [RouterModule.forRoot([]), ArtemisTestModule, MockModule(MatSidenavModule), MockModule(NgbTooltipModule), MockModule(BrowserAnimationsModule)],
declarations: [
CourseOverviewComponent,
MockDirective(MockHasAnyAuthorityDirective),
Expand Down Expand Up @@ -207,7 +199,7 @@ describe('CourseOverviewComponent', () => {
{ provide: NotificationService, useClass: MockNotificationService },
{ provide: LocalStorageService, useClass: MockLocalStorageService },
{ provide: SessionStorageService, useClass: MockSyncStorage },
{ provide: NgbDropdown, useClass: NgbDropdownMocksModule },
{ provide: NgbDropdown, useClass: MockDirective(NgbDropdown) },
],
})
.compileComponents()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { SortByDirective } from 'app/shared/sort/sort-by.directive';
import { SortDirective } from 'app/shared/sort/sort.directive';
import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
import { of, throwError } from 'rxjs';
import { NgbPaginationMocksModule } from '../../../helpers/mocks/directive/ngbPaginationMocks.module';
import { ArtemisTestModule } from '../../../test.module';
import { UMLDiagramType } from '@ls1intum/apollon';

Expand All @@ -42,7 +41,7 @@ describe('Exam Import Component', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, FormsModule, NgbPaginationMocksModule],
imports: [ArtemisTestModule, FormsModule],
declarations: [
ExamImportComponent,
ExamExerciseImportComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { TranslatePipeMock } from '../../../../helpers/mocks/service/mock-transl
import { ArtemisTestModule } from '../../../../test.module';
import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component';
import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exercises/exam-exercise-update-highlighter/exam-exercise-update-highlighter.component';
import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module';
import { SubmissionVersion } from 'app/entities/submission-version.model';
import { ExerciseSaveButtonComponent } from 'app/exam/participate/exercises/exercise-save-button/exercise-save-button.component';
import { TranslateDirective } from '../../../../../../../main/webapp/app/shared/language/translate.directive';
Expand All @@ -41,7 +40,7 @@ describe('ModelingExamSubmissionComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, NgbTooltipMocksModule],
imports: [ArtemisTestModule],
declarations: [
ModelingExamSubmissionComponent,
MockComponent(ModelingEditorComponent),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
import { MultipleChoiceQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component';
import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component';
import { ShortAnswerQuestionComponent } from 'app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component';
import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module';
import { SubmissionVersion } from 'app/entities/submission-version.model';
import { ModelingSubmission } from 'app/entities/modeling-submission.model';
import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
Expand Down Expand Up @@ -50,7 +49,7 @@ describe('QuizExamSubmissionComponent', () => {
shortAnswerQuestion.id = 3;

return TestBed.configureTestingModule({
imports: [NgbTooltipMocksModule],
imports: [],
declarations: [
QuizExamSubmissionComponent,
MockPipe(ArtemisTranslatePipe),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { GitDiffLineStatComponent } from '../../../../../main/webapp/app/exercis
import { GitDiffReportComponent } from '../../../../../main/webapp/app/exercises/programming/git-diff-report/git-diff-report.component';
import { ProgrammingExerciseGitDiffReport } from '../../../../../main/webapp/app/entities/programming-exercise-git-diff-report.model';
import { ProgrammingExerciseGitDiffEntry } from '../../../../../main/webapp/app/entities/programming-exercise-git-diff-entry.model';
import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module';
import { GitDiffFilePanelComponent } from '../../../../../main/webapp/app/exercises/programming/git-diff-report/git-diff-file-panel.component';

describe('ProgrammingExerciseGitDiffReport Component', () => {
Expand All @@ -15,7 +14,7 @@ describe('ProgrammingExerciseGitDiffReport Component', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ArtemisTestModule, NgbTooltipMocksModule],
imports: [ArtemisTestModule],
declarations: [GitDiffReportComponent, MockPipe(ArtemisTranslatePipe), MockComponent(GitDiffFilePanelComponent), MockComponent(GitDiffLineStatComponent)],
providers: [],
}).compileComponents();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { IrisSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-settings-update.component';
import { IrisCourseSettings, IrisExerciseSettings, IrisGlobalSettings, IrisSettings, IrisSettingsType } from 'app/entities/iris/settings/iris-settings.model';
Expand All @@ -11,7 +11,6 @@ import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.serv
import { firstValueFrom, of } from 'rxjs';
import { IrisCourseSettingsUpdateComponent } from 'app/iris/settings/iris-course-settings-update/iris-course-settings-update.component';
import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
import { NgbTooltipMockDirective } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';
import { MockJhiTranslateDirective } from '../../../helpers/mocks/directive/mock-jhi-translate-directive.directive';
import { HttpResponse, provideHttpClient } from '@angular/common/http';
import { provideHttpClientTesting } from '@angular/common/http/testing';
Expand Down Expand Up @@ -48,14 +47,7 @@ describe('IrisSettingsUpdateComponent', () => {
};

TestBed.configureTestingModule({
imports: [
ArtemisTestModule,
NgbTooltipMockDirective,
MockJhiTranslateDirective,
IrisCourseSettingsUpdateComponent,
IrisSettingsUpdateComponent,
IrisCommonSubSettingsUpdateComponent,
],
imports: [ArtemisTestModule, MockJhiTranslateDirective, IrisCourseSettingsUpdateComponent, IrisSettingsUpdateComponent, IrisCommonSubSettingsUpdateComponent],
declarations: [MockPipe(ArtemisTranslatePipe), MockComponent(ButtonComponent)],
providers: [MockProvider(IrisSettingsService, irisSettingsServiceMock), provideHttpClient(), provideHttpClientTesting()],
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { CourseConversationsComponent } from 'app/overview/course-conversations/course-conversations.component';
import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
import { OneToOneChatDTO } from '../../../../../../main/webapp/app/entities/metis/conversation/one-to-one-chat.model';
import { generateExampleChannelDTO, generateExampleGroupChatDTO, generateOneToOneChatDTO } from './helpers/conversationExampleModels';
import { MockComponent, MockPipe, MockProvider, MockInstance } from 'ng-mocks';
import { MockComponent, MockInstance, MockPipe, MockProvider } from 'ng-mocks';
import { MetisConversationService } from 'app/shared/metis/metis-conversation.service';
import { LoadingIndicatorContainerStubComponent } from '../../../helpers/stubs/loading-indicator-container-stub.component';
import { ConversationHeaderComponent } from 'app/overview/course-conversations/layout/conversation-header/conversation-header.component';
Expand All @@ -12,8 +12,8 @@ import { ConversationMessagesComponent } from 'app/overview/course-conversations
import { ConversationThreadSidebarComponent } from 'app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component';
import { Course } from 'app/entities/course.model';
import { BehaviorSubject, EMPTY, of } from 'rxjs';
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { ActivatedRoute, Params, Router, convertToParamMap } from '@angular/router';
import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { ActivatedRoute, convertToParamMap, Params, Router } from '@angular/router';
import { MockRouter } from '../../../helpers/mocks/mock-router';
import { MetisService } from 'app/shared/metis/metis.service';
import { Post } from 'app/entities/metis/post.model';
Expand All @@ -24,14 +24,12 @@ import { MockMetisService } from '../../../helpers/mocks/service/mock-metis-serv
import { ButtonComponent } from 'app/shared/components/button.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
import { getElement } from '../../../helpers/utils/general.utils';
import { SidebarComponent } from 'app/shared/sidebar/sidebar.component';
import { CourseOverviewService } from 'app/overview/course-overview.service';
import { GroupChatCreateDialogComponent } from 'app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component';
import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module';
import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';

import { SidebarEventService } from 'app/shared/sidebar/sidebar-event.service';
import { SidebarAccordionComponent } from 'app/shared/sidebar/sidebar-accordion/sidebar-accordion.component';
import { GroupChatDTO } from 'app/entities/metis/conversation/group-chat.model';
Expand Down Expand Up @@ -130,7 +128,7 @@ examples.forEach((activeConversation) => {
MockProvider(ProfileService),
{ provide: LayoutService, useValue: MockLayoutService },
],
imports: [FormsModule, ReactiveFormsModule, FontAwesomeModule, NgbModule, NgbCollapseMocksModule, NgbTooltipMocksModule],
imports: [FormsModule, ReactiveFormsModule, FontAwesomeModule, NgbModule],
}).compileComponents();

const metisService = new MockMetisService();
Expand Down
Loading

0 comments on commit d6a73b6

Please sign in to comment.