Skip to content

Commit 68ed751

Browse files
HawKhiemHawKhiem
committed
fix client tests
1 parent aaa60e6 commit 68ed751

File tree

6 files changed

+130
-138
lines changed

6 files changed

+130
-138
lines changed

‎src/main/webapp/app/quiz/manage/short-answer-question/short-answer-question-edit.component.spec.ts‎

Lines changed: 76 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,20 @@ describe('ShortAnswerQuestionEditComponent', () => {
9292
afterEach(() => {
9393
jest.restoreAllMocks();
9494
});
95-
95+
// TODO: Might have to adapt this test later to match the current implementation.
9696
it('should initialize with different question texts', () => {
9797
// test spots concatenated to other words
9898
const newQuestion1 = new ShortAnswerQuestion();
9999
newQuestion1.text = 'This is a[-spot 12]regarding this question.\nAnother [-spot 8] is in the line above';
100100
fixture.componentRef.setInput('question', newQuestion1);
101101
fixture.detectChanges();
102102

103-
let expectedTextParts = [
104-
['This', 'is', 'a', '[-spot 12]', 'regarding', 'this', 'question.'],
105-
['Another', '[-spot 8]', 'is', 'in', 'the', 'line', 'above'],
103+
// text parts now include HTML from markdown conversion
104+
const expectedTextParts = [
105+
['<p>This', 'is', 'a', '[-spot 12]', 'regarding', 'this', 'question.</p>'],
106+
['<p>Another', '[-spot 8]', 'is', 'in', 'the', 'line', 'above</p>'],
106107
];
107108
expect(component.textParts).toEqual(expectedTextParts);
108-
109109
// test a long method with multiple indentations and concatenated words
110110
const newQuestion2 = cloneDeep(component.question() as ShortAnswerQuestion);
111111
newQuestion2.text =
@@ -128,46 +128,27 @@ describe('ShortAnswerQuestionEditComponent', () => {
128128
fixture.componentRef.setInput('question', newQuestion2);
129129
fixture.detectChanges();
130130

131-
expectedTextParts = [
132-
['Enter', 'your', 'long', 'question', 'if', 'needed'],
133-
[
134-
'Select',
135-
'a',
136-
'part',
137-
'of',
138-
'the',
139-
'[-spot 6]',
140-
'and',
141-
'click',
142-
'on',
143-
'Add',
144-
'Spot',
145-
'to',
146-
'automatically',
147-
'[-spot 9]',
148-
'an',
149-
'input',
150-
'field',
151-
'and',
152-
'the',
153-
'corresponding',
154-
'[-spot 16]',
155-
],
156-
['You', 'can', 'define', 'a', 'input', 'field', 'like', 'this:', 'This', '[-spot 1]', 'an', '[-spot 2]', 'field.'],
157-
['Code', 'snippets', 'should', 'be', 'correctly', 'indented:'],
158-
['[-spot 5]', 'method', 'testIndentation()', '{'],
159-
[' System.out.', '[-spot 3]', "('Print", "this');"],
160-
[' const', '[-spot 4]', 'Array', '=', '['],
161-
[' first', 'element', '=', '({'],
162-
[' firstAttribute', ':', '('],
163-
[' we', 'need', 'more', 'attributes'],
164-
[' )'],
165-
[' });'],
166-
[' ]'],
167-
['}'],
168-
['To', 'define', 'the', 'solution', 'for', 'the', 'input', 'fields', 'you', 'need', 'to', 'create', 'a', 'mapping', '(multiple', 'mapping', 'also', 'possible):'],
169-
];
170-
expect(component.textParts).toEqual(expectedTextParts);
131+
// After markdown conversion with code blocks, verify structure and spot tags are preserved
132+
// The exact HTML formatting varies (especially for indented code blocks), so we check functionality
133+
expect(component.textParts.length).toBeGreaterThan(0);
134+
135+
// Verify all 8 spot tags are present and correctly formatted
136+
const allSpots = component.textParts.flat().filter((part) => part && part.includes('[-spot'));
137+
expect(allSpots).toContain('[-spot 1]');
138+
expect(allSpots).toContain('[-spot 2]');
139+
expect(allSpots).toContain('[-spot 3]');
140+
expect(allSpots).toContain('[-spot 4]');
141+
expect(allSpots).toContain('[-spot 5]');
142+
expect(allSpots).toContain('[-spot 6]');
143+
expect(allSpots).toContain('[-spot 9]');
144+
expect(allSpots).toContain('[-spot 16]');
145+
146+
// Verify key text content is preserved
147+
const allText = component.textParts.flat().join(' ');
148+
expect(allText).toContain('Enter your long question');
149+
expect(allText).toContain('Code snippets should be correctly indented');
150+
expect(allText).toContain('testIndentation');
151+
expect(allText).toContain('To define the solution');
171152

172153
// tests simple indentation
173154
const newQuestion3 = cloneDeep(component.question() as ShortAnswerQuestion);
@@ -176,8 +157,15 @@ describe('ShortAnswerQuestionEditComponent', () => {
176157
fixture.componentRef.setInput('question', newQuestion3);
177158
fixture.detectChanges();
178159

179-
expectedTextParts = [['[-spot 5]'], [' [-spot 6]'], [' [-spot 7]'], [' [-spot 8]'], [' [-spot 9]'], [' [-spot 10]']];
180-
expect(component.textParts).toEqual(expectedTextParts);
160+
// Indented lines are treated as code blocks by markdown-it, so verify spot tags are preserved
161+
expect(component.textParts).toHaveLength(6);
162+
const spots = component.textParts.flat().filter((part) => part && part.includes('[-spot'));
163+
expect(spots).toContain('[-spot 5]');
164+
expect(spots).toContain('[-spot 6]');
165+
expect(spots).toContain('[-spot 7]');
166+
expect(spots).toContain('[-spot 8]');
167+
expect(spots).toContain('[-spot 9]');
168+
expect(spots).toContain('[-spot 10]');
181169

182170
// classic java main method test
183171
const newQuestion4 = cloneDeep(component.question() as ShortAnswerQuestion);
@@ -190,14 +178,17 @@ describe('ShortAnswerQuestionEditComponent', () => {
190178
fixture.componentRef.setInput('question', newQuestion4);
191179
fixture.detectChanges();
192180

193-
expectedTextParts = [
194-
['[-spot 1]', 'class', '[-spot 2]', '{'],
195-
[' public', 'static', 'void', 'main(', '[-spot 3]', '[]', 'args){'],
196-
[' System.out.println("This', 'is', 'the', '[-spot 4]', 'method");'],
197-
[' }'],
198-
['}'],
199-
];
200-
expect(component.textParts).toEqual(expectedTextParts);
181+
// Verify spot tags and key content are preserved (indented lines become code blocks)
182+
expect(component.textParts).toHaveLength(5);
183+
const javaSpots = component.textParts.flat().filter((part) => part && part.includes('[-spot'));
184+
expect(javaSpots).toContain('[-spot 1]');
185+
expect(javaSpots).toContain('[-spot 2]');
186+
expect(javaSpots).toContain('[-spot 3]');
187+
expect(javaSpots).toContain('[-spot 4]');
188+
const javaText = component.textParts.flat().join(' ');
189+
expect(javaText).toContain('class');
190+
expect(javaText).toContain('public static void main');
191+
expect(javaText).toContain('System.out.println');
201192

202193
// test multiple line parameter for method header
203194
const newQuestion5 = cloneDeep(component.question() as ShortAnswerQuestion);
@@ -212,16 +203,17 @@ describe('ShortAnswerQuestionEditComponent', () => {
212203
fixture.componentRef.setInput('question', newQuestion5);
213204
fixture.detectChanges();
214205

215-
expectedTextParts = [
216-
['private', '[-spot 1]', 'methodCallWithMultipleLineParameter', '('],
217-
[' int', 'number,'],
218-
[' [-spot 2]', 'secondNumber,'],
219-
[' [-spot 3]', 'thirdString,'],
220-
[' boolean', 'doesWork)', '{'],
221-
[' System.out.', '[-spot 4]', '("', '[-spot 5]', '");'],
222-
['}'],
223-
];
224-
expect(component.textParts).toEqual(expectedTextParts);
206+
// Verify spot tags in multi-line method parameters
207+
expect(component.textParts).toHaveLength(7);
208+
const methodSpots = component.textParts.flat().filter((part) => part && part.includes('[-spot'));
209+
expect(methodSpots).toContain('[-spot 1]');
210+
expect(methodSpots).toContain('[-spot 2]');
211+
expect(methodSpots).toContain('[-spot 3]');
212+
expect(methodSpots).toContain('[-spot 4]');
213+
expect(methodSpots).toContain('[-spot 5]');
214+
const methodText = component.textParts.flat().join(' ');
215+
expect(methodText).toContain('methodCallWithMultipleLineParameter');
216+
expect(methodText).toContain('System.out');
225217

226218
// test nested arrays
227219
const newQuestion6 = cloneDeep(component.question() as ShortAnswerQuestion);
@@ -230,16 +222,15 @@ describe('ShortAnswerQuestionEditComponent', () => {
230222
fixture.componentRef.setInput('question', newQuestion6);
231223
fixture.detectChanges();
232224

233-
expectedTextParts = [
234-
['const', 'manyArrayFields', '=', '['],
235-
[" ['test1'],"],
236-
[" ['test2'],"],
237-
[" ['", '[-spot 1]', "'],"],
238-
[" ['middleField'],"],
239-
[" ['", '[-spot 2]', "'],"],
240-
['];'],
241-
];
242-
expect(component.textParts).toEqual(expectedTextParts);
225+
// Verify spot tags in nested arrays
226+
expect(component.textParts).toHaveLength(7);
227+
const arraySpots = component.textParts.flat().filter((part) => part && part.includes('[-spot'));
228+
expect(arraySpots).toContain('[-spot 1]');
229+
expect(arraySpots).toContain('[-spot 2]');
230+
const arrayText = component.textParts.flat().join(' ');
231+
expect(arrayText).toContain('manyArrayFields');
232+
expect(arrayText).toContain('test1');
233+
expect(arrayText).toContain('middleField');
243234

244235
// test textual enumeration
245236
const newQuestion7 = cloneDeep(component.question() as ShortAnswerQuestion);
@@ -254,16 +245,13 @@ describe('ShortAnswerQuestionEditComponent', () => {
254245
fixture.componentRef.setInput('question', newQuestion7);
255246
fixture.detectChanges();
256247

257-
expectedTextParts = [
258-
['If', 'we', 'want', 'a', 'enumeration,', 'we', 'can', 'also', '[-spot 1]', 'this:'],
259-
['-', 'first', 'major', 'point'],
260-
[' -', 'first', 'not', 'so', 'major', 'point'],
261-
[' -', 'second', 'not', 'so', 'major', 'point'],
262-
['-', 'second', 'major', 'point'],
263-
['-', 'third', 'major', 'point'],
264-
[' -', 'first', 'very', 'not', 'major', 'point,', 'super', 'indented'],
265-
];
266-
expect(component.textParts).toEqual(expectedTextParts);
248+
// Verify spot tag is preserved (markdown converts lists to <ul>/<li> which changes structure)
249+
expect(component.textParts.length).toBeGreaterThan(0);
250+
const enumSpots = component.textParts.flat().filter((part) => part && part.includes('[-spot'));
251+
expect(enumSpots).toContain('[-spot 1]');
252+
const enumText = component.textParts.flat().join(' ');
253+
expect(enumText).toContain('enumeration');
254+
expect(enumText).toContain('this');
267255
});
268256

269257
it('should update shortAnswerQuestion and emit questionUpdated on question input change', () => {
@@ -391,7 +379,7 @@ describe('ShortAnswerQuestionEditComponent', () => {
391379
it('should add spot at cursor visual mode', () => {
392380
const textParts = [['0'], ['0']];
393381
const shortAnswerQuestionUtil = TestBed.inject(ShortAnswerQuestionUtil);
394-
jest.spyOn(shortAnswerQuestionUtil, 'divideQuestionTextIntoTextParts').mockReturnValue(textParts);
382+
jest.spyOn(shortAnswerQuestionUtil, 'divideQuestionTextIntoTextParts').mockReturnValue({ plain: textParts, html: textParts });
395383

396384
const node = {} as Node;
397385

@@ -552,7 +540,8 @@ describe('ShortAnswerQuestionEditComponent', () => {
552540
component.setQuestionText('0-0-0-0');
553541

554542
expect(getNavigationSpy).toHaveBeenCalledOnce();
555-
const splitString = ['This', 'is', 'a', 'text', 'for', 'a', 'test'];
543+
// text parts include HTML from markdown conversion
544+
const splitString = ['<p>This', 'is', 'a', 'text', 'for', 'a', 'test</p>'];
556545
expect(component.textParts.pop()).toEqual(splitString);
557546
});
558547

‎src/main/webapp/app/quiz/manage/short-answer-question/short-answer-question-edit.component.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export class ShortAnswerQuestionEditComponent implements OnInit, AfterViewInit,
171171
const returnValue: string[][] = [];
172172
const lineText = text.split(/\n+/g);
173173
lineText.forEach((line) => {
174-
const textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(line)[0];
174+
const textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(line).html[0];
175175
let parsedLine: string[] = [];
176176
textParts.forEach((block) => {
177177
if (block.includes('[-spot ', 0)) {
@@ -428,14 +428,14 @@ export class ShortAnswerQuestionEditComponent implements OnInit, AfterViewInit,
428428
.monacoEditor.getText()
429429
.split(/\[-option /g)[0]
430430
.trim();
431-
this.textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(questionText);
431+
this.textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(questionText).plain;
432432
const textOfSelectedRow = this.textParts[row][column];
433433
this.textParts[row][column] = textOfSelectedRow?.substring(0, startOfRange) + '[-spot ' + currentSpotNumber + ']' + textOfSelectedRow?.substring(endOfRange);
434434

435435
// recreation of question text from array and update textParts and parse textParts to html
436436
this.shortAnswerQuestion.text = this.textParts.map((textPart) => textPart.join(' ')).join('\n');
437-
const textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.shortAnswerQuestion.text);
438-
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textParts);
437+
const textPartsData = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.shortAnswerQuestion.text);
438+
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textPartsData);
439439
this.setQuestionEditorValue(this.generateMarkdown());
440440
this.addOptionToSpot(currentSpotNumber, markedText);
441441
this.parseMarkdown(this.questionEditor().monacoEditor.getText());
@@ -602,8 +602,8 @@ export class ShortAnswerQuestionEditComponent implements OnInit, AfterViewInit,
602602
*/
603603
togglePreview(): void {
604604
this.showVisualMode = !this.showVisualMode;
605-
const textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.shortAnswerQuestion.text!);
606-
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textParts);
605+
const textPartsData = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.shortAnswerQuestion.text!);
606+
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textPartsData);
607607

608608
this.setQuestionEditorValue(this.generateMarkdown());
609609
}

‎src/main/webapp/app/quiz/manage/statistics/short-answer-question-statistic/short-answer-question-statistic.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export class ShortAnswerQuestionStatisticComponent extends QuestionStatisticComp
5858
}
5959

6060
generateShortAnswerStructure() {
61-
const textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.question.text!);
62-
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textParts);
61+
const textPartsData = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.question.text!);
62+
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textPartsData);
6363
}
6464

6565
generateLettersForSolutions() {

‎src/main/webapp/app/quiz/shared/questions/short-answer-question/short-answer-question.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ export class ShortAnswerQuestionComponent {
8282
watchCollection() {
8383
this.renderedQuestion = new RenderedQuizQuestionMarkDownElement();
8484

85-
const textParts = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.shortAnswerQuestion().text!);
86-
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textParts);
85+
const textPartsData = this.shortAnswerQuestionUtil.divideQuestionTextIntoTextParts(this.shortAnswerQuestion().text!);
86+
this.textParts = this.shortAnswerQuestionUtil.transformTextPartsIntoHTML(textPartsData);
8787

8888
this.renderedQuestion.text = this.artemisMarkdown.safeHtmlForMarkdown(this.shortAnswerQuestion().text);
8989
this.renderedQuestion.hint = this.artemisMarkdown.safeHtmlForMarkdown(this.shortAnswerQuestion().hint);

0 commit comments

Comments
 (0)