From a46cea28742e772a352211e7dc708858eeb57caf Mon Sep 17 00:00:00 2001 From: Leonardo Badell Date: Thu, 2 May 2024 22:23:59 -0300 Subject: [PATCH 1/2] Adding changes to the first branch --- .../services/calculator.service.spec.ts | 54 +++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/src/app/courses/services/calculator.service.spec.ts b/src/app/courses/services/calculator.service.spec.ts index b050edb..0a030c8 100644 --- a/src/app/courses/services/calculator.service.spec.ts +++ b/src/app/courses/services/calculator.service.spec.ts @@ -5,48 +5,60 @@ import {TestBed} from '@angular/core/testing'; describe('CalculatorService', () => { - let calculator: CalculatorService, - loggerSpy: any; + // let calculator: CalculatorService, + // loggerSpy: any; - beforeEach(()=> { + // beforeEach(()=> { - console.log("Calling beforeEach"); + // console.log("Calling beforeEach"); - loggerSpy = jasmine.createSpyObj('LoggerService', ["log"]); + // loggerSpy = jasmine.createSpyObj('LoggerService', ["log"]); - TestBed.configureTestingModule({ - providers: [ - CalculatorService, - {provide: LoggerService, useValue: loggerSpy} - ] - }); + // TestBed.configureTestingModule({ + // providers: [ + // CalculatorService, + // {provide: LoggerService, useValue: loggerSpy} + // ] + // }); - calculator = TestBed.inject(CalculatorService); + // calculator = TestBed.inject(CalculatorService); - }); + // }); it('should add two numbers', () => { - console.log("add test"); + const calculator = new CalculatorService(new LoggerService()); + + const result = calculator.add(2, 2) + + expect(result).toBe(4) + + // console.log("add test"); - const result = calculator.add(2, 2); + // const result = calculator.add(2, 2); - expect(result).toBe(4); + // expect(result).toBe(4); - expect(loggerSpy.log).toHaveBeenCalledTimes(1); + // expect(loggerSpy.log).toHaveBeenCalledTimes(1); }); it('should subtract two numbers', () => { - console.log("subtract test"); + const calculator = new CalculatorService(new LoggerService()); + + const result = calculator.subtract(2, 2) + + expect(result).toBe(0, "unexpected subtraction result") + + // console.log("subtract test"); - const result = calculator.subtract(2, 2); + // const result = calculator.subtract(2, 2); - expect(result).toBe(0, "unexpected subtraction result"); + // expect(result).toBe(0, "unexpected subtraction result"); - expect(loggerSpy.log).toHaveBeenCalledTimes(1); + // expect(loggerSpy.log).toHaveBeenCalledTimes(1); }); From c1c4f4313d0fb957cc68a8cb4a87ee816e3483ac Mon Sep 17 00:00:00 2001 From: Leonardo Badell Date: Thu, 9 May 2024 21:00:07 -0300 Subject: [PATCH 2/2] Adding changes to the repository --- .../services/calculator.service.spec.ts | 52 ++++++++++++------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/src/app/courses/services/calculator.service.spec.ts b/src/app/courses/services/calculator.service.spec.ts index 0a030c8..8a939c4 100644 --- a/src/app/courses/services/calculator.service.spec.ts +++ b/src/app/courses/services/calculator.service.spec.ts @@ -5,60 +5,74 @@ import {TestBed} from '@angular/core/testing'; describe('CalculatorService', () => { - // let calculator: CalculatorService, - // loggerSpy: any; + let calculator: CalculatorService, + loggerSpy: any; - // beforeEach(()=> { + beforeEach(() => { - // console.log("Calling beforeEach"); + console.log("Calling beforeEach"); - // loggerSpy = jasmine.createSpyObj('LoggerService', ["log"]); + loggerSpy = jasmine.createSpyObj('LoggerService', ["log"]); - // TestBed.configureTestingModule({ - // providers: [ - // CalculatorService, - // {provide: LoggerService, useValue: loggerSpy} - // ] - // }); + // calculator = new CalculatorService(loggerSpy); - // calculator = TestBed.inject(CalculatorService); + TestBed.configureTestingModule({ + providers: [ + CalculatorService, + {provide: LoggerService, useValue: loggerSpy} + ] + }); - // }); + calculator = TestBed.inject(CalculatorService); + + }); it('should add two numbers', () => { - const calculator = new CalculatorService(new LoggerService()); + // const logger = new LoggerService(); + + // const logger = jasmine.createSpyObj('LoggerService', ["log"]); + + // spyOn(logger, 'log') + + // const calculator = new CalculatorService(logger); const result = calculator.add(2, 2) expect(result).toBe(4) - // console.log("add test"); + console.log("add test"); // const result = calculator.add(2, 2); // expect(result).toBe(4); - // expect(loggerSpy.log).toHaveBeenCalledTimes(1); + expect(loggerSpy.log).toHaveBeenCalledTimes(1); }); it('should subtract two numbers', () => { - const calculator = new CalculatorService(new LoggerService()); + // const calculator = new CalculatorService(new LoggerService()); + + // const logger = jasmine.createSpyObj('LoggerService', ["log"]); + + // spyOn(logger, 'log') + + // const calculator = new CalculatorService(logger); const result = calculator.subtract(2, 2) expect(result).toBe(0, "unexpected subtraction result") - // console.log("subtract test"); + console.log("subtract test"); // const result = calculator.subtract(2, 2); // expect(result).toBe(0, "unexpected subtraction result"); - // expect(loggerSpy.log).toHaveBeenCalledTimes(1); + expect(loggerSpy.log).toHaveBeenCalledTimes(1); });