From 88bc0f57a3a06727133ce06fc64d38416f070e22 Mon Sep 17 00:00:00 2001 From: subhamBakshi Date: Wed, 12 Aug 2020 19:56:14 +0530 Subject: [PATCH] ProGrad FSJ0620D111 --- .classpath | 6 +-- build/classes/.gitignore | 2 + build/classes/controller/FlamesCheck.class | Bin 1349 -> 2392 bytes src/controller/FlamesCheck.java | 60 +++++++++++---------- src/service/FlamesCheckService.java | 44 +++++++++++++++ src/testing/TestFlamesCheckService.java | 52 +++++++++--------- 6 files changed, 104 insertions(+), 60 deletions(-) diff --git a/.classpath b/.classpath index 2846539..20c137d 100644 --- a/.classpath +++ b/.classpath @@ -8,10 +8,6 @@ - - - - - + diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 4e7e508..710eab3 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1 +1,3 @@ +/service/ +/testing/ /controller/ diff --git a/build/classes/controller/FlamesCheck.class b/build/classes/controller/FlamesCheck.class index fe7152f9157fd498f6faf543a7b8c5a0e811fa05..99f9fc639f388c57d41efb9ff1b317effc5b6409 100644 GIT binary patch delta 1113 zcmZWoOHUI~7(KVIX=_m|5>jYFN#tdLk*C;FUIhdNM2iCAgQ47(fp&^BrD9?-nz%Ql z8&(EauGuK4A#tG#H^v<<+mr+qC7bxsZyLLxysOx77Z?4j7dsV3?)@r ziTbVRV=#x+O>I>`KSQ;~)s!6O;#iE{(t@izydFATvLk@=nQ6#@VFVfM5m{L|&0}b6 znp~4oQbF<3mFA#T$0)TC=SGKHC#J{5l+2%LVnmg>vZA%EX&YADU~m=ju|$fiXY>Sv zyNH$|5gty;3FWlFEryz+jJTw#vJ~ZQYkH=|RH+26@VLy+dfYCppvlWIax9xbmMLUU zJA<=yk7r~DgE11;NbF>Rr!57h`We_d4YIQ=l$65jQ_{w)v>f9C7U+X*pLpEbMnci( zd6A*K*y8jH;}^3FCe)+@rg>W}9Pr>0>e6pbOF4c# z!|R0wmM9^fOSoBDV32s8<0ngb5AoVATv>tB#rz&^(})W+KSmYJO|a=`Mg_cZqZOAS zq8C>&gbvK36B4?Spd<5?;ughM#J-_3vrTb_;yd`Uk3M`wKYn5WzbGD2{DUCMsr+k{ z(R_@Ha8k^m7V5&XsEv9VV1xb}Gq^*lDyYO=LMD>(9U;uZOo9$^5BFiAhBgw`4uOQ_ z&{iJpA4VVuU;=umihu{%yD>m|YUy&5oQITYz$0=8I8Q>K&{$do H(;)o^7n1d; delta 143 zcmca1bd-zh)W2Q(7#J8#7%Vq(6){gf&ANwGoPmWwa&iw_1g9(m4}%LU21X$1$RGeD6(Euff($}H9#9#B4udXOo{>S1K_94tiNP2s X&IGj06iD*{<;;NCJeq;An85-73bhfb diff --git a/src/controller/FlamesCheck.java b/src/controller/FlamesCheck.java index b9b9a0b..cf858d3 100644 --- a/src/controller/FlamesCheck.java +++ b/src/controller/FlamesCheck.java @@ -13,6 +13,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import service.FlamesCheckService; + @WebServlet("/flames") @@ -33,35 +35,35 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - /* - * Uncomment the below code to test your output - * String name1 = request.getParameter("your"); - * String name2 = request.getParameter("crush"); - * - * FlamesCheckService fcs = new FlamesCheckService(); - * - * char k = fcs.findFlames(name1,name2); - * - * if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp" - * ); rd.forward(request, response); - * - * } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp") - * ; rd.forward(request, response); - * - * } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( - * "/WEB-INF/views/affection.jsp"); rd.forward(request, response); - * - * } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( - * "/WEB-INF/views/marriage.jsp"); rd.forward(request, response); - * - * } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp" - * ); rd.forward(request, response); - * - * } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( - * "/WEB-INF/views/siblings.jsp"); rd.forward(request, response); - * - * } - */ + + // Uncomment the below code to test your output + String name1 = request.getParameter("your"); + String name2 = request.getParameter("crush"); + + FlamesCheckService fcs = new FlamesCheckService(); + + char k = fcs.findFlames(name1,name2); + + if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp" + ); rd.forward(request, response); + + } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp") + ; rd.forward(request, response); + + } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( + "/WEB-INF/views/affection.jsp"); rd.forward(request, response); + + } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( + "/WEB-INF/views/marriage.jsp"); rd.forward(request, response); + + } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp" + ); rd.forward(request, response); + + } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( + "/WEB-INF/views/siblings.jsp"); rd.forward(request, response); + + } + } } diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java index a8c006a..d665018 100644 --- a/src/service/FlamesCheckService.java +++ b/src/service/FlamesCheckService.java @@ -7,3 +7,47 @@ // You must return only the following values ['f','l','a','m','e','s'] // change the return value at the end of the method corresponding to your return value +public class FlamesCheckService +{ + public static char findFlames(String name1,String name2) + { + StringBuffer s1=new StringBuffer(name1); + StringBuffer s2=new StringBuffer(name2); + int a=s1.length(); + int b=s2.length(); + for(int i=0;i= len3) { //if unique count is more than the flames length + e = e % len3; + } + s3.deleteCharAt(e); + len3 = s3.length(); + e = e+len-1; + } + + char result=s3.charAt(0); + return result; + } + +} \ No newline at end of file diff --git a/src/testing/TestFlamesCheckService.java b/src/testing/TestFlamesCheckService.java index f3b45fe..22c64dc 100644 --- a/src/testing/TestFlamesCheckService.java +++ b/src/testing/TestFlamesCheckService.java @@ -8,30 +8,30 @@ public class TestFlamesCheckService { FlamesCheckService fcs = new FlamesCheckService(); @Test -// public void testFindFlamesMethod() { -// String name1 = "Alex"; -// String name2 = "Joylin"; -// char temp = 'a'; -// assertEquals(temp,fcs.findFlames(name1, name2)); -// name1 = "Steffe"; -// name2 = "Bobby"; -// temp = 'm'; -// assertEquals(temp,fcs.findFlames(name1, name2)); -// name1 = "John"; -// name2 = "Jully"; -// temp = 'e'; -// assertEquals(temp,fcs.findFlames(name1, name2)); -// name1 = "George"; -// name2 = "Neythiri"; -// temp = 'l'; -// assertEquals(temp,fcs.findFlames(name1, name2)); -// try { -// fcs.findFlames(null, null); -// fcs.findFlames("AAA", null); -// fcs.findFlames(null, "BBB"); -// } -// catch(Exception e) { -// e.printStackTrace(); -// } -// } + public void testFindFlamesMethod() { + String name1 = "Alex"; + String name2 = "Joylin"; + char temp = 'a'; + assertEquals(temp,fcs.findFlames(name1, name2)); + name1 = "Steffe"; + name2 = "Bobby"; + temp = 'm'; + assertEquals(temp,fcs.findFlames(name1, name2)); + name1 = "John"; + name2 = "Jully"; + temp = 'e'; + assertEquals(temp,fcs.findFlames(name1, name2)); + name1 = "George"; + name2 = "Neythiri"; + temp = 'l'; + assertEquals(temp,fcs.findFlames(name1, name2)); + try { + fcs.findFlames(null, null); + fcs.findFlames("AAA", null); + fcs.findFlames(null, "BBB"); + } + catch(Exception e) { + e.printStackTrace(); + } + } }