From 80a96795b91cf2abfa2c0b040789e6e92fcdf337 Mon Sep 17 00:00:00 2001 From: Jorenzo Martin Reyes Date: Mon, 16 Sep 2024 15:53:45 +0800 Subject: [PATCH 1/3] added fixes for simple exceptions --- .idea/misc.xml | 2 +- .../example/midterm/ConcreteNameService.java | 22 ++- src/main/java/dto/Name.java | 7 +- .../example/midterm/ConcreteNameService.class | Bin 651 -> 1232 bytes target/classes/dto/Name.class | Bin 2425 -> 2425 bytes target/classes/utility/NameBuilder.class | Bin 4688 -> 4688 bytes .../compile/default-compile/createdFiles.lst | 5 + .../compile/default-compile/inputFiles.lst | 6 + .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + ...xample.midterm.MidtermApplicationTests.xml | 142 ++++++++++++++++++ ...xample.midterm.MidtermApplicationTests.txt | 49 ++++++ 12 files changed, 231 insertions(+), 4 deletions(-) create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml create mode 100644 target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt diff --git a/.idea/misc.xml b/.idea/misc.xml index 0abcc97..f0f8287 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/src/main/java/com/example/midterm/ConcreteNameService.java b/src/main/java/com/example/midterm/ConcreteNameService.java index 2008297..1bfd3b4 100644 --- a/src/main/java/com/example/midterm/ConcreteNameService.java +++ b/src/main/java/com/example/midterm/ConcreteNameService.java @@ -1,6 +1,8 @@ package com.example.midterm; import dto.Name; +import java.util.Objects; + import org.springframework.stereotype.Component; import service.NameService; @@ -8,6 +10,24 @@ public class ConcreteNameService implements NameService { @Override public Name process(String name) throws Exception { - return null; + + // Clean up extra spaces + name = name.trim().replaceAll("\\s+", " "); + + // Handle the format "First Last" + String[] parts = name.split(" "); + String firstName = parts[0]; + String lastName = parts[1]; + + + // Handles the format "Last, First" + if (name.contains(",")) { + parts = name.split(","); + lastName = parts[0].trim(); + firstName = parts[1].trim(); + return new Name(firstName, lastName); + } + + return new Name(firstName, lastName); } } diff --git a/src/main/java/dto/Name.java b/src/main/java/dto/Name.java index 48983d6..e5489a3 100644 --- a/src/main/java/dto/Name.java +++ b/src/main/java/dto/Name.java @@ -2,16 +2,19 @@ import lombok.Data; +import java.util.Objects; + @Data public class Name { private String first; private String last; + public Name(String first, String last) { this.first = first; this.last = last; } - + public Name() { - + } } diff --git a/target/classes/com/example/midterm/ConcreteNameService.class b/target/classes/com/example/midterm/ConcreteNameService.class index fd057f31aab48b0c3ea0b770c6732ce75a167a44..d980c98adb8b975854271596b6a8291132e94a1d 100644 GIT binary patch literal 1232 zcma)6>rN9v6#m98Y^mj9i$VdpC`h+0ELKpYh#^FNm3paZ;^oh<46v{_cc+Mt;#=q+ zOf>NUd?{KFeLIuBZVaTbfnU_j`Tn2bs5^;0fR=?Wf;yI)k~~au#&_8!Mu-( zNenTtX@!Fnx@l;mHbSFiS6u;T}CZW$Crinx~yf zmXYl#d;|L$hYea)7)YT&Yr2(yB1*JlSim9@aq(|x1O>b-os8nb`a`dh#KCYtR;qx2-A&>*4Ec>tAc?H#Bj3ZYf$yp1?B8_hZQ z+;hL=zP*F;U*FpuzyyP%pOrOSfi#b0>S*}+Q#>Mnx|_|{+r?_R(Ma--Jnc0k1UzEK z70T3rDWeOz8eSnTwhpPL23%CAVR3*6RVINLH8>U?F-h*EI2+~VpA0OS6fMcILCr}W a4MI)MC3*{OPD*fX%8u18dUW$aANT<$KosQw diff --git a/target/classes/dto/Name.class b/target/classes/dto/Name.class index d361cf4f58b4cd856de217a3ef9b661ada6fa4f1..91caf6aaa6f1023d801e63d04d38ae4622273e93 100644 GIT binary patch delta 147 zcmew<^iybq6f-jigUjR(%o2k9Yz%H(4DJjb>leL)-P3B qB(Jeg0+N{=Cnx8y@=UhlR13IHqs;S2!O0M!rxY1pG7AC$vv>@@1sUW30|4Cs-vHtO>i_@%3IG8B>;Ucn@BkSI+#7lT delta 92 zcmV-i0HgoVB+w+VAqx=?1_0g)0N()M2LRy=0OA1Svvvyt0Rs>K<&(|?7ZO$v1_0*@ y04xCL3;@&s)er#clT8a4vv>@@1sUA{0|4Xz<^bsc>i_@%3IG8B>;Ucn@BkSY>>H{8 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..3a88902 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,5 @@ +dto\Name.class +service\NameService.class +com\example\midterm\MidtermApplication.class +utility\NameBuilder.class +com\example\midterm\ConcreteNameService.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..ad1c56b --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,6 @@ +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\ConcreteNameService.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\MidtermApplication.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\MyController.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\dto\Name.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\service\NameService.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\utility\NameBuilder.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..5bc7db9 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com\example\midterm\MidtermApplicationTests.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..dd190b0 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\test\java\com\example\midterm\MidtermApplicationTests.java diff --git a/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml b/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml new file mode 100644 index 0000000..8a76806 --- /dev/null +++ b/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.surname(MidtermApplicationTests.java:29) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) +]]> + + + + + but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.remove(MidtermApplicationTests.java:35) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) +]]> + + + + but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.suffix(MidtermApplicationTests.java:75) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) +]]> + + + but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.badNames_Success(MidtermApplicationTests.java:85) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) +]]> + + + + but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.capitalisation(MidtermApplicationTests.java:93) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) +]]> + + \ No newline at end of file diff --git a/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt b/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt new file mode 100644 index 0000000..19f0516 --- /dev/null +++ b/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt @@ -0,0 +1,49 @@ +------------------------------------------------------------------------------- +Test set: com.example.midterm.MidtermApplicationTests +------------------------------------------------------------------------------- +Tests run: 7, Failures: 5, Errors: 0, Skipped: 0, Time elapsed: 1.886 s <<< FAILURE! -- in com.example.midterm.MidtermApplicationTests +com.example.midterm.MidtermApplicationTests.surname -- Time elapsed: 0.539 s <<< FAILURE! +java.lang.AssertionError: APC John Del User expected: but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.surname(MidtermApplicationTests.java:29) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + +com.example.midterm.MidtermApplicationTests.remove -- Time elapsed: 0.003 s <<< FAILURE! +java.lang.AssertionError: Csar APC User expected: but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.remove(MidtermApplicationTests.java:35) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + +com.example.midterm.MidtermApplicationTests.suffix -- Time elapsed: 0.002 s <<< FAILURE! +java.lang.AssertionError: APC R User MSc MPH DRes/PhD expected: but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.suffix(MidtermApplicationTests.java:75) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + +com.example.midterm.MidtermApplicationTests.badNames_Success -- Time elapsed: 0.002 s <<< FAILURE! +java.lang.AssertionError: ~~~ APC User ~~~ expected: but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.badNames_Success(MidtermApplicationTests.java:85) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + +com.example.midterm.MidtermApplicationTests.capitalisation -- Time elapsed: 0.002 s <<< FAILURE! +java.lang.AssertionError: HEMANT AHIRKAR expected: but was: + at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) + at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) + at com.example.midterm.MidtermApplicationTests.capitalisation(MidtermApplicationTests.java:93) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + From 2e4db7ec568ab559451614d1b18e380dac5c201a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Sep 2024 22:05:59 +0800 Subject: [PATCH 2/3] everything except capitalization --- .idea/misc.xml | 2 +- .../example/midterm/ConcreteNameService.java | 71 ++++++-- .../example/midterm/ConcreteNameService.class | Bin 1232 -> 2459 bytes .../compile/default-compile/inputFiles.lst | 12 +- .../default-testCompile/inputFiles.lst | 2 +- ...xample.midterm.MidtermApplicationTests.xml | 157 +++++++++++------- ...xample.midterm.MidtermApplicationTests.txt | 40 +---- 7 files changed, 166 insertions(+), 118 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index f0f8287..9dc782b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/src/main/java/com/example/midterm/ConcreteNameService.java b/src/main/java/com/example/midterm/ConcreteNameService.java index 1bfd3b4..5aec906 100644 --- a/src/main/java/com/example/midterm/ConcreteNameService.java +++ b/src/main/java/com/example/midterm/ConcreteNameService.java @@ -6,28 +6,75 @@ import org.springframework.stereotype.Component; import service.NameService; +// Import Regular Expression libraries +import java.util.regex.Pattern; +import java.util.regex.Matcher; + @Component public class ConcreteNameService implements NameService { @Override public Name process(String name) throws Exception { + // Remove the following: + // "Csar", "Dr", "D. R.", "Rev.", "a.k.a. (and all the characters after it)", "M.B.A.", "J. R.", + // "M.BA", "Certified Professional", "II.", "Jr.", "Dip Ed", "DipEd", "MSc", "MPH", "DRes/PhD", "MacA", "assoc prof" + // anything enclosed in parentheses, quotation marks, single quotes, + // numbers, extra whitespaces, special characters + String cleanName = name + .replaceAll("(?i)(Csar|Dr|D\\.R\\.|Rev\\.|a\\.k\\.a.*|M\\.B\\.A\\.|J\\.|R\\.|, Bsc|Bsc|M\\.BA|Certified|Professional|\\(.*?\\)|\\\".*?\\\"|'[^']*'|\\s*\\d+|II\\.|Jr\\.|Dip|Ed|DipEd|MSc|MPH|es|PhD|MacA|assoc|prof|J)", "") + .replaceAll("[^a-zA-Z,]", " ") + .replaceAll("\\s{2,}", " ") + .trim(); + + System.out.println("name: " + name); + System.out.println("cleaned name: " + cleanName); + + String[] parts; + String fname = "", lname = ""; + // Handles the format "Last, First" + if (cleanName.contains(",")) { + parts = cleanName.split(","); + lname = parts[0]; + fname = parts[1]; + //if (cleanName.contains(" ")) { + // parts = lname.split(" "); + // fname = parts[0]; + // lname = parts[1]; + //} + return new Name(fname.trim(), lname.trim()); + } + + parts = cleanName.split(" "); + if (parts.length == 2) { + fname = parts[0]; + lname = parts[1]; + return new Name(fname, lname); + }else if (parts.length > 2) { + if (parts[1].length() == 1) { + parts[1] = parts[2]; + parts[2] = ""; + } + fname = parts[0]; + lname = parts[parts.length - 2] + " " + parts[parts.length - 1]; + return new Name(fname.trim(), lname.trim()); + } + + System.out.println("fname: " + parts[0]); + System.out.println("lname: " + parts[1]); + + return new Name(fname, lname); + // Clean up extra spaces - name = name.trim().replaceAll("\\s+", " "); + // name = name.trim().replaceAll("\\s+", " "); // Handle the format "First Last" - String[] parts = name.split(" "); - String firstName = parts[0]; - String lastName = parts[1]; + //String[] parts = cleanName.split(" "); + //String firstName = parts[0]; + //String lastName = parts[1]; + - // Handles the format "Last, First" - if (name.contains(",")) { - parts = name.split(","); - lastName = parts[0].trim(); - firstName = parts[1].trim(); - return new Name(firstName, lastName); - } - return new Name(firstName, lastName); + //return new Name(firstName, lastName); } } diff --git a/target/classes/com/example/midterm/ConcreteNameService.class b/target/classes/com/example/midterm/ConcreteNameService.class index d980c98adb8b975854271596b6a8291132e94a1d..fe2cbf3f22d50341639408aa599e739009806cd6 100644 GIT binary patch literal 2459 zcma)7TT>iG6#fQwnPuH1xa0;&5Rn8H_F^`7h(=fvAua@2BqnU4&1?e`W@k1t11388 z0eSM(Jeh~Q_@)6j8GY>1pC?3LV&rF+uwHMCteZPWiyL+fB_A%>WSUk0z3slkFL++c!V zIXhR*26J+QRFt!8<*djK1=Hp1csV;p-gULhKixa-8G-uM-dIqOu5T`zvJ%X?&a(78 z)3JpWln1jzSIViN+^5FAU|{j?z@4FipzIBmE5pImlrrg(OqjLcYDEpC(uTJ{|iLIDn2_>6U!gv{y95U0Jh)A;&CB!^Oek z8$jw3qkB22y{s6LG_`nFWWFBD+)m$#;h+YsH-^ImwCsJ8Pd`$j98I7L-5MfvUe$1L zu!*U59LEVAJqf&n-rXTT^n6LRR%e}cI#iFsbaJ!I#AmcpR7aC6b6*1QpUjq=-N zN-gfKijE8PQ}LbLjHt>u&f}6g_an_M?A1>#DDRgOY#jDOnH53sU-X8BZYHE z60PV?ja*{>I5Y~clO|{-;M*LNi7^aH<)A49nGRI&8YUpW(WN`;E zibiX~RVSvi3A~KdWJUx7slGOsD(M`xWVSR`oNGi zpLc?%90DKS>e(yp=D(8lC$m_@|vj-I@$#3tO`y;*W9}8n^n1B zdM42uvu(#0p+5~nMaNyqdFmvuEGyGrIqq7H-R4Tie^`?&V72Dh()I~S$GGG8p6`lU zJs2+rn%7lkBfVM-21^&_E-SsSnT)MfQ@gx!Vj&u#tjSe~30DW&uoj1fst#M7EJs8C z8(d9$!&#HL`e|2L3jdlge8+vL;k(8vZVT39n-q4%l3st&an{yrP42RW%I#8|XVy)` z8&5&~!5D44H?~a_gk_aXUlOdulx<75VDWC2EUc^H%AUgCM+E3y3B&pg4_G5}PQ5V2w8qXyhsO zXCj$szLbe3+e>u?3RLo$%!^1RzlAHnj(VdX#!2BVjO|2Cds`R}SB=h?c`FoJE}tae z2w^=+w7SrVZXCuj(i40kdXOgoBRsJM^b^ICxIykb(pV<^Ro?as>s<>xqS zp`XXwa_8|oO5{aCtMi;i@fo$xBJzqMwdpA6NbsZeaKJ0{HL!Io>}+(WaFd!5dior< yIg4s^tQd==Ehys-M|GI)a{PjSFP+`v`pb|mg|rgV<&dtTMyWU@?h}@Ebo~n==x%QS delta 601 zcmYk4!A=ul6otRPGj*opKw(;;EwzAxN@sAef?`ozNnA)1g9}aEj95vvmWED@JKn%V z|HMSy`T(*ii6%aPEB7va58|DvCMJ`6?|<((H|L(rr^3&i^W)^}ciHHsJfh`rr%|jN)~ep`)Rx%wxXA9hgr_KWH~Rix?!=XJ4T=` z>i5QH{m`uHrdeChJ?k6{;sh?tZuGAl+liyy7u!+)LG+~CwrD7vJFj=!{kXH=8(7@X zN9M;v=2;+v;({EW|<+6Fq{Fnbq z*=mp|sf!B8iwaK+FNn)Us+3ryEP5)eGQ);+w#3Cm?dnL;U$vr*Fk(ey7ue(q4Y_}s yCRe3r2yIOWD{{t~P{&axY*}2hu;t^r^h{x{3tk*jVpd|`MjCI*A2jl56aE18!&UtN diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index ad1c56b..20e7a91 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,6 +1,6 @@ -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\ConcreteNameService.java -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\MidtermApplication.java -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\MyController.java -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\dto\Name.java -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\service\NameService.java -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\utility\NameBuilder.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\com\example\midterm\ConcreteNameService.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\com\example\midterm\MidtermApplication.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\com\example\midterm\MyController.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\dto\Name.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\service\NameService.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\utility\NameBuilder.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index dd190b0..3db5e04 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1 +1 @@ -C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\test\java\com\example\midterm\MidtermApplicationTests.java +C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\test\java\com\example\midterm\MidtermApplicationTests.java diff --git a/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml b/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml index 8a76806..066474c 100644 --- a/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml +++ b/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml @@ -1,61 +1,60 @@ - + - + - - + - + - + - + - + - + - + - + - + - + - + - + @@ -64,17 +63,9 @@ - - but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.surname(MidtermApplicationTests.java:29) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) -]]> - + - - - but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.remove(MidtermApplicationTests.java:35) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) -]]> + + + + + - - but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.suffix(MidtermApplicationTests.java:75) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) -]]> + - but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.badNames_Success(MidtermApplicationTests.java:85) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) -]]> + + + + - - + but was: at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) @@ -138,5 +172,8 @@ WARNING: Dynamic loading of agents will be disallowed by default in a future rel at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) ]]> + \ No newline at end of file diff --git a/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt b/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt index 19f0516..cf3fe8f 100644 --- a/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt +++ b/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt @@ -1,44 +1,8 @@ ------------------------------------------------------------------------------- Test set: com.example.midterm.MidtermApplicationTests ------------------------------------------------------------------------------- -Tests run: 7, Failures: 5, Errors: 0, Skipped: 0, Time elapsed: 1.886 s <<< FAILURE! -- in com.example.midterm.MidtermApplicationTests -com.example.midterm.MidtermApplicationTests.surname -- Time elapsed: 0.539 s <<< FAILURE! -java.lang.AssertionError: APC John Del User expected: but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.surname(MidtermApplicationTests.java:29) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - -com.example.midterm.MidtermApplicationTests.remove -- Time elapsed: 0.003 s <<< FAILURE! -java.lang.AssertionError: Csar APC User expected: but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.remove(MidtermApplicationTests.java:35) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - -com.example.midterm.MidtermApplicationTests.suffix -- Time elapsed: 0.002 s <<< FAILURE! -java.lang.AssertionError: APC R User MSc MPH DRes/PhD expected: but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.suffix(MidtermApplicationTests.java:75) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - -com.example.midterm.MidtermApplicationTests.badNames_Success -- Time elapsed: 0.002 s <<< FAILURE! -java.lang.AssertionError: ~~~ APC User ~~~ expected: but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.badNames_Success(MidtermApplicationTests.java:85) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - -com.example.midterm.MidtermApplicationTests.capitalisation -- Time elapsed: 0.002 s <<< FAILURE! +Tests run: 7, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.691 s <<< FAILURE! -- in com.example.midterm.MidtermApplicationTests +com.example.midterm.MidtermApplicationTests.capitalisation -- Time elapsed: 0.005 s <<< FAILURE! java.lang.AssertionError: HEMANT AHIRKAR expected: but was: at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) From 8b69ae17cf590cffa44c1c1fdf861e0c1148dac2 Mon Sep 17 00:00:00 2001 From: Jorenzo Martin Reyes Date: Sat, 21 Sep 2024 13:05:59 +0800 Subject: [PATCH 3/3] Added "scuffed"email test --- .idea/misc.xml | 2 +- .../example/midterm/ConcreteEmailService.java | 20 +++ .../example/midterm/ConcreteNameService.java | 34 ++-- src/main/java/dto/Email.java | 17 ++ src/main/java/service/EmailService.java | 9 ++ .../EmailValidationControllerTests.java | 23 +++ .../midterm/ConcreteEmailService.class | Bin 0 -> 1165 bytes .../example/midterm/ConcreteNameService.class | Bin 2459 -> 3101 bytes target/classes/dto/Email.class | Bin 0 -> 1934 bytes target/classes/service/EmailService.class | Bin 0 -> 251 bytes .../compile/default-compile/createdFiles.lst | 3 + .../compile/default-compile/inputFiles.lst | 15 +- .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 3 +- ...midterm.EmailValidationControllerTests.xml | 92 +++++++++++ ...xample.midterm.MidtermApplicationTests.xml | 149 +++--------------- ...midterm.EmailValidationControllerTests.txt | 4 + ...xample.midterm.MidtermApplicationTests.txt | 11 +- .../EmailValidationControllerTests.class | Bin 0 -> 1069 bytes 19 files changed, 225 insertions(+), 158 deletions(-) create mode 100644 src/main/java/com/example/midterm/ConcreteEmailService.java create mode 100644 src/main/java/dto/Email.java create mode 100644 src/main/java/service/EmailService.java create mode 100644 src/test/java/com/example/midterm/EmailValidationControllerTests.java create mode 100644 target/classes/com/example/midterm/ConcreteEmailService.class create mode 100644 target/classes/dto/Email.class create mode 100644 target/classes/service/EmailService.class create mode 100644 target/surefire-reports/TEST-com.example.midterm.EmailValidationControllerTests.xml create mode 100644 target/surefire-reports/com.example.midterm.EmailValidationControllerTests.txt create mode 100644 target/test-classes/com/example/midterm/EmailValidationControllerTests.class diff --git a/.idea/misc.xml b/.idea/misc.xml index 9dc782b..f0f8287 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/src/main/java/com/example/midterm/ConcreteEmailService.java b/src/main/java/com/example/midterm/ConcreteEmailService.java new file mode 100644 index 0000000..23538da --- /dev/null +++ b/src/main/java/com/example/midterm/ConcreteEmailService.java @@ -0,0 +1,20 @@ +package com.example.midterm; + +import org.springframework.stereotype.Component; +import dto.Email; +import service.EmailService; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +@Component +public class ConcreteEmailService implements EmailService { + @Override + public Email process(String email) throws Exception { + final String EMAIL_REGEX = "^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$"; + Pattern pattern = Pattern.compile(EMAIL_REGEX); + Matcher matcher = pattern.matcher(email); + email = matcher.replaceAll(email); + return new Email(email); + } +} diff --git a/src/main/java/com/example/midterm/ConcreteNameService.java b/src/main/java/com/example/midterm/ConcreteNameService.java index 5aec906..e0246e6 100644 --- a/src/main/java/com/example/midterm/ConcreteNameService.java +++ b/src/main/java/com/example/midterm/ConcreteNameService.java @@ -1,7 +1,6 @@ package com.example.midterm; import dto.Name; -import java.util.Objects; import org.springframework.stereotype.Component; import service.NameService; @@ -25,9 +24,8 @@ public Name process(String name) throws Exception { .replaceAll("[^a-zA-Z,]", " ") .replaceAll("\\s{2,}", " ") .trim(); - - System.out.println("name: " + name); - System.out.println("cleaned name: " + cleanName); + // Convert cleaned name to title case if it's in all upper or lower case + cleanName = toTitleCaseIfNecessary(cleanName); String[] parts; String fname = "", lname = ""; @@ -64,17 +62,23 @@ public Name process(String name) throws Exception { return new Name(fname, lname); - // Clean up extra spaces - // name = name.trim().replaceAll("\\s+", " "); - - // Handle the format "First Last" - //String[] parts = cleanName.split(" "); - //String firstName = parts[0]; - //String lastName = parts[1]; - - - - //return new Name(firstName, lastName); + } + // Utility function to handle capitalization + private String toTitleCaseIfNecessary(String name) { + if (name.equals(name.toUpperCase()) || name.equals(name.toLowerCase())) { + String[] words = name.split(" "); + StringBuilder titleCaseName = new StringBuilder(); + for (String word : words) { + if (word.length() > 1) { + titleCaseName.append(word.substring(0, 1).toUpperCase()) + .append(word.substring(1).toLowerCase()).append(" "); + } else { + titleCaseName.append(word.toUpperCase()).append(" "); + } + } + return titleCaseName.toString().trim(); + } + return name; // Return the original name if no changes needed } } diff --git a/src/main/java/dto/Email.java b/src/main/java/dto/Email.java new file mode 100644 index 0000000..ab1dccc --- /dev/null +++ b/src/main/java/dto/Email.java @@ -0,0 +1,17 @@ +package dto; + +import lombok.Data; + +@Data +public class Email { + private String email; + + public Email(String email) { + this.email = email; + } + + public Email() + { + + } +} diff --git a/src/main/java/service/EmailService.java b/src/main/java/service/EmailService.java new file mode 100644 index 0000000..2b88a9e --- /dev/null +++ b/src/main/java/service/EmailService.java @@ -0,0 +1,9 @@ +package service; + +import dto.Email; + + +public interface EmailService { + + Email process(String email) throws Exception; +} diff --git a/src/test/java/com/example/midterm/EmailValidationControllerTests.java b/src/test/java/com/example/midterm/EmailValidationControllerTests.java new file mode 100644 index 0000000..9a79039 --- /dev/null +++ b/src/test/java/com/example/midterm/EmailValidationControllerTests.java @@ -0,0 +1,23 @@ +package com.example.midterm; +import dto.Email; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import service.EmailService; + +import static org.springframework.test.util.AssertionErrors.assertEquals; + +@SpringBootTest +public class EmailValidationControllerTests { + + @Autowired + private EmailService emailService; + + @Test + public void emailTest() throws Exception { + assertEquals("chancellor.galiza@upd.edu.ph", new Email("chancellor.galiza@upd.edu.ph"), emailService.process("chancellor.galiza@upd.edu.ph")); + } + + +} diff --git a/target/classes/com/example/midterm/ConcreteEmailService.class b/target/classes/com/example/midterm/ConcreteEmailService.class new file mode 100644 index 0000000000000000000000000000000000000000..a06406d9066c5ea76cface61657f38c283c6e93f GIT binary patch literal 1165 zcma)5Yfn=_5IsvfQ3{Fr*N8K zB0_Cx>Do#(#Gbv*wHC@}u$;gPr7IZn+42#0RV(Q?3iIvM$-;sm7)oInX~OWhcD99L zSU!%iy3JKpylV;H5nYff?IJ=N#h8Wh6ee({%dd9MF(j1;UG9jY>oUw8XZrhZBk?*Z z3uhVn>pHMY9+z$s8JsstPcn>kL#SDpV#tyxw%Frd=nC7Db&|@nR|DTsLW>BfD%7rY zgoPP~(PlenQ*?G1;;TWOWF0I^U#zvfEuo(BEhBWg95~#qaV1UMNyhcIY%(mA|ChQz zx`!%oM3c&P+#YYd!(zPK9bd-r5y1vx{#S}iZ2={V&7=_T6&@; zo03E<`hK8!L})Y&RKsqD<_5np*zW`N)@~Am2=s?g&?LPu@P)4nn85{le+<*~7>%bl zNcJK{HhD%qv9J&JCEC73)@%a5{!xr*>Yr8aD%*Q<|gn5B(WnJ literal 0 HcmV?d00001 diff --git a/target/classes/com/example/midterm/ConcreteNameService.class b/target/classes/com/example/midterm/ConcreteNameService.class index fe2cbf3f22d50341639408aa599e739009806cd6..8fa1125edbc0b69990a484221cbea6e72ca2e6d9 100644 GIT binary patch delta 1639 zcmZ`(-%nIW7(KIl?_O9hC`(zqh!hnm?6RPMD2qi4f}(&_u!#280vA|Vc5(M2+Fxs1 zE5(-n;3jQs)5I7PlRiP)EU6mOXJ7l$^tF9!|A4k>O3&PdmZWKR@67kjob$~$=bM?& z3%}Uuef-yhH2_azX~lb2JAtJek(B$wPI#_BxQDu^_nAQDiujy zv-4fm1v%I&AZonOQK4f$D(xj#D8EWaH39-^Y9gj6?(#9QLpqwUL!fv%GG(?W;v*4jFltTEN?DP( zmCD5tG;0X!Xu(nYThUM?&?-6QUL40W8rpQU^TghmAylplb8#R+&^r6!&sRKIB<2ixc)a-D|fl%S9uCD4WYh|e|l5|1G5H2#Q z2vd!Z3WV$e*Z#JRu!QJ%UPgRDru%WOlZgSWZjSe%rw^xmNt z+wit~Fz>~?SkQ1w7VAAbqkbMB&KF(u!pD81%U_;gqytz z58DxXb?gOuHLwb?Lc@howsIQCgUMFU0x*VgdIA%OG6>1yS13dRKikK(l60UZgIzto z+_1t=t?}*2VBc+2I>uAIA$NUP4Jq|uKzyos7Roi z1sbY^aPA)3IGn)& zj<O0``?K|81zc`D@8f4b`>Q(h`qc!`xvwWZ3tihp)@X`mMYg# ztOJ-LWRBPJbu?fejabAXEa5OdCGATz;}MSHG3h_xm?QKlXq+jxSggieZ}4 zmk=MP<>ERE8@LL5hXltICRO|hGc;9PCcP2LI+OBfD7AOw`qQNvbmyPU8bC=kQUofD zY~czmRd6AB2Kacfl{IeQbPmTBg24&dwOzv0X4ZL1tud}$xS7n(zhG9gay3!ED#4Ico!9-&Ip00^JYM;z)_ecC@)r1! z+rN9yOm!8jSnbm2vxcUy)#^?`#%C?fzghL+|E8_lV;!w7>wVhT5SFa`GD9Xs&S0`0 zJ{>-r=nQ)kxn#Fb51Ye@L{HroLuzcM)G;_RRq*I#n~y_2yq>5FcbMAF;V5&5FB&@y z$;m?T^2`;3wZ3g2Ai?g4Kuv%}Ccq}+@>BTAY_MGR|M`#YnWaMpZ{MBK!t~5Usd&@n zO!%ME9u6n(4UZVyqI%|=Oo~y%lF`Y+NU<>1^gUQm9}}Hk7RB-J;R$(@bKa69*E}Yf zaw$esO5tMnZ~KO!C9Fv`dd-JQrE9mQU1q}SRBm~n7#sF!sF8L^O7@3Csk+$%ibWnQ zWgt6(KVQ}2DhutJks zsfnbirJgz(Bv)(I8tKv{^O|}e&6-pTLyDdtJIgp7OljF}(#ajc?$XVDZQKJk^H4kX zge^R08!wdphV6V{Cm-3xzv32+{{XHEu3}InE%~439wM@ia8wUcFZ?lC3H7-@hwJ4X z#}%8kl(~0(q92_O`ysE diff --git a/target/classes/dto/Email.class b/target/classes/dto/Email.class new file mode 100644 index 0000000000000000000000000000000000000000..b63a439b9876bcafd114ed2924ccd385a0fd83ec GIT binary patch literal 1934 zcmaJ?T~8cU7=F&~%+9b(VT*-|#nM`;unS#3@S`kL+ZB`qYEv3a^v1(-!cN(p!I`rp z{TE&ue}KK=q9%$-FO1%3;%`#xb7qF!0f`Bm&-Z=a=Y8Jy%>Mb$^Irh0V6BV-iViFf zHcA4O$MR6tJ2Kd-f41{jwX{HK*$;euN1!-6w><eoF2f%Lcfl3~Fo=n)L7ruF$ghpU(txZIWdsu>0?sXzBMje=Oq zK*s{F=UHWO&Ix^n{)yqXfR#oZ-S7i-zt`PS(IdIjA&0Szuq8X&GV;wnJG6A$XVl@1 zzLX7?VN>aLxcfjxva7U;XmI6WFVKEhtp|sG?9=~l5QJK4pUe$(C+zNo`}I#$pdzW& zE>YaLubv2v&7d%u+N@fr+bR+$8yYiN35S!zlih_aEnEAW@*rbuKX|ylxhf#mDSD*h zUdMFFiM6Z4R10Emg}tby)_jwEIjQ3Y19gu1mpS{B4$d8A5KY9h3{kE91m_3t3V4m<2#OqsV4=)$ z7&o|^NUbr0o7~YaLFHTF+Gg`|GVmpi2L2t+!dw~n0kV0T2H!#@LG@Cj3{{vXPYVN3 z?*se@=NS)DY6c&0&T)Q&=jL{nv%nm#F$n{-L{Ag6bSB9Z$<8HL>L*t^n_LB_;rY4A z;GYrPCVaD2{T{Y;RQnC?cd&~`wO`?G&R36dA=z?q@%}uAC2Qdi3{P6W6IIlh;W%z#p2aBeW*Q4TEAnQNr!~r3C)PMhj{6rz9JqgD z!a;$5ZogtxrjSp{G9TwGsoTUin%O2BLn|+SUNXB+%O)8^E9-~(Gw8y6jtOHb@(pK; z^K_-LY^@~1OjR0f%HmdPPvI;asztm@ a{{r5_`<%@aT;l%+_{gAgbr(&nV)9=NLSX>_ literal 0 HcmV?d00001 diff --git a/target/classes/service/EmailService.class b/target/classes/service/EmailService.class new file mode 100644 index 0000000000000000000000000000000000000000..2fbce11bc135fe9975fc0028a767d6ea3ab459e5 GIT binary patch literal 251 zcmYk1L2kl83`M^~!ca=9BG`A^ZpZKQ|S`I<6vVZHNw*cYFa+a literal 0 HcmV?d00001 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 3a88902..bf43fe3 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1,8 @@ dto\Name.class service\NameService.class +service\EmailService.class com\example\midterm\MidtermApplication.class utility\NameBuilder.class +com\example\midterm\ConcreteEmailService.class +dto\Email.class com\example\midterm\ConcreteNameService.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 20e7a91..3187f64 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,6 +1,9 @@ -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\com\example\midterm\ConcreteNameService.java -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\com\example\midterm\MidtermApplication.java -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\com\example\midterm\MyController.java -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\dto\Name.java -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\service\NameService.java -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\main\java\utility\NameBuilder.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\ConcreteEmailService.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\ConcreteNameService.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\MidtermApplication.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\com\example\midterm\MyController.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\dto\Email.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\dto\Name.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\service\EmailService.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\service\NameService.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\main\java\utility\NameBuilder.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst index 5bc7db9..f5af487 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -1 +1,2 @@ com\example\midterm\MidtermApplicationTests.class +com\example\midterm\EmailValidationControllerTests.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 3db5e04..e9ccbd2 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1 +1,2 @@ -C:\Users\James\Desktop\entjava\ENTJAVAMidterms\src\test\java\com\example\midterm\MidtermApplicationTests.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\test\java\com\example\midterm\EmailValidationControllerTests.java +C:\Users\joren\Desktop\ENTJAVA\ENTJAVAMidterms\src\test\java\com\example\midterm\MidtermApplicationTests.java diff --git a/target/surefire-reports/TEST-com.example.midterm.EmailValidationControllerTests.xml b/target/surefire-reports/TEST-com.example.midterm.EmailValidationControllerTests.xml new file mode 100644 index 0000000..1f398ed --- /dev/null +++ b/target/surefire-reports/TEST-com.example.midterm.EmailValidationControllerTests.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml b/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml index 066474c..90f233c 100644 --- a/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml +++ b/target/surefire-reports/TEST-com.example.midterm.MidtermApplicationTests.xml @@ -1,60 +1,61 @@ - + - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -63,117 +64,15 @@ - - - - - - - - - - - - - - - - - - - - - but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.capitalisation(MidtermApplicationTests.java:93) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) -]]> - + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/com.example.midterm.EmailValidationControllerTests.txt b/target/surefire-reports/com.example.midterm.EmailValidationControllerTests.txt new file mode 100644 index 0000000..3290536 --- /dev/null +++ b/target/surefire-reports/com.example.midterm.EmailValidationControllerTests.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.example.midterm.EmailValidationControllerTests +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.880 s -- in com.example.midterm.EmailValidationControllerTests diff --git a/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt b/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt index cf3fe8f..09e446c 100644 --- a/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt +++ b/target/surefire-reports/com.example.midterm.MidtermApplicationTests.txt @@ -1,13 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.example.midterm.MidtermApplicationTests ------------------------------------------------------------------------------- -Tests run: 7, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.691 s <<< FAILURE! -- in com.example.midterm.MidtermApplicationTests -com.example.midterm.MidtermApplicationTests.capitalisation -- Time elapsed: 0.005 s <<< FAILURE! -java.lang.AssertionError: HEMANT AHIRKAR expected: but was: - at org.springframework.test.util.AssertionErrors.fail(AssertionErrors.java:59) - at org.springframework.test.util.AssertionErrors.assertEquals(AssertionErrors.java:122) - at com.example.midterm.MidtermApplicationTests.capitalisation(MidtermApplicationTests.java:93) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) - +Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.032 s -- in com.example.midterm.MidtermApplicationTests diff --git a/target/test-classes/com/example/midterm/EmailValidationControllerTests.class b/target/test-classes/com/example/midterm/EmailValidationControllerTests.class new file mode 100644 index 0000000000000000000000000000000000000000..8d0d213c7d7e9ba825c8b08ae7353bb49f5954ad GIT binary patch literal 1069 zcmb7D+invv5Is)QZj&ywq!(x@w542{LSqRb1PUMu3gRIGiJ(Y4I=gP_u)AKo-nQ^p zNJ!-(@d11kV!Wx+N`wbqJf0c*obk-@uixK)0(cBwMF|rg%04DB#V|Jz2ZBc;>GRjU zfeb9e)FYKB`-EX)tKOZ)G{b7JFOon;kv5IKh}0+XG*82Z4D&|1@1e?239aU>Sg5Fq z3Va8Cj$v`DeG1>PMkW1by<5R7<~&^RQNujL-9X1&9*H=OB#%{SrHO}7U7`wwRXTaD z6Kix7N%K}_He>Lmlm?}@-_^O1|u z1-_eGeW;8Kn+)aWI;3{awpAiu<#CVtEeM{W*4BZDy22>up9ITxUlHHE_Ww_ixGKd6 z-8>npt)oDuu2-3dZHD<%*^DwI!{T9soYct&d8$Y$T%?LS3<9inbZ!FqLb-xB3o-sv zK@CU1aDRNOw6?=J2BbTAWO=6;@-vDTT-YE9m*_t+T1muY*U6hAyFs=@mOdA)*T~~! z8QID0W3bOfdXrX{27FvE*5Uwe;3jztw