From 2e8dd5b2624fe65669825fc55f9afec4aa079453 Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Wed, 12 Nov 2025 12:57:44 +0000 Subject: [PATCH 01/10] Added the test cases by cmd --- __pycache__/calculator.cpython-39.pyc | Bin 0 -> 1407 bytes calculator.py | 3 +- test_calculator.py | 51 ++++++++++++++++++++++++-- 3 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 __pycache__/calculator.cpython-39.pyc diff --git a/__pycache__/calculator.cpython-39.pyc b/__pycache__/calculator.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3da8aa07f7776948e5e1b4fa096776c70feb288c GIT binary patch literal 1407 zcmb7@&2G~`5P*067bi{9riD^CnI4cLM0-I(st~GF5Vu^)DH5`_9s^dLpYA$9Er$c? zgS5xK(q1{`6*w`oZW5=LinVukcXmAU?aW%VS`CJ+GkcVDYmEJ&MYVajIL5Aiqxi^x z0l&gNv-&LNV4Yj?SIlOtZ^bs)GtL=~PHbH};DUE!%`Bs-p~eNjqN$_C0}mQYn+?>| zpjokLp~i>y!Ui@^S$8W!jKMCvjUr}!4oCyYcE$S01P+dd21gfa;N$2)9U3^+ zU;}+Nb>l>&(IgewNJcigSu~oH{}b%WM^W&?dcscGE$`j3TU$FSPQPd_G(VGMY{cJ} zhd)O0T#ZE(tHbeS_H8tL6)htiuBHd$OKl4PilIm_p0`&l2e|bx&mQtf`nV);mNNrH z)Y?~*vrLL8b8)o@v{MPR*k6lA#?;N}_i+MzYGklJ%PB5Tgv=Li0UJ3gXf(}c1x=@RH_Zt%%JY#F{6-qtNcRu_Sv~?8Vl~1x{ zG&~CA7W$r3lJec<_Tr)%i#ZiLf4bbfyA(+zN)L0QuK1=psPap?mU(COrOD$_FsCZ^ px^;5~xq}Ps5UqB{G8tz7l^^ZDEwlX2B#BPbe&%xzYqWj$`~w#cAAtY> literal 0 HcmV?d00001 diff --git a/calculator.py b/calculator.py index 306879a..7c06ca3 100644 --- a/calculator.py +++ b/calculator.py @@ -1,9 +1,10 @@ + class Calculator: def add(self, a, b): return a + b def subtract(self, a, b): - return b - a + return a - b def multiply(self, a, b): result = 0 diff --git a/test_calculator.py b/test_calculator.py index 7a241ca..a840081 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -1,15 +1,58 @@ +# import unittest +# from calculator import Calculator + +# class TestCalculator(unittest.TestCase): + +# def setUp(self): +# self.calc = Calculator() + +# def test_add(self): +# self.assertEqual(self.calc.add(1, 2), 3) +# self.assertEqual(self.calc.add(-1, 5), 4) + +# def test_subtract(self): +# # expected a - b +# self.assertEqual(self.calc.subtract(5, 3), -2) +# self.assertEqual(self.calc.subtract(3, 5), 2) +# # Add the following test methods to the TestCalculator class: + +# if __name__ == '__main__': +# unittest.main() + + import unittest from calculator import Calculator class TestCalculator(unittest.TestCase): - def setUp(self): self.calc = Calculator() def test_add(self): self.assertEqual(self.calc.add(1, 2), 3) + self.assertEqual(self.calc.add(-1, 5), 4) + + def test_subtract(self): + # expected a - b + self.assertEqual(self.calc.subtract(5, 3), 2) + self.assertEqual(self.calc.subtract(3, 5), -2) + + def test_multiply(self): + self.assertEqual(self.calc.multiply(2, 3), 6) + self.assertEqual(self.calc.multiply(5, 0), 0) + self.assertEqual(self.calc.multiply(0, 5), 0) + + def test_divide(self): + # integer division + self.assertEqual(self.calc.divide(10, 2), 5) + self.assertEqual(self.calc.divide(9, 2), 4) # 9 // 2 == 4 + self.assertEqual(self.calc.divide(0, 3), 0) + # with self.assertRaises(ZeroDivisionError): + # self.calc.divide(5, 0) - # Add the following test methods to the TestCalculator class: + def test_modulo(self): + self.assertEqual(self.calc.modulo(10, 3), 1) + self.assertEqual(self.calc.modulo(9, 3), 0) + self.assertEqual(self.calc.modulo(2, 5), 2) -if __name__ == '__main__': - unittest.main() \ No newline at end of file +if __name__ == "__main__": + unittest.main() From a8133f3433fbdb529a9870bbfba39298fa41b4ea Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Wed, 12 Nov 2025 13:11:02 +0000 Subject: [PATCH 02/10] Added the test cases2 --- __pycache__/calculator.cpython-39.pyc | Bin 1407 -> 1403 bytes __pycache__/test_calculator.cpython-39.pyc | Bin 0 -> 1732 bytes calculator.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 __pycache__/test_calculator.cpython-39.pyc diff --git a/__pycache__/calculator.cpython-39.pyc b/__pycache__/calculator.cpython-39.pyc index 3da8aa07f7776948e5e1b4fa096776c70feb288c..3b173196f3a2ac9803aa29372217278defdbea70 100644 GIT binary patch delta 316 zcmey*^_z=Q;quAu*%)uIhKpjOwAVL^KFryM61B)1e1k+?EmS{%a z$@5sE6+xb?5_GLd%q_@CwNl8YU6vpqlH>qjb+$2>|TZgtoC5WriE+YP+Q{DS^rm-rA;kub$GxM0^#swwskN+?+JR6Ny{peXJa z3~%_AG{_&9!a##MuK4MJ9(9ReiaLlOGUO+WNNr6DKdO9wAaN*$pkpqM zVH-chsAiKTa!YC8nZ8qrplrZ%Z43@Bv~jOW_ltY^984c4_k;Fy7S1QLLAxj);Ct1z aKib5W-ujo-*(;-BheS3FsDJ^Dzx@Ts20;V> diff --git a/__pycache__/test_calculator.cpython-39.pyc b/__pycache__/test_calculator.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..72b869009e7c3b6e0843f09479da00815628601a GIT binary patch literal 1732 zcmchXy>8S%5XX1@b({MLC<+8Z1QHFh1W5`+fg%(s0y;N9XJ>cj=f7{#Ua!q)eE+sQ_z^Jn6O-ofXtGV0 zeojU*$#WLt?&N&v#13b#nRKOh#H5$8UH8z9z08;XCr3TY*l}>eIPH1E!l0u4EDCwq z-bwTRG*64M>ciI@4o$Y{(pzLQ7IVpBM{?;LvDmeFVo&-qpt&zwQqVn+3$ji3mh8wb z-G%H?zQuC!ZKjJxE>1_*1JB5{LznK7DcB)9U~}G^mLYgIAy9u z&R?4wU&rc`o}~RuZ%p=zkK@r3#95||g3>1E^YzJI>Fca`H@SyoIF|AK<=NuaO+f!* zi6n?Eag!bn*fCwZ{MfvZ6Gyry^!giKdNJe;;58VnsKS92QdTa^9~za9C&(JQWhd1- zQ^m{A(==D`m2N7fLWp6tMqoi0E?T`$GmTirZ}a_?3m|pWHCc#}SiCb9KT?a7Q9&!! zAyfS(me5r<;V_j8J$+xOv|r3Ezh?@oLmtvD%is{h+B}9j^m33_bV%d%(^q<_C?w2` zR6fuk*FUL($Uqsq3aVRL$k$|y#c-MzgGs)31!EoZ2#h!jI$cIt2Va{K>=!8m*&^@x z2PvWo&Bmfa&T0YE8!$jM_%pnL9DEtbY%XobC~5;9({9U3dJ^mEJVkBjeoxMuk`Bjmnvbs_wE<7hNUf@KNo{BpE|elkM(Hq1lCqs7#*OE0lHeb2SCkQ9 z302*KS%F!FLBnda0W?2_UZBuS5Mf%U;KCK2@aZSa3X%@f!6-?>Rw<^VK>?-W_IXdV k%~e>Dr~% Date: Wed, 12 Nov 2025 13:12:36 +0000 Subject: [PATCH 03/10] show line error --- __pycache__/test_calculator.cpython-39.pyc | Bin 1732 -> 1825 bytes test_calculator.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/__pycache__/test_calculator.cpython-39.pyc b/__pycache__/test_calculator.cpython-39.pyc index 72b869009e7c3b6e0843f09479da00815628601a..3a6082204b79e8dbc641d192047a050b8708fa48 100644 GIT binary patch delta 204 zcmX@YyO57Jk(ZZ?0SMN$i)7y1$jigR#R23w195TPWL{QRvl@m4%q1)f8T;iJ8EP1^ z7#A?5FsHCBWMX6pXGmdS0m5cxMut2ALx$o40|rJgjAWRc#-eM&S|k88r-%heM6so0 zmSv`--r`9tE>0~f2};Z?PA$GA7?oO-?*f!5&dkqqEh@?{nmmD3S^}b02jmE_ Date: Thu, 13 Nov 2025 02:32:39 +0000 Subject: [PATCH 04/10] Test commit 2 --- __pycache__/test_calculator.cpython-39.pyc | Bin 1825 -> 1234 bytes test_calculator.py | 24 ++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/__pycache__/test_calculator.cpython-39.pyc b/__pycache__/test_calculator.cpython-39.pyc index 3a6082204b79e8dbc641d192047a050b8708fa48..68b13821053eaeee732cad6b08c0602cf001d2a0 100644 GIT binary patch delta 70 zcmZ3;cZriXk(ZZ?0SFA8MKj+|9tL2g(6zD;Gz`TQo%u?TXpTAf>@9edKn_Mk-OAE)D8*`4pK7d z)cgU#zv1X+|3QC)i|?hiIEdckeR=oZm%Hz~_hgi@9otS3STFZE?_*#;(AwasoD-=# z(oBf7u;9yueL#wt*S88=Zc`*r7uFoI4ykU!GF$I!ktU2tqvVPVAy4U06Q)Q&*PM1) zphxtvfQ)#`CX*u~hz@bfDCuT5i8`+m8pko9AfSLZ#wb;$5i$VdBvx|>C`DSNPe{>_ zS={IVO;dOmo^VH&qm(OyeaBO-8qGId>F>fsd46|KN?%F?e@V;$U5(O#tAf_#gc3AV z{7~8g#jxmQ{t)JMr_=6roWPeAp!08jcun(RiEaG%AX8&<5wEroVv9>y#hzwni|nVb zGhg&N{vWa@gsn2_HUUVi`Zvu%Yr<_5li?@ZF<0>J)v&6sWl<2PoN=8S5Ij85YqStP G>)T&WNO*bx diff --git a/test_calculator.py b/test_calculator.py index 200026b..a562e48 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -41,18 +41,18 @@ def test_multiply(self): self.assertEqual(self.calc.multiply(5, 0), 0) self.assertEqual(self.calc.multiply(0, 5), 0) - def test_divide(self): - # integer division - self.assertEqual(self.calc.divide(10, 2), 5) - self.assertEqual(self.calc.divide(9, 2), 4) # 9 // 2 == 4 - self.assertEqual(self.calc.divide(0, 3), 0) - with self.assertRaises(ZeroDivisionError): - self.calc.divide(5, 0) - - def test_modulo(self): - self.assertEqual(self.calc.modulo(10, 3), 1) - self.assertEqual(self.calc.modulo(9, 3), 0) - self.assertEqual(self.calc.modulo(2, 5), 2) + # def test_divide(self): + # # integer division + # self.assertEqual(self.calc.divide(10, 2), 5) + # self.assertEqual(self.calc.divide(9, 2), 4) # 9 // 2 == 4 + # self.assertEqual(self.calc.divide(0, 3), 0) + # with self.assertRaises(ZeroDivisionError): + # self.calc.divide(5, 0) + + # def test_modulo(self): + # self.assertEqual(self.calc.modulo(10, 3), 1) + # self.assertEqual(self.calc.modulo(9, 3), 0) + # self.assertEqual(self.calc.modulo(2, 5), 2) if __name__ == "__main__": unittest.main() From e33cda35ae184fba107272225948b78cef28d386 Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Thu, 13 Nov 2025 02:57:15 +0000 Subject: [PATCH 05/10] test --- clear | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 clear diff --git a/clear b/clear new file mode 100644 index 0000000..0b4ca25 --- /dev/null +++ b/clear @@ -0,0 +1,65 @@ +commit a78cb6ab1c920e585c15f0fbfb8a83e90c206b6b (HEAD, origin/master, origin/HEAD) +Author: alex2521-code +Date: Thu Nov 13 02:32:39 2025 +0000 + + Test commit 2 + +commit 970f08e6de52b87bb7b0f4d1511c4dd1d37a73f1 +Author: alex2521-code +Date: Wed Nov 12 13:12:36 2025 +0000 + + show line error + +commit a8133f3433fbdb529a9870bbfba39298fa41b4ea +Author: alex2521-code +Date: Wed Nov 12 13:11:02 2025 +0000 + + Added the test cases2 + +commit 2e8dd5b2624fe65669825fc55f9afec4aa079453 +Author: alex2521-code +Date: Wed Nov 12 12:57:44 2025 +0000 + + Added the test cases by cmd + +commit 886c30470f3b7e3119639d7b9d5c4c56e14f6e81 +Author: Chaiyong Ragkhitwetsagul +Date: Mon Nov 4 01:38:06 2024 +0000 + + Add one more bug + +commit af8f9360d321dff40108fb6d62d07c2ab51f4413 +Author: Chaiyong Ragkhitwetsagul +Date: Sat Nov 2 23:14:44 2024 +0000 + + Updated the code + +commit 1d231767e3175bbb806dc6fef1047abc738a676a +Author: Chaiyong Ragkhitwetsagul +Date: Sat Nov 2 22:17:11 2024 +0000 + + Updated README. + +commit c03cd9084e4e23493d52139a2ebb6d460cb5f79f +Author: Chaiyong Ragkhitwetsagul +Date: Sat Nov 2 22:13:43 2024 +0000 + + Removed other test cases. + +commit cc20158fb48f090aa485de2cebde644737ab92bd +Author: Chaiyong Ragkhitwetsagul +Date: Sat Nov 2 22:12:24 2024 +0000 + + Added .gitignore + +commit 4eed8f1aa1c3268b010fa7716d68341a0e242f5b +Author: Chaiyong Ragkhitwetsagul +Date: Sat Nov 2 22:12:03 2024 +0000 + + Added initial files. + +commit 42aeda4c0e2092713331e5cb3ddaac55fb2f3db9 +Author: Chaiyong Ragkhitwetsagul +Date: Sun Nov 3 05:04:11 2024 +0700 + + Initial commit From c1d3c974419dc3938805729631954d640245a2ec Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Thu, 13 Nov 2025 03:36:07 +0000 Subject: [PATCH 06/10] no 2 commit --- __pycache__/calculator.cpython-39.pyc | Bin 1403 -> 1403 bytes __pycache__/test_calculator.cpython-39.pyc | Bin 1234 -> 1576 bytes test_calculator.py | 14 +++++++------- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/__pycache__/calculator.cpython-39.pyc b/__pycache__/calculator.cpython-39.pyc index 3b173196f3a2ac9803aa29372217278defdbea70..32ebaa5303672b70accca03f33296df8113d9c18 100644 GIT binary patch delta 20 acmey(^_z=3k(ZZ?0SJV=L^pC5umS)zVFWz@ delta 20 acmey(^_z=3k(ZZ?0SNB4iEQL9U6b2R`Y-VO;$P+MRC@wHyURz6(&MI5R)bwWuh+ zsE8G$g&j_Se07VvB(=CC9%6zHP@otbKultcAjrd5B^3gccTUVnF3m|S$uH6aD(8l& n_tWH<{F~X5QD(9Miy{w5BL^b~GY1O?>*Qz_J4V^bvsf$uBIi$6 delta 68 zcmZ3%bBU8Tk(ZZ?0SFA8MKj+| Date: Thu, 13 Nov 2025 03:39:23 +0000 Subject: [PATCH 07/10] test conflic --- test_calculator.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test_calculator.py b/test_calculator.py index 5acc93f..200026b 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -49,10 +49,10 @@ def test_divide(self): with self.assertRaises(ZeroDivisionError): self.calc.divide(5, 0) - # def test_modulo(self): - # self.assertEqual(self.calc.modulo(10, 3), 1) - # self.assertEqual(self.calc.modulo(9, 3), 0) - # self.assertEqual(self.calc.modulo(2, 5), 2) + def test_modulo(self): + self.assertEqual(self.calc.modulo(10, 3), 1) + self.assertEqual(self.calc.modulo(9, 3), 0) + self.assertEqual(self.calc.modulo(2, 5), 2) if __name__ == "__main__": unittest.main() From f9fe77c47147408221d1ed3348b6e01815340c19 Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Thu, 13 Nov 2025 03:42:23 +0000 Subject: [PATCH 08/10] erro with stop --- __pycache__/calculator.cpython-39.pyc | Bin 1403 -> 1403 bytes __pycache__/test_calculator.cpython-39.pyc | Bin 1576 -> 1732 bytes test_calculator.py | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/__pycache__/calculator.cpython-39.pyc b/__pycache__/calculator.cpython-39.pyc index 32ebaa5303672b70accca03f33296df8113d9c18..3b173196f3a2ac9803aa29372217278defdbea70 100644 GIT binary patch delta 20 acmey(^_z=3k(ZZ?0SNB4iEQL9USk(ZZ?0SNknMKkYCU329q6G zy*wZSWN(oqh+qT}+#rGvNNA#1kei=Unv)N*z>2#hwYVf6B47ek zSPZs}5ojA@l~f2&&N(qBxilxSB)>=xNvWSE=VUKdOExKx1=5pSSQQ08_H!_DFmteQ TumT~+v@y&uYmiGg*#Jkq@MbgOP)ogN1{YgLSe$ Mn+>Dvt<8 diff --git a/test_calculator.py b/test_calculator.py index 200026b..a840081 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -46,8 +46,8 @@ def test_divide(self): self.assertEqual(self.calc.divide(10, 2), 5) self.assertEqual(self.calc.divide(9, 2), 4) # 9 // 2 == 4 self.assertEqual(self.calc.divide(0, 3), 0) - with self.assertRaises(ZeroDivisionError): - self.calc.divide(5, 0) + # with self.assertRaises(ZeroDivisionError): + # self.calc.divide(5, 0) def test_modulo(self): self.assertEqual(self.calc.modulo(10, 3), 1) From 08fb37d297a11f301e51dcdedd5e2d51ccd33cde Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Thu, 13 Nov 2025 03:46:06 +0000 Subject: [PATCH 09/10] hello --- __pycache__/calculator.cpython-39.pyc | Bin 1403 -> 1403 bytes __pycache__/test_calculator.cpython-39.pyc | Bin 1732 -> 1483 bytes test_calculator.py | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/__pycache__/calculator.cpython-39.pyc b/__pycache__/calculator.cpython-39.pyc index 3b173196f3a2ac9803aa29372217278defdbea70..32ebaa5303672b70accca03f33296df8113d9c18 100644 GIT binary patch delta 20 acmey(^_z=3k(ZZ?0SJV=L^pC5umS)zVFWz@ delta 20 acmey(^_z=3k(ZZ?0SNB4iEQL9U-2~?ItU+$?}2J ZaWHZ)bFgr*aoUFit+jBE<<2_0!~>{FcRzQF^jEtD*qN77j)ZW)2n(Rv_e<9L8$HC^LC7 Gs|5g!W+poT diff --git a/test_calculator.py b/test_calculator.py index a840081..b7bbf61 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -49,10 +49,10 @@ def test_divide(self): # with self.assertRaises(ZeroDivisionError): # self.calc.divide(5, 0) - def test_modulo(self): - self.assertEqual(self.calc.modulo(10, 3), 1) - self.assertEqual(self.calc.modulo(9, 3), 0) - self.assertEqual(self.calc.modulo(2, 5), 2) + # def test_modulo(self): + # self.assertEqual(self.calc.modulo(10, 3), 1) + # self.assertEqual(self.calc.modulo(9, 3), 0) + # self.assertEqual(self.calc.modulo(2, 5), 2) if __name__ == "__main__": unittest.main() From 7107449285648de26edc4fbf3c43b81610c11f7a Mon Sep 17 00:00:00 2001 From: alex2521-code Date: Thu, 13 Nov 2025 03:47:20 +0000 Subject: [PATCH 10/10] hard --- test_calculator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_calculator.py b/test_calculator.py index b7bbf61..5acc93f 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -46,8 +46,8 @@ def test_divide(self): self.assertEqual(self.calc.divide(10, 2), 5) self.assertEqual(self.calc.divide(9, 2), 4) # 9 // 2 == 4 self.assertEqual(self.calc.divide(0, 3), 0) - # with self.assertRaises(ZeroDivisionError): - # self.calc.divide(5, 0) + with self.assertRaises(ZeroDivisionError): + self.calc.divide(5, 0) # def test_modulo(self): # self.assertEqual(self.calc.modulo(10, 3), 1)