From 856a7b78587562fce3ae53560284cad3a2ee2c9e Mon Sep 17 00:00:00 2001 From: JordanWitt Date: Mon, 5 Dec 2022 13:41:21 -0600 Subject: [PATCH 1/4] making sure this is pushing to git repo --- src/main/java/CodeupCrypt.java | 3 ++ src/main/java/Student.java | 2 ++ src/test/java/CodeupCryptTest.java | 29 +++++++++++++++++ src/test/java/StudentTest.java | 2 ++ src/test/java/introTesting.java | 52 ++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 src/main/java/CodeupCrypt.java create mode 100644 src/main/java/Student.java create mode 100644 src/test/java/CodeupCryptTest.java create mode 100644 src/test/java/StudentTest.java create mode 100644 src/test/java/introTesting.java diff --git a/src/main/java/CodeupCrypt.java b/src/main/java/CodeupCrypt.java new file mode 100644 index 00000000..d512cf3f --- /dev/null +++ b/src/main/java/CodeupCrypt.java @@ -0,0 +1,3 @@ +public class CodeupCrypt { + +} diff --git a/src/main/java/Student.java b/src/main/java/Student.java new file mode 100644 index 00000000..f3406bb9 --- /dev/null +++ b/src/main/java/Student.java @@ -0,0 +1,2 @@ +public class Student { +} diff --git a/src/test/java/CodeupCryptTest.java b/src/test/java/CodeupCryptTest.java new file mode 100644 index 00000000..e7588945 --- /dev/null +++ b/src/test/java/CodeupCryptTest.java @@ -0,0 +1,29 @@ +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; + +public class CodeupCryptTest { + + @Test + public void testIfVersionIsSet(){ + assertEquals(0.0, CodeupCrypt.version, 0); + CodeupCrypt.version = 1.2; + assertEquals(1.2, CodeupCrypt.version, 0); + } + + @Test + public void testHashPassword(){ + assertEquals("C0d39p", CodeupCrypt.hashPassword("Codeup")); + assertEquals("F3r", CodeupCrypt.hashPassword("Fer")); + assertEquals("123", CodeupCrypt.hashPassword("123")); + assertEquals("124", CodeupCrypt.hashPassword("12a")); + } + + @Test + public void testCheckPassword(){ + assertTrue("check password", CodeupCrypt.checkPassword("fer", "f3r")); + assertFalse("check password", CodeupCrypt.checkPassword("fer", "fer")); + } + +} + diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java new file mode 100644 index 00000000..d7d370dd --- /dev/null +++ b/src/test/java/StudentTest.java @@ -0,0 +1,2 @@ +public class StudentTest { +} diff --git a/src/test/java/introTesting.java b/src/test/java/introTesting.java new file mode 100644 index 00000000..bcd3333d --- /dev/null +++ b/src/test/java/introTesting.java @@ -0,0 +1,52 @@ +import org.junit.Test; +import static org.junit.Assert.*; +import org.junit.Before; +import java.util.ArrayList; +import java.util.List; + +public class introTesting { + private List names; + + @Before + public void setUp(){ + this.names = new ArrayList<>(); + this.names.add("Fer"); + } + + // We can verify that the names list is not longer null because it was initialized in the setUp() method with the following test: + @Test + public void testIfNamesIsInitialized(){ + assertNotNull(names); + System.out.println(names); + } + + @Test + public void testIfANameCanBeAdded(){ + assertEquals(1, this.names.size()); + this.names.add("Zach"); + assertEquals(2, this.names.size()); +// assertSame("fer", this.names.get(0)); + assertSame("Zach", this.names.get(1)); + System.out.println(names); + } + @Test + public void testIfCompanyNameIsEquals() { + String expected = "Codeup"; + String actual = "Codeup"; + + assertEquals(expected, actual); + } + +// When you're using floating points values a third parameter is required (Delta) which represents a positive margin of error of decimals. + + @Test + public void testIfChangeIsCorrect() { + Double price = 10.0; + Double discount = 4.5; + + assertEquals(5.5, price - discount, 0); + assertEquals(5.1, price - discount, 0.5); + assertNotEquals(4.9, price - discount, 0.5); + } + +} From 1d91d4015fa97a67acec0af3cc00371c473f2045 Mon Sep 17 00:00:00 2001 From: JordanWitt Date: Mon, 5 Dec 2022 14:09:00 -0600 Subject: [PATCH 2/4] updating to new branch --- src/main/java/Student.java | 39 +++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index f3406bb9..8d39cbe8 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -1,2 +1,39 @@ +import java.util.ArrayList; + public class Student { -} + ArrayList grades; + private String name; + private long id; + + public Student(long id, String name){ + this.name = name; + this.id = id; + this.grades = new ArrayList<>(); + } + + public String getName(){ + return this.name; + } + + public long getId(){ + return this.id; + } + + public void addGrade(int grade){ + this.grades.add(grade); + } + + // returns the average of the students grades + public double getGradeAverage(){ + double result = 0; + for (int grade : this.getGrades()) { + result += grade; + } + return result / this.getGrades().size(); + } + + public ArrayList getGrades(){ + return this.grades; + } + +} \ No newline at end of file From 1a6f53a2c61b7a2d4dad28a35f7b76c278713073 Mon Sep 17 00:00:00 2001 From: JordanWitt Date: Mon, 5 Dec 2022 14:21:02 -0600 Subject: [PATCH 3/4] student tests --- src/test/java/StudentTest.java | 35 +++++++++++++++++ .../production/junit-tests/CodeupCrypt.class | Bin 0 -> 258 bytes .../java/production/junit-tests/Student.class | Bin 0 -> 1497 bytes .../java/test/junit-tests/StudentTest.class | Bin 0 -> 1505 bytes src/test/javatest/StudentTest.java | 37 ++++++++++++++++++ 5 files changed, 72 insertions(+) create mode 100644 src/test/java/production/junit-tests/CodeupCrypt.class create mode 100644 src/test/java/production/junit-tests/Student.class create mode 100644 src/test/java/test/junit-tests/StudentTest.class create mode 100644 src/test/javatest/StudentTest.java diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index d7d370dd..5a269fce 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -1,2 +1,37 @@ +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + public class StudentTest { + Student jordan; + Student studentWithManyGrades; + + @Before + public void init(){ + jordan = new Student(1, "Jordan Witt"); + jordan.addGrade(90); + studentWithManyGrades = new Student(2, "Han Solo"); + studentWithManyGrades.addGrade(90); + studentWithManyGrades.addGrade(80); + studentWithManyGrades.addGrade(50); + } + + @Test + public void ifUserObjectCanBeCreated(){ + assertEquals("Jordan Witt", jordan.getName()); + assertEquals(1, jordan.getId()); + } + + @Test + public void testIfAddGradeWorks(){ + assertSame(90, jordan.getGrades().get(0)); + } + + @Test + public void testIfAvgIsCorrect(){ + assertEquals(90, jordan.getGradeAverage(), 0); + assertEquals(73.33333333333333, studentWithManyGrades.getGradeAverage(), 0); + } } diff --git a/src/test/java/production/junit-tests/CodeupCrypt.class b/src/test/java/production/junit-tests/CodeupCrypt.class new file mode 100644 index 0000000000000000000000000000000000000000..e74052b8ce85d2122a4c5bc06ce1c6e806a02914 GIT binary patch literal 258 zcmYjLyAFat5S&F21s}veuu}{90F8}_712UNf8a&WAP@u-Kg-I*!VmDHjC;hw-DGZO zW^Xg^&+`Rf0ndSfh7Gd=3r&J|5?A3TB0cz<=p^Hk(44DOl?y^+G!AXF2<|f5%PLpc(mC_%*KX0l7 qVF;UZ>LPAV%GhS+*Br1W573Vy=6g@paMzDz?3!1njaSMz_+~P)z#wCV`M8%4wZxa~FC=S*zq|_hq3w-bk ze6rLk6SpeMXMe-Lu*&81FbKF5#Z33@d(S=h+}rcz$A?bAblLr6zhB7z=)zPskC znW>siC9}AE*D84eJ=3;hdou!|RC+0j4T$Q9No<4^(2HK9Y&rA_JLY{$pg-RRD0;5# zRI)0hS7H+44bQG-W?k2Ol(*|%3<-o(z>q`|o0+`gnq{jlFw_L@ zcF)Ezj1e7MCAML^K%$*I=Xh4da!GO3tTwF0I|9j6F5N*d@E}G4qY`5nXNhK+1cy=` zZcQ1o>Dw{V+9k0Ydjz5t%exdX+nfqe|KgUwghUEyfep52xu#bmpJbPNF0f}eVjuSF zn3Onx40UXa({f=cD`vf5J*3)f#cdUFNa8S#DD{2wU<B)rH2oZ zQ>CAjIHiulb^9^R(V|^(Ot0Z`ZTw5~=?-mL63%2*T?-v2LGRN`1U_FY6Kqr7cC13< z{<7uXFqf;e^yh0Ov$|xuw%P~Au(x8f-O+q7Swz+;cEO*n?)rip0uego*f*-Oz#7>@ zzc)a~74tzrYJW@D?iT+~ zideDMa7)<*VqkAqP}PG0q{TRu~cH zd&GDPVN9+;H%8YGH$Eb9>n#S>F!qWs0sOXOiRvL3TB-aYuFvB_kTt`%I*S-@pugfmgG!*Nfq`fFlud^KP~alwXi=0i^lk;mU(nDQ zJn+xpOPCLWFVb6MOq`hqx4y%cb?ms=E>V58K=~xL_&~{~^Y60a$YFs{0+*2wAfHkY zCCpUsys?g*>)2bEd=Eq58AiA`DDWA>>o|HWJTVl0QksAM^Xo*@@x+tbO9qDg;+yJj zW5Vt1<_=6?6b8n88cN-9%A=C2ZcPP*G#tSd6i8%|RtfDpV*Kdt`^H$Iz9>X%O4inU X@K3#W`zgBhZVt~?f?Ol8hU>ooYJeIE literal 0 HcmV?d00001 diff --git a/src/test/java/test/junit-tests/StudentTest.class b/src/test/java/test/junit-tests/StudentTest.class new file mode 100644 index 0000000000000000000000000000000000000000..55ec350caee4c30a6228a96b1fe103be09ea72d0 GIT binary patch literal 1505 zcmZuxZBrXn7(F*Y7Sbhzkd{;dYilJzZEAh3sg)%3C2538V6o_z3%R6=VRzi!Fw<{- z@dr7hG@~>A0DqL@xpx>Joafx<=AVE6{2Rc1{Fp%s6BZ_IOd&0hJC>)i z(wAPZvUPB*4kLl|J=b%i`vMcCvSVRd!0JSUuJWR3WCSj?{GcnnYkO`KWnjV9NV5W0 zO0D(?tP=&U*Q=JD8O$MPVctd_3(QWSc2uaTjt!Q;OgmYxYRJnru3%AMT6VjS0@+mp zlci?anPLh0lbXic+2ZI*aM4Xj7gL zvrsC(t~i7DaMQy3HdaxhKYq}w91mznr51)NplDl~!GoU%vL6bpmc~G0538@QlpU>M z&Bh1#P+*E0nqA{?OB3GGY!$ATS}h&qy() z9IqmYFgAW+<4fG7xnzrd5Li5~c@Vk%N-YTFi?$m^jIZLJg|BV)$TtEDhV#`J$|Vpj zew8sPS(j0>QP-wrVuw0(Ilb=uV$MvL|Io%GJQkQc7gRe{f$Z@p*lHUZp{0#@!p10V zY;2UB^!oO$`LF>RzV3s$w(F_Q!O4LNcH}{yEBUs6DEp2KTs=<~C!^;s&t~?#t#rFp z38Fh&;Oh3ki`*0CxS`9On&xSKM`zb0{w zwZC9J%j9QX;?f_;uKkW|ZvPAgvs^$i|CZTU;>J?Ep$AWOgdW`CU_`w_T3{AgeivEA zDss4udE8|kbyhHv)JP=lFkTDZHS(Mbc`ZyD>BanvmUM=9hPaW5hvgwY8gXVZ!Q4fb zTIBQU7)SAc9D9c2`wNabGqqKP-2M=^W9-i-&hXU`>mz*q*9k0B{mK}2;f>hOF0i*u sRm>}(5hFjy4$&;2&Dqi!%xpvw7jd1o-M|uW#K@@SHxlhrQVKu(2fN5D7ytkO literal 0 HcmV?d00001 diff --git a/src/test/javatest/StudentTest.java b/src/test/javatest/StudentTest.java new file mode 100644 index 00000000..5a269fce --- /dev/null +++ b/src/test/javatest/StudentTest.java @@ -0,0 +1,37 @@ +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + +public class StudentTest { + Student jordan; + Student studentWithManyGrades; + + @Before + public void init(){ + jordan = new Student(1, "Jordan Witt"); + jordan.addGrade(90); + studentWithManyGrades = new Student(2, "Han Solo"); + studentWithManyGrades.addGrade(90); + studentWithManyGrades.addGrade(80); + studentWithManyGrades.addGrade(50); + } + + @Test + public void ifUserObjectCanBeCreated(){ + assertEquals("Jordan Witt", jordan.getName()); + assertEquals(1, jordan.getId()); + } + + @Test + public void testIfAddGradeWorks(){ + assertSame(90, jordan.getGrades().get(0)); + } + + @Test + public void testIfAvgIsCorrect(){ + assertEquals(90, jordan.getGradeAverage(), 0); + assertEquals(73.33333333333333, studentWithManyGrades.getGradeAverage(), 0); + } +} From 85ad5d75dbe3b64c812f00a392e22577a6a12bc7 Mon Sep 17 00:00:00 2001 From: JordanWitt Date: Mon, 5 Dec 2022 15:09:02 -0600 Subject: [PATCH 4/4] sout testing in console --- .../java/test/junit-tests/StudentTest.class | Bin 1505 -> 2484 bytes src/test/javatest/StudentTest.java | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/src/test/java/test/junit-tests/StudentTest.class b/src/test/java/test/junit-tests/StudentTest.class index 55ec350caee4c30a6228a96b1fe103be09ea72d0..45b85052855cd166489b03d988611d0c854ef183 100644 GIT binary patch literal 2484 zcmaJ?`&Sc37`+o7OX3PKfQV8HmPbNcW9`ctYk@>GG>SD4s`fRIAuMcmad$!+`_R7M z?XUee+G8Wfp3^^|e^gJu+1-#0a0-WI=9`)C-tT^QcK`YJ$=?7j=+MxqqYK>( z@lC$N(BZGeu_hV1FBz60FEex`QzZ>O3|djv%EFR8h%p>lu$?luMpq0eW6+?h zOh*}xCl?B>WJT#1Rwa`vMbU@2hGRMs=%>>`swLqns7)^yL$naYGb-hvj^h|&=;7t^ zRfm@aLuWFdDs@o_>L=2JQ?z=GSQKs3RuE6=IIZ#zx;|B6w{e|Yb?>+v#VE!!oYC-qGgFnXJ#$SmRuTS zR4?70x#q;W?Fc$|!dPD>pZVfsxiu%Ubkn6Ex5NuAGX^OAlF;(&v%$+~#dfw-;vl+H z$-7zGalChDtZ3JqH8F3fO5&k+-C1QP3eDNJbfv?$uM4?hm)*W@JdELUe4*h>CF@rV z<1ObI){ea;(!OZ^6`bd5(st?$zlGHgHu_2Fy;wGdJ6^Eut=e|xU`Ilcwu4LcZE?u< zyP^F}KZQa;iYzzHq9H}52j4J680*1zqW9H{d!`Wk*_ zIQ{=y3C6D#WArJAkjd2_eQ)Rq^s>im}ns7Pey2>)*DFg;>9O;4WP9a$4Nwq&r$T!?+}$cg*eXP80|}7 zj!Ip`0Jbm~s=*9u*r9W(!VkTAKH972E;_whClb+s%r0J!`NQlkuI`b{Hn7kllAvS2 zFbQ>%h@8SWMna$y`#|d+=>0v=B04D;NI1>UJI~45WJ+S-KQ`Onr09Jjda_=rSNGO_-(%x*p{AGWqY6dl^`~=l~o$v*i xq&`eh=}Baf3USIE!l?tF5Q_*t#b@-tmqrhW*Vo?jTYOKk7|nmcPxuAH{{aHOQZ)bo delta 706 zcmZvZ&2G~`6ot>ktw&4-gJ@KO)D&n^uu~v~Lis5_X_69RDpFEvpmbxYL!_#7k%nx` zhCOJuyaZB}S}b?~7Q6#1o&c7JYdeaosn!XE=gR5t-qvJ=86(CxWX{nR^7%XgJCtJ{UUDfHX`tOuk_C8Q@AQV5AsN)I4DN0uF_?v36r#gOHMHy>h zMmNm(l)1_9eMYDf7`?z~@c`^A6)7}nHKR?A6{=-CfahpY z$FNFYQwYT$2Xj^J@yf|WJqfOV^4wmct`5{M2JE$n