From 5108b5e817f01c3ab34f26bb5bd9e1f5e74f2459 Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Wed, 3 May 2017 09:53:30 -0400 Subject: [PATCH 01/14] Set up maven archetype --- .DS_Store | Bin 0 -> 6148 bytes typeinformation/.DS_Store | Bin 0 -> 6148 bytes typeinformation/.idea/compiler.xml | 16 + typeinformation/.idea/encodings.xml | 6 + .../libraries/Maven__junit_junit_3_8_1.xml | 13 + typeinformation/.idea/misc.xml | 51 +++ typeinformation/.idea/modules.xml | 8 + typeinformation/.idea/workspace.xml | 384 ++++++++++++++++++ typeinformation/pom.xml | 25 ++ .../src/main/java/kalaygian/dennis/App.java | 13 + .../test/java/kalaygian/dennis/AppTest.java | 38 ++ typeinformation/typeinformation.iml | 15 + 12 files changed, 569 insertions(+) create mode 100644 .DS_Store create mode 100644 typeinformation/.DS_Store create mode 100644 typeinformation/.idea/compiler.xml create mode 100644 typeinformation/.idea/encodings.xml create mode 100644 typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml create mode 100644 typeinformation/.idea/misc.xml create mode 100644 typeinformation/.idea/modules.xml create mode 100644 typeinformation/.idea/workspace.xml create mode 100644 typeinformation/pom.xml create mode 100644 typeinformation/src/main/java/kalaygian/dennis/App.java create mode 100644 typeinformation/src/test/java/kalaygian/dennis/AppTest.java create mode 100644 typeinformation/typeinformation.iml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9af5234e60b2f1ca4fe38b562aeec0697bb00b03 GIT binary patch literal 6148 zcmeHK-D(p-6h4#2x{H+NqR?LMO`#V>60HqIgf*rYxe&yNUbK?#y0Kl@?1W^~P-A3Y zqkV%uiciqT(Qked5@IPr5L?cHGvApr=bT}`N#=)$L~RgNh)P7{Kou5TG=C5^u5>{P z)>8xuUE?hs(o^bC)JPVh+3`Ozpw`Z%_gJ^rRHvEslV8F_h8R^pjhE1!Us_-hty4x9 z)TK7Xl+ss{)WfO=@W!yyMlzRu{dd{nu-~|C>^Pg-l~;|E&c(OU_wkQQO$!P94YaIV zoWK=~J4ick_R>VAr-+T$cuvPe2ck3lTN}uK7^fF*cXb> zv!lMJ!%6rCxn%~Jfq4d2Ot+-Y|HIqg|MN-QV+NRk2gQIW)|>SjKFOY~3m>P>S`T^x qRiff@gVPik`Y1-MI*PZTTHyDT0rV~A2H}D5ML^TQ4Kwgh8TbvZesvxI literal 0 HcmV?d00001 diff --git a/typeinformation/.DS_Store b/typeinformation/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9c24053a80d3f39e9b91e8ca9cdc06539fa9a0ca GIT binary patch literal 6148 zcmeHK-AV#M6h5PtD-n4Sq<`o&+M3eLO%1 zyo$#gjyD%gj%8#(tX&eiz;WevVQT%jgDv8>I7Z$1l7bdM90KS;L#^^8>V0vPGYGnl zC!;=`uIC0}F89e|@x;n%(nzI@)Vgt7ZSz4jw8MT-vU}IE<~Cc7wl6sMCbsQdx~)Mi zy?M(0(02V+Zz}xe%JrLkP~v^R8OVOl?XZoxa-do|GaMe|b6In*a5T!A!(tKb!v5iC zWEfl9`IAb$^Y}D;9=*KEX#&GvTFQpTF}$InNw}}}e2@Eg=ov?kqX>xsVt^P}Vg~e< zWvngnH`1pO1H{1JFd+5^6IGz4F;XbE4lLvo08v~crJyY?jUva?XlaZTVhajWsfa3- z=_dwL>F76goTV{RsM3My#|P6RGyOtga&+w9l;OZEg;Wv)#K0^AaaB!=^Z)GU_y24X z)rbLN;9oJo66I>Sgj3RI>)hnTS!<%!QH6-ONZ}*}4S5t}tT>7@s8Y~x3Ioy77%4;# P3S9&w4O9>VzskTjNDOBd literal 0 HcmV?d00001 diff --git a/typeinformation/.idea/compiler.xml b/typeinformation/.idea/compiler.xml new file mode 100644 index 0000000..636eaf8 --- /dev/null +++ b/typeinformation/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/typeinformation/.idea/encodings.xml b/typeinformation/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/typeinformation/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml b/typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml new file mode 100644 index 0000000..71b2993 --- /dev/null +++ b/typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/typeinformation/.idea/misc.xml b/typeinformation/.idea/misc.xml new file mode 100644 index 0000000..1ce943a --- /dev/null +++ b/typeinformation/.idea/misc.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/typeinformation/.idea/modules.xml b/typeinformation/.idea/modules.xml new file mode 100644 index 0000000..42e27ba --- /dev/null +++ b/typeinformation/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/typeinformation/.idea/workspace.xml b/typeinformation/.idea/workspace.xml new file mode 100644 index 0000000..04e9a79 --- /dev/null +++ b/typeinformation/.idea/workspace.xml @@ -0,0 +1,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1493819429603 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + typeinformation + + + + + + + + Maven: junit:junit:3.8.1 + + + + + + + + \ No newline at end of file diff --git a/typeinformation/pom.xml b/typeinformation/pom.xml new file mode 100644 index 0000000..83b563f --- /dev/null +++ b/typeinformation/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + + kalaygian.dennis + typeinformation + 1.0-SNAPSHOT + jar + + typeinformation + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 3.8.1 + test + + + diff --git a/typeinformation/src/main/java/kalaygian/dennis/App.java b/typeinformation/src/main/java/kalaygian/dennis/App.java new file mode 100644 index 0000000..de5d428 --- /dev/null +++ b/typeinformation/src/main/java/kalaygian/dennis/App.java @@ -0,0 +1,13 @@ +package kalaygian.dennis; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/typeinformation/src/test/java/kalaygian/dennis/AppTest.java b/typeinformation/src/test/java/kalaygian/dennis/AppTest.java new file mode 100644 index 0000000..0bbab25 --- /dev/null +++ b/typeinformation/src/test/java/kalaygian/dennis/AppTest.java @@ -0,0 +1,38 @@ +package kalaygian.dennis; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/typeinformation/typeinformation.iml b/typeinformation/typeinformation.iml new file mode 100644 index 0000000..2eb246a --- /dev/null +++ b/typeinformation/typeinformation.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file From b5e7c21cdc75ed87a36a6709bca9d72a2c3a6c89 Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Wed, 3 May 2017 09:59:07 -0400 Subject: [PATCH 02/14] Created .gitignore and placed files accordingly --- typeinformation/.gitignore | 2 + typeinformation/.idea/workspace.xml | 137 ++++++++++++---------------- 2 files changed, 62 insertions(+), 77 deletions(-) create mode 100644 typeinformation/.gitignore diff --git a/typeinformation/.gitignore b/typeinformation/.gitignore new file mode 100644 index 0000000..1f1025f --- /dev/null +++ b/typeinformation/.gitignore @@ -0,0 +1,2 @@ +.idea +.DS_Store \ No newline at end of file diff --git a/typeinformation/.idea/workspace.xml b/typeinformation/.idea/workspace.xml index 04e9a79..a0312bc 100644 --- a/typeinformation/.idea/workspace.xml +++ b/typeinformation/.idea/workspace.xml @@ -12,8 +12,8 @@ - - + + @@ -23,6 +23,16 @@ + + + + + + + + + + @@ -30,6 +40,13 @@ + + + @@ -57,6 +74,7 @@ + @@ -69,63 +87,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -246,44 +211,46 @@ - + - + - - - - - - + + + + + + + - - - - - - - + + + + + + - - + + + - - - + + @@ -305,6 +272,22 @@ + + + + + + + + + + + + + + + + From 3f15c5ee4afce8af1295822a0179025c19eb13a2 Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Fri, 5 May 2017 08:24:26 -0400 Subject: [PATCH 03/14] Initialized neccessary class / test class files according to UML --- .gitignore | 12 - .idea/TypeInformation.iml | 12 + .idea/misc.xml | 42 ++ .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 692 ++++++++++++++++++ typeinformation/.idea/workspace.xml | 52 +- .../src/main/java/kalaygian/dennis/App.java | 13 - .../java/kalaygian/dennis/part1/Display.java | 7 + .../kalaygian/dennis/part1/FamilyTree.java | 7 + .../java/kalaygian/dennis/part1/Main.java | 7 + .../test/java/kalaygian/dennis/AppTest.java | 38 - .../dennis/part1/TestFamilyTree.java | 7 + 13 files changed, 836 insertions(+), 67 deletions(-) delete mode 100644 .gitignore create mode 100644 .idea/TypeInformation.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml delete mode 100644 typeinformation/src/main/java/kalaygian/dennis/App.java create mode 100644 typeinformation/src/main/java/kalaygian/dennis/part1/Display.java create mode 100644 typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java create mode 100644 typeinformation/src/main/java/kalaygian/dennis/part1/Main.java delete mode 100644 typeinformation/src/test/java/kalaygian/dennis/AppTest.java create mode 100644 typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 32858aa..0000000 --- a/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* diff --git a/.idea/TypeInformation.iml b/.idea/TypeInformation.iml new file mode 100644 index 0000000..008aa02 --- /dev/null +++ b/.idea/TypeInformation.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..15ccfc7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + 1.8 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..7f5ebd1 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..b49b106 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,692 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + 1493985462458 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/typeinformation/.idea/workspace.xml b/typeinformation/.idea/workspace.xml index a0312bc..125ca75 100644 --- a/typeinformation/.idea/workspace.xml +++ b/typeinformation/.idea/workspace.xml @@ -87,6 +87,34 @@ - - @@ -237,7 +265,7 @@ - + @@ -264,6 +292,22 @@ + + + + + + + + + + + + + + + + diff --git a/typeinformation/src/main/java/kalaygian/dennis/App.java b/typeinformation/src/main/java/kalaygian/dennis/App.java deleted file mode 100644 index de5d428..0000000 --- a/typeinformation/src/main/java/kalaygian/dennis/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package kalaygian.dennis; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/typeinformation/src/main/java/kalaygian/dennis/part1/Display.java b/typeinformation/src/main/java/kalaygian/dennis/part1/Display.java new file mode 100644 index 0000000..0735a0f --- /dev/null +++ b/typeinformation/src/main/java/kalaygian/dennis/part1/Display.java @@ -0,0 +1,7 @@ +package java.kalaygian.dennis.part1; + +/** + * Created by denniskalaygian on 5/5/17. + */ +public class Display { +} diff --git a/typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java b/typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java new file mode 100644 index 0000000..84f9389 --- /dev/null +++ b/typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java @@ -0,0 +1,7 @@ +package java.kalaygian.dennis.part1; + +/** + * Created by denniskalaygian on 5/5/17. + */ +public class FamilyTree { +} diff --git a/typeinformation/src/main/java/kalaygian/dennis/part1/Main.java b/typeinformation/src/main/java/kalaygian/dennis/part1/Main.java new file mode 100644 index 0000000..05e2d12 --- /dev/null +++ b/typeinformation/src/main/java/kalaygian/dennis/part1/Main.java @@ -0,0 +1,7 @@ +package java.kalaygian.dennis.part1; + +/** + * Created by denniskalaygian on 5/5/17. + */ +public class Main { +} diff --git a/typeinformation/src/test/java/kalaygian/dennis/AppTest.java b/typeinformation/src/test/java/kalaygian/dennis/AppTest.java deleted file mode 100644 index 0bbab25..0000000 --- a/typeinformation/src/test/java/kalaygian/dennis/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package kalaygian.dennis; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java b/typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java new file mode 100644 index 0000000..1929cfd --- /dev/null +++ b/typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java @@ -0,0 +1,7 @@ +package java.kalaygian.dennis.part1; + +/** + * Created by denniskalaygian on 5/5/17. + */ +public class TestFamilyTree { +} From 9081427c7c6a1cfef5134c5d4486ffa9fe97e2db Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Fri, 5 May 2017 08:38:18 -0400 Subject: [PATCH 04/14] Fixed issue with junit import. --- .idea/TypeInformation.iml | 19 + .idea/kotlinc.xml | 7 + .idea/misc.xml | 38 -- .idea/uiDesigner.xml | 124 ++++++ .idea/workspace.xml | 217 +++++++-- typeinformation/.DS_Store | Bin 6148 -> 6148 bytes typeinformation/.gitignore | 2 - typeinformation/.idea/compiler.xml | 16 - typeinformation/.idea/encodings.xml | 6 - .../libraries/Maven__junit_junit_3_8_1.xml | 13 - typeinformation/.idea/misc.xml | 51 --- typeinformation/.idea/modules.xml | 8 - typeinformation/.idea/workspace.xml | 411 ------------------ typeinformation/pom.xml | 14 + .../kalaygian/dennis/{part1 => }/Display.java | 2 +- .../dennis/{part1 => }/FamilyTree.java | 2 +- .../src/main/java/kalaygian/dennis/Main.java | 10 + .../java/kalaygian/dennis/part1/Main.java | 7 - .../java/kalaygian/dennis/TestFamilyTree.java | 7 + .../dennis/part1/TestFamilyTree.java | 7 - typeinformation/typeinformation.iml | 15 - 21 files changed, 362 insertions(+), 614 deletions(-) create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/uiDesigner.xml delete mode 100644 typeinformation/.gitignore delete mode 100644 typeinformation/.idea/compiler.xml delete mode 100644 typeinformation/.idea/encodings.xml delete mode 100644 typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml delete mode 100644 typeinformation/.idea/misc.xml delete mode 100644 typeinformation/.idea/modules.xml delete mode 100644 typeinformation/.idea/workspace.xml rename typeinformation/src/main/java/kalaygian/dennis/{part1 => }/Display.java (66%) rename typeinformation/src/main/java/kalaygian/dennis/{part1 => }/FamilyTree.java (67%) create mode 100644 typeinformation/src/main/java/kalaygian/dennis/Main.java delete mode 100644 typeinformation/src/main/java/kalaygian/dennis/part1/Main.java create mode 100644 typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java delete mode 100644 typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java delete mode 100644 typeinformation/typeinformation.iml diff --git a/.idea/TypeInformation.iml b/.idea/TypeInformation.iml index 008aa02..bb62fa3 100644 --- a/.idea/TypeInformation.iml +++ b/.idea/TypeInformation.iml @@ -8,5 +8,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..1c24f9a --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 15ccfc7..99ae653 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,42 +1,4 @@ - - - - - - - - - - - - 1.8 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b49b106..ca2ee8b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,22 @@ - - - - + + + + + + + + + + + + + + + + + + + @@ -81,8 +117,10 @@ DEFINITION_ORDER - @@ -99,7 +137,6 @@ - @@ -149,7 +186,7 @@ + - - - + + + + - - + @@ -629,8 +670,9 @@ - + + @@ -642,7 +684,6 @@ - @@ -656,37 +697,137 @@ - + + - - + + - + + + + + + + + - - + + + + + + + + + + - + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + TypeInformation + + + + + + + + + + + + + + \ No newline at end of file diff --git a/typeinformation/.DS_Store b/typeinformation/.DS_Store index 9c24053a80d3f39e9b91e8ca9cdc06539fa9a0ca..89911c14d5cdd783fe5304948b46602f0d2fbd90 100644 GIT binary patch delta 64 zcmZoMXfc=|#>CJ*u~2NHo+2aj!~knX=E*!vahpAv_pxj)V2)?n%+A5j0aUU%k@-9G UWPTAtMuy2YJkpzEL{=~Z05~oY8UO$Q delta 288 zcmZoMXfc=|#>B)qu~2NHo+2a5!~pBf0*noeKvqv&eNuUGK~heB5(5Ln$)tju%;FLQ zgX@e;%q*;I>>Qk&9GtuyvB4Sn<-sM1C8fnqiAB+1US>*a5|ka1pPvI~Cnkkurk2MG zh&boxl_X~7r4}J6j|tDrOUW;H$}i1JDF&Mp5SCby0n`k(DPBOLy4uvxKu5vI#IjaL zq1xOW$Tl%HtF7hW5LY#{^-RdEtg5c5t(ysSEf6p=LTCnlC=H`#ZG3QoWivYmKL^m? cn;99uGf(ChF%$qPZvbK-4c56iKx7Lu0Fxg~eE - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/typeinformation/.idea/encodings.xml b/typeinformation/.idea/encodings.xml deleted file mode 100644 index b26911b..0000000 --- a/typeinformation/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml b/typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml deleted file mode 100644 index 71b2993..0000000 --- a/typeinformation/.idea/libraries/Maven__junit_junit_3_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/typeinformation/.idea/misc.xml b/typeinformation/.idea/misc.xml deleted file mode 100644 index 1ce943a..0000000 --- a/typeinformation/.idea/misc.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/typeinformation/.idea/modules.xml b/typeinformation/.idea/modules.xml deleted file mode 100644 index 42e27ba..0000000 --- a/typeinformation/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/typeinformation/.idea/workspace.xml b/typeinformation/.idea/workspace.xml deleted file mode 100644 index 125ca75..0000000 --- a/typeinformation/.idea/workspace.xml +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1493819429603 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - typeinformation - - - - - - - - Maven: junit:junit:3.8.1 - - - - - - - - \ No newline at end of file diff --git a/typeinformation/pom.xml b/typeinformation/pom.xml index 83b563f..e748813 100644 --- a/typeinformation/pom.xml +++ b/typeinformation/pom.xml @@ -15,11 +15,25 @@ + junit junit 3.8.1 test + + + org.slf4j + slf4j-api + 1.7.5 + + + + org.slf4j + slf4j-log4j12 + 1.7.5 + + diff --git a/typeinformation/src/main/java/kalaygian/dennis/part1/Display.java b/typeinformation/src/main/java/kalaygian/dennis/Display.java similarity index 66% rename from typeinformation/src/main/java/kalaygian/dennis/part1/Display.java rename to typeinformation/src/main/java/kalaygian/dennis/Display.java index 0735a0f..e127938 100644 --- a/typeinformation/src/main/java/kalaygian/dennis/part1/Display.java +++ b/typeinformation/src/main/java/kalaygian/dennis/Display.java @@ -1,4 +1,4 @@ -package java.kalaygian.dennis.part1; +package java.kalaygian.dennis; /** * Created by denniskalaygian on 5/5/17. diff --git a/typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java b/typeinformation/src/main/java/kalaygian/dennis/FamilyTree.java similarity index 67% rename from typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java rename to typeinformation/src/main/java/kalaygian/dennis/FamilyTree.java index 84f9389..518312b 100644 --- a/typeinformation/src/main/java/kalaygian/dennis/part1/FamilyTree.java +++ b/typeinformation/src/main/java/kalaygian/dennis/FamilyTree.java @@ -1,4 +1,4 @@ -package java.kalaygian.dennis.part1; +package java.kalaygian.dennis; /** * Created by denniskalaygian on 5/5/17. diff --git a/typeinformation/src/main/java/kalaygian/dennis/Main.java b/typeinformation/src/main/java/kalaygian/dennis/Main.java new file mode 100644 index 0000000..d54f5b0 --- /dev/null +++ b/typeinformation/src/main/java/kalaygian/dennis/Main.java @@ -0,0 +1,10 @@ +package java.kalaygian.dennis; + + +public class Main +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/typeinformation/src/main/java/kalaygian/dennis/part1/Main.java b/typeinformation/src/main/java/kalaygian/dennis/part1/Main.java deleted file mode 100644 index 05e2d12..0000000 --- a/typeinformation/src/main/java/kalaygian/dennis/part1/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package java.kalaygian.dennis.part1; - -/** - * Created by denniskalaygian on 5/5/17. - */ -public class Main { -} diff --git a/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java b/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java new file mode 100644 index 0000000..f7c0743 --- /dev/null +++ b/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java @@ -0,0 +1,7 @@ +package java.kalaygian.dennis; + +import org.junit.Test; +import org.junit.Assert; + + + diff --git a/typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java b/typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java deleted file mode 100644 index 1929cfd..0000000 --- a/typeinformation/src/test/java/kalaygian/dennis/part1/TestFamilyTree.java +++ /dev/null @@ -1,7 +0,0 @@ -package java.kalaygian.dennis.part1; - -/** - * Created by denniskalaygian on 5/5/17. - */ -public class TestFamilyTree { -} diff --git a/typeinformation/typeinformation.iml b/typeinformation/typeinformation.iml deleted file mode 100644 index 2eb246a..0000000 --- a/typeinformation/typeinformation.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file From c522478607685d066df6690eef9bcb06e5a161c2 Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Fri, 5 May 2017 08:48:17 -0400 Subject: [PATCH 05/14] Stubbed out tests for classImplementsInterface() --- .idea/workspace.xml | 54 +++++++------------ .../java/kalaygian/dennis/TestFamilyTree.java | 24 +++++++++ 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ca2ee8b..0e80b98 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,22 +2,7 @@ - - - - - - - - - - - - - - - - + @@ -646,15 +631,16 @@ - + - + @@ -670,7 +656,7 @@ - + @@ -729,16 +715,6 @@ - - - - - - - - - - @@ -755,6 +731,16 @@ + + + + + + + + + + diff --git a/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java b/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java index f7c0743..fa719e4 100644 --- a/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java +++ b/typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java @@ -2,6 +2,30 @@ import org.junit.Test; import org.junit.Assert; +import java.util.ArrayList; +public class TestFamilyTree{ + @Test + public void testClassImplementsInterfaceReturnType(){ + //Given + FamilyTree familyTree = new FamilyTree(ArrayList); + Class expectedReturnType = Boolean.class; + //When + Class returnType = (familyTree.classImplementsInterface(List)).class; + //Then + Assert.assertEquals("Method is returning the wrong data type", expectedReturnType, returnType); + } + + @Test + public void testClassImplementsInterface(){ + //Given + FamilyTree familyTree = new FamilyTree(ArrayList); + boolean expectedOutcome = true; + //When + boolean methodOutcome = familyTree.classImplementsInterface(List); + //Then + Assert.assertEquals("Method is returning the wrong boolean", expectedOutcome, methodOutcome); + } +} From 4c72f37a4e4d2ede70957bbb7883cf8b340db678 Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Fri, 5 May 2017 14:56:35 -0400 Subject: [PATCH 06/14] Adjusted project structure; created classImplementsInterface() method; stubbed tests for getClassHierarchy() --- .idea/TypeInformation.iml | 16 +- .idea/compiler.xml | 16 + .idea/encodings.xml | 6 + .idea/libraries/Maven__junit_junit_3_8_1.xml | 13 + .idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_5.xml | 13 + .../Maven__org_slf4j_slf4j_log4j12_1_7_5.xml | 13 + .idea/misc.xml | 7 + .idea/workspace.xml | 371 +++++++++++++++--- typeinformation/pom.xml => pom.xml | 0 src/.DS_Store | Bin 0 -> 6148 bytes .../main/java/kalaygian/dennis/Display.java | 2 +- .../java/kalaygian/dennis/FamilyTree.java | 31 ++ .../main/java/kalaygian/dennis/Main.java | 2 +- {typeinformation => src/test}/.DS_Store | Bin 6148 -> 6148 bytes src/test/java/.DS_Store | Bin 0 -> 6148 bytes src/test/java/kalaygian/.DS_Store | Bin 0 -> 6148 bytes .../java/kalaygian/dennis/TestFamilyTree.java | 53 +++ target/classes/kalaygian/dennis/Display.class | Bin 0 -> 280 bytes .../classes/kalaygian/dennis/FamilyTree.class | Bin 0 -> 1060 bytes target/classes/kalaygian/dennis/Main.class | Bin 0 -> 550 bytes .../java/kalaygian/dennis/FamilyTree.java | 7 - .../java/kalaygian/dennis/TestFamilyTree.java | 31 -- 23 files changed, 485 insertions(+), 109 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/Maven__junit_junit_3_8_1.xml create mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml rename typeinformation/pom.xml => pom.xml (100%) create mode 100644 src/.DS_Store rename {typeinformation/src => src}/main/java/kalaygian/dennis/Display.java (70%) create mode 100644 src/main/java/kalaygian/dennis/FamilyTree.java rename {typeinformation/src => src}/main/java/kalaygian/dennis/Main.java (80%) rename {typeinformation => src/test}/.DS_Store (90%) create mode 100644 src/test/java/.DS_Store create mode 100644 src/test/java/kalaygian/.DS_Store create mode 100644 src/test/java/kalaygian/dennis/TestFamilyTree.java create mode 100644 target/classes/kalaygian/dennis/Display.class create mode 100644 target/classes/kalaygian/dennis/FamilyTree.class create mode 100644 target/classes/kalaygian/dennis/Main.class delete mode 100644 typeinformation/src/main/java/kalaygian/dennis/FamilyTree.java delete mode 100644 typeinformation/src/test/java/kalaygian/dennis/TestFamilyTree.java diff --git a/.idea/TypeInformation.iml b/.idea/TypeInformation.iml index bb62fa3..0a2510e 100644 --- a/.idea/TypeInformation.iml +++ b/.idea/TypeInformation.iml @@ -1,10 +1,12 @@ - - - + + + + - - + + + @@ -27,5 +29,9 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61bbb77 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_3_8_1.xml b/.idea/libraries/Maven__junit_junit_3_8_1.xml new file mode 100644 index 0000000..71b2993 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_3_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml new file mode 100644 index 0000000..e383c1b --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml new file mode 100644 index 0000000..6f808f1 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml new file mode 100644 index 0000000..df1d383 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 99ae653..9896aeb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,11 @@ + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0e80b98..f24dfaf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,17 @@ - + + + + + + + + + + + + - + - + @@ -24,11 +42,11 @@ - - + + - - + + @@ -36,18 +54,25 @@ - - + + - - - + + + + + + + + + + - + @@ -57,7 +82,7 @@ - + @@ -92,6 +117,9 @@ @@ -101,6 +129,34 @@ true DEFINITION_ORDER + + + + + + + + + + + + + + + + + + @@ -217,6 +259,11 @@ + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -645,20 +825,20 @@ + - - + + - - - + + @@ -670,6 +850,7 @@ + @@ -679,12 +860,67 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -699,44 +935,51 @@ - + - - + + - + - - + + - + - - + + - + - - - + + + + + - + - - + + - + + + + + + diff --git a/typeinformation/pom.xml b/pom.xml similarity index 100% rename from typeinformation/pom.xml rename to pom.xml diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2e95f8e9278eb735b662d05a6c0e89da200cc0b2 GIT binary patch literal 6148 zcmeHK%}T>S5T4bjsUr3u=rI?;gNN2%M1)ZF;7zFLK}8c=G!V1Wq!z7}yoSDkkKz;f zIQs4GSZvj!qOt?C-|XznCi{im%@C2OG;3v|A`!Vzh0Z9NPehF?{U8JE83qb9$961F z!&rvss|l@G1}p==n*p_V9lD@^B1-!9?;6HtU$p2&bmPKSddd6zDZGrMG%J;!#lWC5 zG(6%K3T|QCJ*u9|Ry7NLJ^^QpR072=}6T>$o_%A(JeKl6vD^_~Cw( z)MTq7n@KIz^XvrKIdb)bj*HXn_ENbt=glv!cILeH$_nhoh2>7ib*E;^>)R(6*Ej9k z&fUHF4gv?2mI=l;c!1Ge;8nGe#4i&eG`a);I&f=&t$+Q2o^k+v#@rx05Mfe* zCRK2WA-Hl7CLQBG$L9u3Itl$`%)?I>T%iaqJcOsiN%#hBYZaO*mCr~9SE;p!C(C~Gv4RsYyL$zScQwGpy T%niZ=u|EQu2HRK$ew2Y%dzPsX literal 0 HcmV?d00001 diff --git a/typeinformation/src/main/java/kalaygian/dennis/Display.java b/src/main/java/kalaygian/dennis/Display.java similarity index 70% rename from typeinformation/src/main/java/kalaygian/dennis/Display.java rename to src/main/java/kalaygian/dennis/Display.java index e127938..d86663f 100644 --- a/typeinformation/src/main/java/kalaygian/dennis/Display.java +++ b/src/main/java/kalaygian/dennis/Display.java @@ -1,4 +1,4 @@ -package java.kalaygian.dennis; +package kalaygian.dennis; /** * Created by denniskalaygian on 5/5/17. diff --git a/src/main/java/kalaygian/dennis/FamilyTree.java b/src/main/java/kalaygian/dennis/FamilyTree.java new file mode 100644 index 0000000..ef1ebbd --- /dev/null +++ b/src/main/java/kalaygian/dennis/FamilyTree.java @@ -0,0 +1,31 @@ +package kalaygian.dennis; +import java.util.ArrayList; + +/** + * Created by denniskalaygian on 5/5/17. + */ +public class FamilyTree { + + private String originalClass; + + public FamilyTree(String originalClass) { + this.originalClass = originalClass; + } + + public String getOriginalClass() { + return originalClass; + } + + public void setOriginalClass(String originalClass) { + this.originalClass = originalClass; + } + + public Boolean classImplementsInterface(String interfce) throws ClassNotFoundException { + Class class1 = Class.forName(originalClass); + return Class.forName(interfce).isAssignableFrom(class1); + } + + public String getClassHierarchy(){ + + } +} diff --git a/typeinformation/src/main/java/kalaygian/dennis/Main.java b/src/main/java/kalaygian/dennis/Main.java similarity index 80% rename from typeinformation/src/main/java/kalaygian/dennis/Main.java rename to src/main/java/kalaygian/dennis/Main.java index d54f5b0..e14e612 100644 --- a/typeinformation/src/main/java/kalaygian/dennis/Main.java +++ b/src/main/java/kalaygian/dennis/Main.java @@ -1,4 +1,4 @@ -package java.kalaygian.dennis; +package kalaygian.dennis; public class Main diff --git a/typeinformation/.DS_Store b/src/test/.DS_Store similarity index 90% rename from typeinformation/.DS_Store rename to src/test/.DS_Store index 89911c14d5cdd783fe5304948b46602f0d2fbd90..70c1ff3c9c7ecba84273ee118b0b5f5d3b24fc12 100644 GIT binary patch delta 349 zcmZoMXfc=|#>B)qu~2NHo)(X1PJVJyPJR*t1B1Y3M#klgyv#r*3quw|B10KN;>3CK z^>9v7d2s<$?a8EqoXp}91B2^~Ow25-Z0sDIoE)6I9I?R}`Q^bSi6y1QPKia)U|wcQ zY7&$klAoUgXD23wWu}(L3y3)9=anR8=A{-PDUS)y%uC5HcgioV&r2x=8x)XOk^$5V zwkcjfqPp7D&_GAQ$i%W%N1@u>9LP2?Hmj}W;1E|ewDnBLt*ol9sjZs{^bQa(GD2tu zekcv2W&s&+AC?6d<>ln(r31xa>KQivyTr1Yor9kP7-+x{`p!I=U&K%VB;5c}23EN_ IKx7Lu0MKk#IsgCw delta 139 zcmZoMXfc=|#>CJ*u~2NHo)!;71w$@Fj%QAOa#GI3LUmzg1_lOph609sps*f9a0CF+&kUGDKm15>S-@5U&JcjsIW(WHB&6Rc%&ee#Wxdf!UmCGdl-A2hg_7hRolY UC-aLKGBQlI;gQ}PBeH@S0JIY$%K!iX diff --git a/src/test/java/.DS_Store b/src/test/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f667c657d24bba2753d38cfbab5d04175bdc2d63 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8CWzRBpvPPU4?VR06%ip+J$Mr;dQfQ-TWm09OPg9WM)Df^Mm~X$ zqu>5il-6renSt4FGCQ-I{Wk1o7-PIPXjK?1GR7>Z#GH+0g2;ZUW0EtTJdmp~?%6d9 zn8%`{a4eb}zmWmCcQ(7ho`uja`zNmaQ26MTpT;h9?Oh41i5dQ|-!&Ppem4yIak>1) zbNRx|?3`uWmc3wI);nTYkG*)%uX(+5^%S()zOhe)2tRGlKMmT$MsaChM6nk{?cSI0 zi?bkViD69)qE=sxbL_<(>j>tpv9GVU#(JLDyiW5j_yDQ-L~_n-YWTbod<;=Nim3 z>U73U@xjf^+*BxB&5rRM70$S;ky>Ja82HYBtoq;eYKQ@1;D0i}3kUUs z8rEj+*0EK}yVij=p;BaArtvcchPsLoE3e`es1o=cX#ib=nMQaZ^dq2XpoSQjDgz&s CG+?y= literal 0 HcmV?d00001 diff --git a/src/test/java/kalaygian/.DS_Store b/src/test/java/kalaygian/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b7861c852bcdbbac04e94fb9c70252bc3b71a9c1 GIT binary patch literal 6148 zcmeHK%}&BV5Z(pEHpa-oM2@|fc;Env5@Spn!~-`Ij2_fLYl$?eT|$dQv8Jz~Z{!pB zI66DK5D9wJh?ya?-!PropKqJp4r7ehhhBxT0%Obom6$Q1`9kD#sdJLio-828K71B6 z199yJ!kvpI$6sVX?p>aFtjj|9&F-IkDGorl-cfM+GqLU{>g&CJb^C!I#pUuF&t!8; z`DMd24Rh7FYW2jZ6+7`Tsyl-V{O5aJSKFsT1XJ5_&;0JFU06R7VeI%}ckn6v^4t$S zF{+DU=tbDii4*rA7YAw=isSKarChSMtNTgG8rN!IS9kW3#4t8CD~HX_?ft{}F?o8% zWiSpeEXtb33A}(Yv&g&FAPhu!1O7?QB$kjEAO?tm1!X`VXU58c&Yz}D3=ji9$ACN^ zEKrHI##A959nfG20GI"); + Class expectedReturnType = String.class; + //When + Class returnType = familyTree.getClassHierarchy("java.util.List").getClass(); + //Then + Assert.assertEquals("Method is returning the wrong data type", expectedReturnType, returnType); + } + + @Test + public void testGetClassHierarchy() { + //Given + FamilyTree familyTree = new FamilyTree("java.util.AbstractList"); + String expectedValue = "java.lang.Object" + "\n" + " " + "java.util.AbstractCollection" + "\n" + " " + "java.util.AbstractList"; + //When + String returnValue = familyTree.getClassHierarchy(); + //Then + Assert.assertEquals("Method is not returning the right value", expectedValue, returnValue); + } +} diff --git a/target/classes/kalaygian/dennis/Display.class b/target/classes/kalaygian/dennis/Display.class new file mode 100644 index 0000000000000000000000000000000000000000..72040bd4b1473a009bb50204c9537fbf4cf65b6c GIT binary patch literal 280 zcmZ{eyH3ME5Jm4eet=_0lnT+&0Yz4+K{P~E78FG3$IdEDaMs9nkoYVrB#L|h9~EUb zO3SWvH1}xlYW{Y=TL2RbQ}l3_;5@;A5Z{ZF?t##|zL^uk$9iE2gIt__-mDAT%($r3 zjPknVYR--Le3W7LCN1GIf9Hz7mcq^~taH+usk9%e?g;5?y=hAOB>tD|=*KJmr$oI@_O9ua9`?tQcQ*KBptQUde2>cHI!UAeW8>LoF*Sh_v+Laf=(?AMR@$D zx>B{aD1eZ`07MgW-KgZp3(F++Wvr?p}?S)Nmtol<`49Tj#ru;1+gE{d0HXo79?fdb|t??Gf!# zw70NC(Wb0P^#rX}{To=l@db%blqHa(cn3*}OVnXgXO41UHAW+k0%g<}u`*&?MsdRF z(8}mvy8ao7kF<&DjHp(rb0@DNJPVR zXw@T>w2*5g-!>@hensjU>6xyWxlH|Q5pyN(nKGAX=q%~Y5a&IViF1uOwT<`bTaV^@ F@Ef>F;G+Nl literal 0 HcmV?d00001 diff --git a/target/classes/kalaygian/dennis/Main.class b/target/classes/kalaygian/dennis/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..f9c5f76d1cdfe1c24a1e585f7938643b6c76466f GIT binary patch literal 550 zcmZuuOHaZ;5dM}|A67xI;9Ky79&9{$z<4n+9_k~(=)uzho4UB&no>;oS$fdKgFnC@ zWt+`~$Jn<~!kPsabrTI6>)0@`X<&&KUCTgL{U; zc{C6VWnXG>Jq~*!zT-VbNY#(}T;20nrtv>mNS@?~q2WJs#V3K}+8YS1<;c6@Qg?_h zB+pQ9Kl(%d%00z(;B}K&>Y$Ug<8eR)wFPMgyBm$;zPONSe=B7?N=Y0TFb!-w*ugG? zb19UHnh#N|1}y`74w`5&xCa?NsAPX>$Vq7ix!HshV Date: Fri, 5 May 2017 16:11:47 -0400 Subject: [PATCH 07/14] Working copy of getClassHierarchy(), in the process of modulation --- .idea/workspace.xml | 171 ++++++++++++------ .../java/kalaygian/dennis/FamilyTree.java | 43 ++++- .../java/kalaygian/dennis/TestFamilyTree.java | 14 +- .../classes/kalaygian/dennis/FamilyTree.class | Bin 1060 -> 1753 bytes .../kalaygian/dennis/TestFamilyTree.class | Bin 0 -> 2169 bytes 5 files changed, 160 insertions(+), 68 deletions(-) create mode 100644 target/test-classes/kalaygian/dennis/TestFamilyTree.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f24dfaf..c55ff83 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,8 @@ - - - - - - - - - + + - + @@ -355,6 +348,58 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -791,32 +840,44 @@ - + - + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + - @@ -861,7 +922,7 @@ - @@ -883,12 +944,12 @@ - - - - - - + + + + + + @@ -961,8 +1022,8 @@ - - + + @@ -971,15 +1032,15 @@ - - + + - - - - - - + + + + + + diff --git a/src/main/java/kalaygian/dennis/FamilyTree.java b/src/main/java/kalaygian/dennis/FamilyTree.java index ef1ebbd..116b995 100644 --- a/src/main/java/kalaygian/dennis/FamilyTree.java +++ b/src/main/java/kalaygian/dennis/FamilyTree.java @@ -6,26 +6,57 @@ */ public class FamilyTree { - private String originalClass; + private Class originalClass; - public FamilyTree(String originalClass) { + public FamilyTree(Class originalClass) { this.originalClass = originalClass; } - public String getOriginalClass() { + public Class getOriginalClass() { return originalClass; } - public void setOriginalClass(String originalClass) { + public void setOriginalClass(Class originalClass) { this.originalClass = originalClass; } public Boolean classImplementsInterface(String interfce) throws ClassNotFoundException { - Class class1 = Class.forName(originalClass); + Class class1 = originalClass; //nah return Class.forName(interfce).isAssignableFrom(class1); } - public String getClassHierarchy(){ + public String getClassHierarchy() throws ClassNotFoundException { + + //////Establish number of classes in the hierarchy////// + Class class1 = originalClass; //nah + + int count = 0; + + while(class1.getSuperclass() != null){ + count += 1; + class1 = class1.getSuperclass(); + } + class1 = originalClass; + + Class[] classList = new Class[count + 1]; + + classList[0] = Class.forName("java.lang.Object"); + + for(int index = count; index > 0; index--){ + classList[index] = class1; + class1 = class1.getSuperclass(); + } + ///////////////////////////////////////////////////// + String spaces = ""; + String returnHierarchy = ""; + + for(int index = 0; index < count + 1; index++){ + returnHierarchy += spaces + classList[index].getName() + "\n"; + spaces += " "; + + } + return returnHierarchy; + } } diff --git a/src/test/java/kalaygian/dennis/TestFamilyTree.java b/src/test/java/kalaygian/dennis/TestFamilyTree.java index 2a70e15..1bdd6b1 100644 --- a/src/test/java/kalaygian/dennis/TestFamilyTree.java +++ b/src/test/java/kalaygian/dennis/TestFamilyTree.java @@ -10,7 +10,7 @@ public class TestFamilyTree{ @Test public void testClassImplementsInterfaceReturnType() throws ClassNotFoundException { //Given - FamilyTree familyTree = new FamilyTree("java.util.ArrayList"); + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.ArrayList")); Class expectedReturnType = Boolean.class; //When Class returnType = familyTree.classImplementsInterface("java.util.List").getClass(); @@ -21,7 +21,7 @@ public void testClassImplementsInterfaceReturnType() throws ClassNotFoundExcepti @Test public void testClassImplementsInterface() throws ClassNotFoundException { //Given - FamilyTree familyTree = new FamilyTree("java.util.ArrayList"); + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.ArrayList")); boolean expectedOutcome = true; //When Boolean methodOutcome = familyTree.classImplementsInterface("java.util.List"); @@ -32,19 +32,19 @@ public void testClassImplementsInterface() throws ClassNotFoundException { @Test public void testGetClassHierarchyReturnType() throws ClassNotFoundException { //Given - FamilyTree familyTree = new FamilyTree("java.util.AbstractList"); + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.AbstractList")); Class expectedReturnType = String.class; //When - Class returnType = familyTree.getClassHierarchy("java.util.List").getClass(); + Class returnType = familyTree.getClassHierarchy().getClass(); //Then Assert.assertEquals("Method is returning the wrong data type", expectedReturnType, returnType); } @Test - public void testGetClassHierarchy() { + public void testGetClassHierarchy() throws ClassNotFoundException { //Given - FamilyTree familyTree = new FamilyTree("java.util.AbstractList"); - String expectedValue = "java.lang.Object" + "\n" + " " + "java.util.AbstractCollection" + "\n" + " " + "java.util.AbstractList"; + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.AbstractList")); + String expectedValue = "java.lang.Object" + "\n" + " " + "java.util.AbstractCollection" + "\n" + " " + "java.util.AbstractList" + "\n"; //When String returnValue = familyTree.getClassHierarchy(); //Then diff --git a/target/classes/kalaygian/dennis/FamilyTree.class b/target/classes/kalaygian/dennis/FamilyTree.class index bc25f4f687d56ca60549e169825e08b36b3a85cf..40a3280bddb539833c44c8127ca4e47e9dd5e15c 100644 GIT binary patch literal 1753 zcmah~O>^5+6g{%_;i$@&6Ni{45DFomj+?fGlC&vJ8dHPg0M2xvY*1{)Rgoo+B$sBv zF8_dG7-kq2Y_f%!;&#fkOBVbXX7~ey^JK?%8ip?Xbl-jVoqO)NSJt2ZJbeye8K3A# zV!02)xTHhFWwBh*@eWpm^{$4i3A~rUs)jWkI+n$9O&ncMU|no(B=Ek5n;JGG^n1Qt zwO!NMbj%=-FkHBAJ}|S6=~lCmYfXZB&35f@UBc+>nbWyD668&D)1WTkP9TIlN~x(PZH((=iXKw&`Xomh0LgEXYw;JI1@Nt7RBUib;qh%ZW!d<(DL`qGAYgUmQV_P+pVtkqHcJeW0@`qB<$#x zxRmTk+rC3pq9n@_^sR?ws~*~(8)(?1gk&B`ciXmn(=XpU5X$u?>0l_fTd^KWkn$3g zve$4!34IZ6!47CAzv#&vVTyJHb(TU22YoAS_-;=cz2r6gvX!%i`h#6Pmqb$yq;Si? z2u2NTA!pzN+}4mc@F6}jP{1UwywH5AD?CeL9F}(W?ptM&f`nJPajjZ58n#ohd;{Ak z8rZ=MYtjvTER5LHl!WvD)9rSa*3g|~nd+v93NLzLjsjIWVoQk6is{q#J-=wySn%{q zdV3<^kR99%0=w#psm%Fa?Y}4cE?e0p(H;!udtf>ZYiD1=*zDcju69SKpA%4O)Ga@1 zB|B!;>y}%Qka-EiQ)05!8i881B|@)th&TA+C;3M}VMQ-#DYR1<6Mf+>M}Le@ef}|| z`GwyQ`<1&G#<>n4&h;E*80bSk(%g-;qVX!ubH{rTD*J~COtvwze6sOS<{u&U3yl_> z8aam|7^4-?hLP}EhtN8s1tIkXGJ514CH+(n5w$}^?GSk#Q;ZeGmG~4T3=1OL3r`SV zY(jnlrAw*>J5Jbi1UuEb(19JMf)_|up$2bKzZl*kpiIv+e{W-^l}g&>J&h+nid2R8 z^@S$XKQM3@lY~_`I{rI4n2^7G2CbNhClh2-nplxj@=qAaq~wKC6nH2fA07Xd>|2%j zQ{pRXO68rOaqD;JpFhUAw9ZK<7X(b1^G%>iUoCJyU@=Hvnun5Jij>l`vz;8$W1tF&&=-oi!X`9aynWqgJ!_=cz7(*6Ng zBjr9tf)Odq@~+HxIUiZ7(4?)Vg6|^@IjQ&#^Nfoz)7Qjaqr$oI@_O9ua9`?tQcQ*KBptQUde2>cHI!UAeW8>LoF*Sh_v+Laf=(?AMR@$D zx>B{aD1eZ`07MgW-KgZp3(F++Wvr?p}?S)Nmtol<`49Tj#ru;1+gE{d0HXo79?fdb|t??Gf!# zw70NC(Wb0P^#rX}{To=l@db%blqHa(cn3*}OVnXgXO41UHAW+k0%g<}u`*&?MsdRF z(8}mvy8ao7kF<&DjHp(rb0@DNJPVR zXw@T>w2*5g-!>@hensjU>6xyWxlH|Q5pyN(nKGAX=q%~Y5a&IViF1uOwT<`bTaV^@ F@Ef>F;G+Nl diff --git a/target/test-classes/kalaygian/dennis/TestFamilyTree.class b/target/test-classes/kalaygian/dennis/TestFamilyTree.class new file mode 100644 index 0000000000000000000000000000000000000000..ae9f1f70251c28405e1e087bb049002ad40ca7ac GIT binary patch literal 2169 zcmai!YggMw5Qg6c2dTnKDRk&*=~7kLu~HBqX^QYMo=Pc6Vl;d1rS2{^yUs04(E21LOEi!$Td941A6+4D{hk z4PWVatcG8!^%WgY3_Qg%9nTF6;2RyQ8eXXNH67pTSl6(j;U&Ys6U(vWGlu@s;vPe8 z&20*Xk*ej0TF~AXUY+mTG*hg)4Q}so&r;vO@DICZ0D|O+^ z4c@lwPTdn?h2f5*nKhgH{$~5w7H#23f76k|JKznmBV^z?_0BN`G7b_mhS`grySx^~ z$+2ii(ad@ntse3Bykc{wRS6?fc*DzvSU+iqV`;gLui+KL^iJSNt1b2{-=gGJ9mkbC zTxKX#U9VL+3P_|dDe`sWs#Hk3bEfS;HrzI)#NIIswS_!%o5|c*2J(gL+JZaedQQ21 zDI%d>S;FI9ZJXApsc5;^1{K8U%8uIXKN)&f z>rk5SqY}og6}407r}(H=H10n*!(i%pk^q1qdWKP;X9mR(PDQ#Gd5a?r5#}sDp@;?AGY6B{ zW}wq~jS)(Bk^oFX zNa5xaxbYZngy8O?L~xTB#3CheIowhLcM`*yA>8n}bR%0!rzl(@+%00eO@iE^GL=Y_ z#SEL7u#F|c6=LD0{#UsB30n}e&33bmhHSNBv1dig1XdxiWvbdk>XAnou-OExkbn*0 V0m>xW1c6m(bh&7sQeFG7{4eP||3m-) literal 0 HcmV?d00001 From 4972f50b1b1c38ee67b5cb89b9990c508a17d4ac Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Fri, 5 May 2017 16:29:17 -0400 Subject: [PATCH 08/14] Modulated working getClassHierarchy() method into three other methods; made those methods private so I wouldn't have to test them --- .idea/workspace.xml | 83 +++++++++--------- .../java/kalaygian/dennis/FamilyTree.java | 37 ++++---- .../classes/kalaygian/dennis/FamilyTree.class | Bin 1753 -> 2196 bytes 3 files changed, 61 insertions(+), 59 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c55ff83..2e9270c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,6 @@ - - + @@ -818,8 +817,8 @@ - - + + @@ -840,7 +839,7 @@ - + @@ -848,36 +847,36 @@ - + - + - + - + - + - + - + - + - + - @@ -922,7 +921,7 @@ - @@ -944,12 +943,12 @@ - - - - - - + + + + + + @@ -1022,8 +1021,8 @@ - - + + @@ -1032,15 +1031,15 @@ - - + + - - - - - - + + + + + + diff --git a/src/main/java/kalaygian/dennis/FamilyTree.java b/src/main/java/kalaygian/dennis/FamilyTree.java index 116b995..5a425c5 100644 --- a/src/main/java/kalaygian/dennis/FamilyTree.java +++ b/src/main/java/kalaygian/dennis/FamilyTree.java @@ -1,5 +1,5 @@ package kalaygian.dennis; -import java.util.ArrayList; + /** * Created by denniskalaygian on 5/5/17. @@ -21,42 +21,45 @@ public void setOriginalClass(Class originalClass) { } public Boolean classImplementsInterface(String interfce) throws ClassNotFoundException { - Class class1 = originalClass; //nah + Class class1 = originalClass; return Class.forName(interfce).isAssignableFrom(class1); } public String getClassHierarchy() throws ClassNotFoundException { + int count = getClassHierarchyLength(); + Class[] classList = createClassHierarchyArray(count); + return formatClassHierarchyArray(classList); + } - //////Establish number of classes in the hierarchy////// - Class class1 = originalClass; //nah - + private int getClassHierarchyLength() throws ClassNotFoundException{ + Class class1 = originalClass; int count = 0; - while(class1.getSuperclass() != null){ count += 1; class1 = class1.getSuperclass(); } - - class1 = originalClass; - - Class[] classList = new Class[count + 1]; + return count + 1; + } + private Class[] createClassHierarchyArray(int count) throws ClassNotFoundException { + Class class1 = originalClass; + Class[] classList = new Class[count]; classList[0] = Class.forName("java.lang.Object"); - for(int index = count; index > 0; index--){ - classList[index] = class1; + classList[index - 1] = class1; class1 = class1.getSuperclass(); } - ///////////////////////////////////////////////////// + return classList; + } + + private String formatClassHierarchyArray(Class[] classList){ String spaces = ""; String returnHierarchy = ""; - - for(int index = 0; index < count + 1; index++){ + for(int index = 0; index < classList.length; index++){ returnHierarchy += spaces + classList[index].getName() + "\n"; spaces += " "; - } return returnHierarchy; - } + } diff --git a/target/classes/kalaygian/dennis/FamilyTree.class b/target/classes/kalaygian/dennis/FamilyTree.class index 40a3280bddb539833c44c8127ca4e47e9dd5e15c..7a19eb69b96e3269734890301f4b82f7fe3d4697 100644 GIT binary patch literal 2196 zcmai0T~ixX7=AX{d@ajYN+=(N(rRf)NMdWPEznlLMzA5ML29YaxFk#1n(Ssan@+j! z&v3l(h8r(*Mxmo)$15-VE#CMC#OLfTN%$Ch!O1!Ap7XrV^Stjl!(adY`WnCue5D|P zxfq5puRy_q815;!j|U24ABbU53`^p}as(en@i2;f1Rp8r#he&c#HZCLJ{F5dQ4}Ir zi=Zf>*RqYOVQRJIn$~Pe7%V)~o@=?9W>#}c94e9y~7ifYDrRHjSz&ZcpB}>gV6UEw)^Tgx|o-_gt&B^z|JH z!^y4gdUaa7mmO7VHFUe|UH-7vXy|4|Lgoz&PngNpj1b7v7IiG|Bd+j8O7Q)nv7)q` zML8eAD916b@{9-gtE3JgrP9A3@Do=7jC1TmkYf*IsEF~!y2RD6w;L0fNgA35>h!ftTDg;Bi?K8!?~$As>4w;&WgMMiO>LkLk$he)_hB-|!) z6>o8`5Le=_kT58StfgNeIC}v36+#_S9_$EVM_t${??4-N5O3oe$%g2`H2n+UIss)y zlKh)N%1`yUo$8P;b!z+&k+sz9A)=jBo}Ckfnxv_h&q*heq%lk29)yuW_C&gXxP*Q> z%TG5Ulof*a(g%qBiN2QsNz4lSNB>-szy5(tJ?qB^2ig*%nh5puQOh8ej8cIx(^Ea+ zs}8Y0gjRMGO%;T?RR_c~;M4e)ZiRS0>l!@%JCtH381JFcrSaQxLjDekOhT3`vn3iI zTYD)V?H~P}=~!}=-3ST|QK~|DaS9wG{uO4J=6sf~jo^2SI}&8{E+ewY*RD_2H!MUY zUVRj56xId1Disi~7WIgxAUT(FF|Mw~)nZWaOuzmf4}L@MlSA}n4$x1w{po~!^8f>! z#RoYYAYSx$h_CSrUW}Tg{i8p+G)>Yq;109grR#GTz&zC~@TSe7z<(Ex^~A8;)>CZj cDZ1SGTHz6Hvr++Ktl)jlg5-aP$N}8_5BP(%iU0rr delta 821 zcmY*XO-~b16g_Wd-b_18D^nO?Z21txDy2yIs8B`xC~CE>N?GX61YNkWZZx_vZ1@MG zF($@^n{FkVsu*3m@E@4?7c}t?SkHT@sEfIC-n;kQbMMJ}?0-#ceEGHe2|xi?U8GQm z!^fNp2lFZ{xL8C{p<@n~Vpxu$!#TdX`hn<0*2xfN#XzljDyiPE4@6#yCh7;9$4@YM*<;F17v`c?njz` zg%qF7k-@NL&&q+UV%t0cy_)4|EW0d$k*?AmIk>25UEQ^xQw0C0*n2AWp2{f3SUVWK zm*ZQ1nL}iTnmMLt_V<`R4q%+>k~>UrQUeF6XYpo|-yvjGHyW`)p2N)ZsW&jH=1Q&& z`!kZ;hES;5>ipD+jCJE9oO<3&#olefY-Ea7V7)+JKCp5PUAb*_TAd%Mc*)`?&7vLH zB)vrW1KjIx(G$uxywGCE2liYW38GYzp^bed`KL(bQ@!0=YugsB&Tc4QaXF&G${3e&8KN#1r17#lU(DIn<0|_*?m;cKl>YB C++fiF From e5ed31e67942c79bb677b43b79177e373a8544ab Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Fri, 5 May 2017 17:25:09 -0400 Subject: [PATCH 09/14] In the process of writing tests for instantiateClassHierarchy(); skipping listAllMembers() for the meantime in order to proceed with labs --- .idea/workspace.xml | 56 +++++++++---------- .../java/kalaygian/dennis/TestFamilyTree.java | 56 +++++++++++++++++++ 2 files changed, 84 insertions(+), 28 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2e9270c..6eacb51 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ - + - + - - + + @@ -46,11 +46,11 @@ - + - - + + @@ -110,8 +110,8 @@ @@ -248,8 +248,8 @@ - + @@ -268,7 +268,7 @@ - + @@ -817,8 +817,8 @@ - - + + @@ -839,7 +839,7 @@ - + @@ -847,8 +847,8 @@ - - + + @@ -876,7 +876,7 @@ - @@ -1019,20 +1019,10 @@ - - - - - - - - - - - - + + @@ -1044,6 +1034,16 @@ + + + + + + + + + + diff --git a/src/test/java/kalaygian/dennis/TestFamilyTree.java b/src/test/java/kalaygian/dennis/TestFamilyTree.java index 1bdd6b1..4832fdf 100644 --- a/src/test/java/kalaygian/dennis/TestFamilyTree.java +++ b/src/test/java/kalaygian/dennis/TestFamilyTree.java @@ -2,7 +2,11 @@ import org.junit.Test; import org.junit.Assert; + +import java.util.AbstractCollection; +import java.util.AbstractList; import java.util.ArrayList; +import java.util.List; public class TestFamilyTree{ @@ -50,4 +54,56 @@ public void testGetClassHierarchy() throws ClassNotFoundException { //Then Assert.assertEquals("Method is not returning the right value", expectedValue, returnValue); } + + /*@Test + public void testListAllMembersReturnType() throws ClassNotFoundException { + //Given + FamilyTree familyTree = new FamilyTree(Class.forName("java.lang.Boolean")); + Class expectedReturnType = String.class; + //When + Class returnType = familyTree.listAllMembers().getClass(); + //Then + Assert.assertEquals("Method is returning the wrong data type", expectedReturnType, returnType); + } + + @Test + public void testListAllMembers() throws ClassNotFoundException { + //Given + FamilyTree familyTree = new FamilyTree(Class.forName("java.lang.Boolean")); + String expectedValue = "java.lang.Object" + "\n" + " " + "java.util.AbstractCollection" + "\n" + " " + "java.util.AbstractList" + "\n"; + //When + String returnValue = familyTree.getClassHierarchy(); + //Then + Assert.assertEquals("Method is not returning the right value", expectedValue, returnValue); + }*/ + + @Test + public void testInstantiateClassHierarchyReturnType() throws ClassNotFoundException { + //Given + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.AbstractList")); + Class expectedReturnType = String.class; + //When + Class returnType = familyTree.getClassHierarchy().getClass(); + //Then + Assert.assertEquals("Method is returning the wrong data type", expectedReturnType, returnType); + } + + @Test + public void testInstantiateClassHierarchy() throws ClassNotFoundException { + //Given + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.AbstractList")); + ArrayList item1; + AbstractList item2; + AbstractCollection item3; + Object item4; + Object[] expectedList = new Object[4]; + expectedList[0] = item1; + expectedList[1] = null; + + //When + Object[] + //Then + Assert.assertEquals("Method is not returning the right value", expectedValue, returnValue); + } + } From 1b227b7fbaf0a6db731c86e3b40ec9f521e91b8f Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Sat, 6 May 2017 12:15:08 -0400 Subject: [PATCH 10/14] Finished tests for instantiateClassHierarchy(), along with the method itself; trying to resolve test failure due to hash codes --- .idea/workspace.xml | 281 ++++++++++++------ .../java/kalaygian/dennis/FamilyTree.java | 20 ++ src/main/java/kalaygian/dennis/Main.java | 7 +- .../java/kalaygian/dennis/TestFamilyTree.java | 32 +- .../classes/kalaygian/dennis/FamilyTree.class | Bin 2196 -> 3015 bytes target/classes/kalaygian/dennis/Main.class | Bin 550 -> 808 bytes .../kalaygian/dennis/TestFamilyTree.class | Bin 2169 -> 3197 bytes 7 files changed, 224 insertions(+), 116 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6eacb51..f84d874 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,11 @@ + + + + + @@ -27,8 +32,8 @@ - - + + @@ -37,10 +42,11 @@ - - + + + @@ -49,15 +55,11 @@ - - + + - - - - - - + + @@ -110,6 +112,7 @@ - @@ -170,8 +173,8 @@ - + @@ -268,19 +271,19 @@ - - + + - - + - + - + + - - + - + - - - - - + + + + + - - - - - + + + + + @@ -839,72 +836,74 @@ - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + - + - + - + - + @@ -921,7 +920,7 @@ - @@ -930,6 +929,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -943,12 +1034,8 @@ - - - - - - + + @@ -975,6 +1062,7 @@ + @@ -1013,33 +1101,30 @@ - - + + - - + + - - - - - - + + - - + + + diff --git a/src/main/java/kalaygian/dennis/FamilyTree.java b/src/main/java/kalaygian/dennis/FamilyTree.java index 5a425c5..5b7136f 100644 --- a/src/main/java/kalaygian/dennis/FamilyTree.java +++ b/src/main/java/kalaygian/dennis/FamilyTree.java @@ -1,4 +1,7 @@ package kalaygian.dennis; +import java.util.ArrayList; +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.Constructor; /** @@ -62,4 +65,21 @@ private String formatClassHierarchyArray(Class[] classList){ return returnHierarchy; } + public ArrayList instantiateClassHierarchy() throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException { + int count = getClassHierarchyLength(); // Count the number of classes in the hierarchy + Class[] classList = createClassHierarchyArray(count); // For every class in the hierarchy, add it to the class array + ArrayList returnList = new ArrayList(); // Instantiate a list of objects to be returned + for(int index = 0; index < count; index++){ // For every element in the class array + // The following line is throwing an IllegalAccessException + try{ // If the class can be instantiated (ie it is not abstract) + Object element = classList[index].newInstance(); // Create a new instance of the class and store in the element variable + returnList.add(element); // Add this variable to the list of objects to be returned + } catch(Exception e) { // If the class cannot be instantiated (ie it is abstract) + Object element = null; + returnList.add(element); // Add a value of null to the list + } + } + return returnList; + } + } diff --git a/src/main/java/kalaygian/dennis/Main.java b/src/main/java/kalaygian/dennis/Main.java index e14e612..b14ec35 100644 --- a/src/main/java/kalaygian/dennis/Main.java +++ b/src/main/java/kalaygian/dennis/Main.java @@ -1,10 +1,11 @@ package kalaygian.dennis; +import java.util.ArrayList; public class Main { - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); + public static void main( String[] args ) throws ClassNotFoundException { + FamilyTree familyTree = new FamilyTree(ArrayList.class); + System.out.println(familyTree.getClassHierarchy()); } } diff --git a/src/test/java/kalaygian/dennis/TestFamilyTree.java b/src/test/java/kalaygian/dennis/TestFamilyTree.java index 4832fdf..f9bfc45 100644 --- a/src/test/java/kalaygian/dennis/TestFamilyTree.java +++ b/src/test/java/kalaygian/dennis/TestFamilyTree.java @@ -78,32 +78,34 @@ public void testListAllMembers() throws ClassNotFoundException { }*/ @Test - public void testInstantiateClassHierarchyReturnType() throws ClassNotFoundException { + public void testInstantiateClassHierarchyReturnType() throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException { //Given - FamilyTree familyTree = new FamilyTree(Class.forName("java.util.AbstractList")); - Class expectedReturnType = String.class; + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.ArrayList")); + Class expectedReturnType = ArrayList.class; //When - Class returnType = familyTree.getClassHierarchy().getClass(); + Class returnType = familyTree.instantiateClassHierarchy().getClass(); //Then Assert.assertEquals("Method is returning the wrong data type", expectedReturnType, returnType); } @Test - public void testInstantiateClassHierarchy() throws ClassNotFoundException { + public void testInstantiateClassHierarchy() throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException { //Given - FamilyTree familyTree = new FamilyTree(Class.forName("java.util.AbstractList")); - ArrayList item1; - AbstractList item2; - AbstractCollection item3; - Object item4; - Object[] expectedList = new Object[4]; - expectedList[0] = item1; - expectedList[1] = null; + FamilyTree familyTree = new FamilyTree(Class.forName("java.util.ArrayList")); + ArrayList expectedList = new ArrayList(); + Object element1 = ArrayList.class.newInstance(); + Object element2 = null; + Object element3 = null; + Object element4 = Object.class.newInstance(); + expectedList.add(element4); + expectedList.add(element3); + expectedList.add(element2); + expectedList.add(element1); //When - Object[] + ArrayList returnList = familyTree.instantiateClassHierarchy(); //Then - Assert.assertEquals("Method is not returning the right value", expectedValue, returnValue); + Assert.assertEquals("Method is not returning the right value", expectedList, returnList); } } diff --git a/target/classes/kalaygian/dennis/FamilyTree.class b/target/classes/kalaygian/dennis/FamilyTree.class index 7a19eb69b96e3269734890301f4b82f7fe3d4697..4417ea77a46271cf5463328216b3f943b72426ab 100644 GIT binary patch literal 3015 zcmai0O?MMz7`>D44pZ8uq@`a_&_bFf4OB#Ip;#)l)igzdAjJ=+$&d~tGj%cnsxJ8% z9v5u7aiQmE%aJ3;l?#7?Kf;YmH`e>kOeYgsWzl!u&->i_e5Jqt^YaS;XYsX+K@>YM zfE5`su8HA88P`#gxpzYhABo|nIJgzZ#|hj{U^R|AGCENd!zbeC(*!;fi_a6d8;2_6 zh&Yt7CT8V0DsgCW+>_90T6$GC)Y^PaZ8RkG6z;1J)qG7gs(EK?MndeOZs_)`gd^#F zr{gyzMCQ$kCZVgK8(OhhU(>7`>ROFE$%0u{Yd2L(7i(`bVz28oG*Wn=*3`|at{VA@ zW*B-Szo6Fj+U5;Q(`dB2s@W^;+^-kwVDe|eyqSYv}eW^B7G&2CyoK>vVl zG;Gzd^?d}XYtJ`LTd(CEqrwYR9M{|cwnt!P?Y>qP#}Y%63OLG-1J7iag6mH2(mwpY z_Wa!3*vnB*Ui*WK0aG4_*_k-jd@V2lVal`v~W>`aQHo^+W@ z03F}D=Vs)Ure3RPM77aW@DO?WSXS^zOhTih5_+8%?QT)<7@G>d#8-RgPV?}CAz|o$ zD&6DeHk>_fqb*`iHWy8MfrU~DUZhqFQHk#$M4s_KLMzZ_G6sA|crM7A&)VaQ9qgyJ&Innh)(gRBKIb zh5flNy&9~wR(tAXHz+kXG^^}3?wGo*v z{@32U{Q3*471~P$?RjV8t2n`5sX_jxF>^%ja@N852##?)&ea0lpJe^ZYWi5zYLF(D$6Ua4~1I*MU*o z3m%MwQ$C?t-WG&nFOiX*-F`%IG(aTg6N&jmP9x2`LR^VoA)!YQS)O=?aCRG!XNa~) zxv)co9d=+x-3LBw55|!p*(elD@J0!Fx#+clAjOl_l^vt$p4Z6u4{4RM<6b@!-A+S>g! zpy?RB2F%dPMSA@b>t>dGF0;}up@2DGPY33GJw;zn(c#YjCGY_;GW2r{i$uzBM?~9HD8WYwI>kH$uF_2l%*6N5OA5mzG)4hgT;t7U2BOHYtdQg)MO}AfU1vDQNb54* z;oEcGEan7v4p+F>#~|$mao$h2SwHJ9IPycZc!utImwc|0iRc#Y&H{Ht0m@8+9GNX* P3GZ_qB0Guf#BBLrN6dvp delta 916 zcmZuv%Tg0j5Iu7FL|I`<&C=_tVI$;?vK+_C5kQk0&8Y=mZ$XY={tZ zVy=Xk$3n>1RWXZVuF1uchh-nveXMx65#kU!Vpip9&BskSto!JC*znMM_k7cFZoU8F zL{9oU*GS5^Z4hC^;0`to?&6+@ErV^`H<-jZLopW&rZ8>r0CC!Nm!lm#GG|}_sL)o^ANkQ2ql^`hqaA_^gMbo`@)WTGlwCue zfAOTAJZK=6YQ`q*8PKf{P;VJf5V$@+b2^Q?`n%pR;LQ_Xb?jvNcGHZ-^x*vyV2CMKcA3FrLWw9Nhx`FR3&@g<&6f?@4?nH>99_%K%3DS_S)gr4C1{ diff --git a/target/classes/kalaygian/dennis/Main.class b/target/classes/kalaygian/dennis/Main.class index f9c5f76d1cdfe1c24a1e585f7938643b6c76466f..e246cdcef7c41aaa45b69c4b58aee7d340607824 100644 GIT binary patch literal 808 zcmZuv+iuf95IviuF>y^VX;Utx&{8f*3pG3!A)$(h2UDn0RYE*%oUOaXURUci!k+~X ztppMuz(*lwosa|tOP=e_nKQHd>-YDc0G{KSiw4#m+;OnsqJp~(+{31|wp`rDwu1)_ z9x~KlNF~inhHATW!caR%2ZCWSkV+ipNnhw=-j6BL4APLtCtOSGkAgLGCNqW`!6zQ` zB9dJB1EG}6{I^`HeS%9!Gpw~g2Iu@U_hYUizh|^m(SF&E>xckW{*z{KPkAEa;#dpn zzcJgRJ5Ez4_w|=hTo{?E%)uk_dugsi(Uq2b!_wKa3_Q4)XIP&hJOLv*CD+`@*ng!p zF9MkvTlm;P+d~IC9(M7>!BY==@EKY&Xtp22(q!g${c{l-hRsRnAm&+in3`^ytHGE( z!)kkKSLLB{Ra0QSA~PbPD@${NYz>dg)PGNVHMCv96WYjfBurWUMheY!cve{K&J_6Q zBK{8iF9L&eVew)bq%}=xe0|u$HF{+BtAI9+d6FJ^K50gJZs!W@Yni@IvOWxAfoyMN zFJg(j2A0tz5LS( z15p5^d4W7m20jLUpa@8_IoL3u*d_)hA?9riEC>U*fKm)VTR4CU!G?%|P2pq^U=RdK MFfs@MNhSti0At!77ytkO diff --git a/target/test-classes/kalaygian/dennis/TestFamilyTree.class b/target/test-classes/kalaygian/dennis/TestFamilyTree.class index ae9f1f70251c28405e1e087bb049002ad40ca7ac..7fcb7bf13c0b77f86f9c019e2563baa3d12a8e0e 100644 GIT binary patch literal 3197 zcma);Ygg1(6o%ge0~v=whT*PI23zGKGR0dJFD+6~>M*oGQE01%Oc;Wh1e1(P|5d-B ztFF}_&>z*+_aq_7$Uw`7$<8_Z?EUP^+2QYh{`?ETEDkdmz>I($236ev>aR6ucB@ zzi(KE_fVj9VscX;wP06tfv%Ea>E(KDM|U>V9g{2hlC7!crs^2-JzPwAdxk48R(h?P z>S5JTtzt#DEW<5s=&rY<)(rD-!_oD70#`h)ESRe6F4qoBy{229yKH&7v#VgBwZ}N*YpF=uq{`? zD}kZ4y5$))ebaCa1~+e6wx{~r0=bgyREzs{Cdm(qwua9Ng}FOsTCIDUU1LaMTcES1 zdwX^zTI)$bKC*37S1pY-dF zM_La$U{>~3%(=R=&tfL_ug9u4V)15F&cI85V{5XD!uFhO=KlUkhY#s8vu@WNOTyHzpwyg^@yA0Lw;Ww8e% zi+#Kn7+>-GreL^*pm?lg!Q0ad?;M*_MfKEz$B-46S=3+&Tt556PS9*w*fzDq^s}GYVq+&|;eyGk<1O!L%o}iJ@ec2KqfXSTv9I0%it#5@Mq|XXy3WlT!T6JdeNa1P_Ob}c6HP3~<0)MYM-w}JqM7qtJS^v3S9drAvK;vo7T?rWli!NF zO`IhH3rE1o6&Zu#_rmHf+je3*={_dxJ|>Ljm_Tm>Y8W7=z7f^wv(YCoaD1e(;W#Hc zEd5;a30f?|i1XcIgvZw(_kXk@|qPQoeoVYF;@)`UvOB`ONgS zkLZXk_oIy`y3vU|a_A*WKP?XUo~8n8p{Gvt;S#>2#~gLP!ez2uKpIylwPKuBQrw%s zBqhl^#izj4i0&|?8*89TJqX~+`RwpVbT)$2;KTW41!X))OTz7bb4- zKNB|_vDHJikw&&|pRJtFH?8P(g54n4EmrLtcE_Cr*hmDHi@-W@o%$`*PU9w})01{9 z0&7fK)Nef!toMwht&?qoY@1BlbFyqD*#3XgGVHer+-7ulKI^%=$AscM<4Chv)*5>5 z6MD8jpl>DLbA|3SdTtx&*2{H zagp)e=UXfFZ{i`P6fMuJv>3RE} IyDeD!7uH7TNB{r; delta 752 zcmaix-A)rh7>3{JZoA{Mg_Y8!R0~UgC{*ma6i^f>`2SxOMLn#>m;ho-6cSIoh&kpW z2nP~Oya3L;0q=uEjPJl^=?QTsnfYeEZ@%Y!XAg4+?(+WMy`KO=yt2`U2@4I0NgGp` zwvoVP3s)p&ba++guSv|>n8Un8(?$vl5{nkD>--Ign-aGy+_rFM`-36GUG+&Es7<3} zWZ|hTW4h~}gZp^kAd83Uw^5ak@Yq2MPgL3*Pd#<;3`?qM){N(Pq1Md0v5c2$%lxWZ z$>LderM=M(*4pdugVvjscW*zdkIBl;pX91o!Z0!vr@tfwyL+7bxeK@oeOmhtvCSZX z9Ou;0p~L`V=ePiQoa0X5JTDvQR}I-%)wLd50%?wJxEy)(9^v%e8cfc`=x&N|U(~%8ayv3Ri)Vi1$lQbntTI4WNgbJofb2^@KMZ^ZFuQ4|!FL zlINidW7Ksz??S{|KNEgC@mC_ROx+`VpHXTb>)`n@FBAK7BY(O7`Wrvy(d!qg((hIH zfyC?H?p>%sJKy2CP7MJygnY*a|HEX5hC-~tjWwik5p{abQbWM#bkCPaO(6USoL)qd From c5b23d4b13e6f107d6ec8c3df7e40a81bf1e7d9e Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Sat, 6 May 2017 14:31:08 -0400 Subject: [PATCH 11/14] Set up class files / test files for UnitCorn according to UML --- .idea/workspace.xml | 373 ++++++++++++------ .../kalaygian/dennis/{ => part1}/Display.java | 2 +- .../dennis/{ => part1}/FamilyTree.java | 2 +- .../kalaygian/dennis/{ => part1}/Main.java | 2 +- .../kalaygian/dennis/unitcorn/Result.java | 7 + .../dennis/unitcorn/UnitCornTestRunner.java | 7 + .../{ => testpart1}/TestFamilyTree.java | 10 +- .../dennis/testunitcorn/TestResult.java | 7 + .../testunitcorn/TestUnitCornTestRunner.java | 7 + target/classes/kalaygian/dennis/Display.class | Bin 280 -> 0 bytes target/classes/kalaygian/dennis/Main.class | Bin 808 -> 0 bytes .../kalaygian/dennis/part1/Display.class | Bin 0 -> 292 bytes .../dennis/{ => part1}/FamilyTree.class | Bin 3015 -> 3027 bytes .../classes/kalaygian/dennis/part1/Main.class | Bin 0 -> 832 bytes .../kalaygian/dennis/TestFamilyTree.class | Bin 3197 -> 0 bytes .../dennis/testpart1/TestFamilyTree.class | Bin 0 -> 3229 bytes 16 files changed, 293 insertions(+), 124 deletions(-) rename src/main/java/kalaygian/dennis/{ => part1}/Display.java (70%) rename src/main/java/kalaygian/dennis/{ => part1}/FamilyTree.java (99%) rename src/main/java/kalaygian/dennis/{ => part1}/Main.java (89%) create mode 100644 src/main/java/kalaygian/dennis/unitcorn/Result.java create mode 100644 src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java rename src/test/java/kalaygian/dennis/{ => testpart1}/TestFamilyTree.java (95%) create mode 100644 src/test/java/kalaygian/dennis/testunitcorn/TestResult.java create mode 100644 src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java delete mode 100644 target/classes/kalaygian/dennis/Display.class delete mode 100644 target/classes/kalaygian/dennis/Main.class create mode 100644 target/classes/kalaygian/dennis/part1/Display.class rename target/classes/kalaygian/dennis/{ => part1}/FamilyTree.class (74%) create mode 100644 target/classes/kalaygian/dennis/part1/Main.class delete mode 100644 target/test-classes/kalaygian/dennis/TestFamilyTree.class create mode 100644 target/test-classes/kalaygian/dennis/testpart1/TestFamilyTree.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f84d874..6d65d0c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,15 @@ - - + + + + + + + + - - - - + - - + - - + - - - + - - + - - - - - - + + + + + - - - + + + @@ -838,48 +950,47 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - @@ -896,7 +1007,7 @@ - + @@ -929,7 +1040,7 @@ - + @@ -937,18 +1048,18 @@ - + - + - + @@ -964,18 +1075,18 @@ - + - + - + @@ -983,18 +1094,18 @@ - + - + - + @@ -1010,18 +1121,18 @@ - + - + - + @@ -1029,18 +1140,18 @@ - + - + - + @@ -1056,13 +1167,13 @@ - + - + @@ -1083,14 +1194,6 @@ - - - - - - - - @@ -1099,36 +1202,76 @@ - + - - + + - + - - + + - + - + - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/kalaygian/dennis/Display.java b/src/main/java/kalaygian/dennis/part1/Display.java similarity index 70% rename from src/main/java/kalaygian/dennis/Display.java rename to src/main/java/kalaygian/dennis/part1/Display.java index d86663f..6aa056c 100644 --- a/src/main/java/kalaygian/dennis/Display.java +++ b/src/main/java/kalaygian/dennis/part1/Display.java @@ -1,4 +1,4 @@ -package kalaygian.dennis; +package kalaygian.dennis.part1; /** * Created by denniskalaygian on 5/5/17. diff --git a/src/main/java/kalaygian/dennis/FamilyTree.java b/src/main/java/kalaygian/dennis/part1/FamilyTree.java similarity index 99% rename from src/main/java/kalaygian/dennis/FamilyTree.java rename to src/main/java/kalaygian/dennis/part1/FamilyTree.java index 5b7136f..545c8ec 100644 --- a/src/main/java/kalaygian/dennis/FamilyTree.java +++ b/src/main/java/kalaygian/dennis/part1/FamilyTree.java @@ -1,4 +1,4 @@ -package kalaygian.dennis; +package kalaygian.dennis.part1; import java.util.ArrayList; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; diff --git a/src/main/java/kalaygian/dennis/Main.java b/src/main/java/kalaygian/dennis/part1/Main.java similarity index 89% rename from src/main/java/kalaygian/dennis/Main.java rename to src/main/java/kalaygian/dennis/part1/Main.java index b14ec35..e8d9964 100644 --- a/src/main/java/kalaygian/dennis/Main.java +++ b/src/main/java/kalaygian/dennis/part1/Main.java @@ -1,4 +1,4 @@ -package kalaygian.dennis; +package kalaygian.dennis.part1; import java.util.ArrayList; diff --git a/src/main/java/kalaygian/dennis/unitcorn/Result.java b/src/main/java/kalaygian/dennis/unitcorn/Result.java new file mode 100644 index 0000000..bd66e32 --- /dev/null +++ b/src/main/java/kalaygian/dennis/unitcorn/Result.java @@ -0,0 +1,7 @@ +package kalaygian.dennis.unitcorn; + +/** + * Created by denniskalaygian on 5/6/17. + */ +public class Result { +} diff --git a/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java b/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java new file mode 100644 index 0000000..409903b --- /dev/null +++ b/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java @@ -0,0 +1,7 @@ +package kalaygian.dennis.unitcorn; + +/** + * Created by denniskalaygian on 5/6/17. + */ +public class UnitCornTestRunner { +} diff --git a/src/test/java/kalaygian/dennis/TestFamilyTree.java b/src/test/java/kalaygian/dennis/testpart1/TestFamilyTree.java similarity index 95% rename from src/test/java/kalaygian/dennis/TestFamilyTree.java rename to src/test/java/kalaygian/dennis/testpart1/TestFamilyTree.java index f9bfc45..b7056b7 100644 --- a/src/test/java/kalaygian/dennis/TestFamilyTree.java +++ b/src/test/java/kalaygian/dennis/testpart1/TestFamilyTree.java @@ -1,12 +1,10 @@ -package kalaygian.dennis; +package kalaygian.dennis.testpart1; +import kalaygian.dennis.part1.FamilyTree; import org.junit.Test; import org.junit.Assert; -import java.util.AbstractCollection; -import java.util.AbstractList; import java.util.ArrayList; -import java.util.List; public class TestFamilyTree{ @@ -101,9 +99,9 @@ public void testInstantiateClassHierarchy() throws ClassNotFoundException, Illeg expectedList.add(element3); expectedList.add(element2); expectedList.add(element1); - + ArrayList returnList; //When - ArrayList returnList = familyTree.instantiateClassHierarchy(); + returnList = familyTree.instantiateClassHierarchy(); //Then Assert.assertEquals("Method is not returning the right value", expectedList, returnList); } diff --git a/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java b/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java new file mode 100644 index 0000000..05c556d --- /dev/null +++ b/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java @@ -0,0 +1,7 @@ +package kalaygian.dennis.testunitcorn; + +/** + * Created by denniskalaygian on 5/6/17. + */ +public class TestResult { +} diff --git a/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java b/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java new file mode 100644 index 0000000..a7a5b63 --- /dev/null +++ b/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java @@ -0,0 +1,7 @@ +package kalaygian.dennis.testunitcorn; + +/** + * Created by denniskalaygian on 5/6/17. + */ +public class TestUnitCornTestRunner { +} diff --git a/target/classes/kalaygian/dennis/Display.class b/target/classes/kalaygian/dennis/Display.class deleted file mode 100644 index 72040bd4b1473a009bb50204c9537fbf4cf65b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmZ{eyH3ME5Jm4eet=_0lnT+&0Yz4+K{P~E78FG3$IdEDaMs9nkoYVrB#L|h9~EUb zO3SWvH1}xlYW{Y=TL2RbQ}l3_;5@;A5Z{ZF?t##|zL^uk$9iE2gIt__-mDAT%($r3 zjPknVYR--Le3W7LCN1GIf9Hz7mcq^~taH+usk9%e?g;5?y=hAOB>tD|=*KJmy^VX;Utx&{8f*3pG3!A)$(h2UDn0RYE*%oUOaXURUci!k+~X ztppMuz(*lwosa|tOP=e_nKQHd>-YDc0G{KSiw4#m+;OnsqJp~(+{31|wp`rDwu1)_ z9x~KlNF~inhHATW!caR%2ZCWSkV+ipNnhw=-j6BL4APLtCtOSGkAgLGCNqW`!6zQ` zB9dJB1EG}6{I^`HeS%9!Gpw~g2Iu@U_hYUizh|^m(SF&E>xckW{*z{KPkAEa;#dpn zzcJgRJ5Ez4_w|=hTo{?E%)uk_dugsi(Uq2b!_wKa3_Q4)XIP&hJOLv*CD+`@*ng!p zF9MkvTlm;P+d~IC9(M7>!BY==@EKY&Xtp22(q!g${c{l-hRsRnAm&+in3`^ytHGE( z!)kkKSLLB{Ra0QSA~PbPD@${NYz>dg)PGNVHMCv96WYjfBurWUMheY!cve{K&J_6Q zBK{8iF9L&eVew)bq%}=xe0|u$HF{+BtAI9+d6FJ^K50gJZs!W@Yni@IvOWxAfoyMN zFJg(j2A0tz5LS6ot=C^P_2Miw_{WQx^_hTimp`3c66bze$IBYn+rM6?`mLLKi-O4^?`n zbnRUDnDfnW;QsBlzW~MZ&v|d=kFc)W^HXns;Ub(2$ zoac4P)tnpg`6$EgO~MDErp#~Sm&fQYi_!+nMu3WhkHW$Qg52lK8o+kj{a`N zpPV5?M7a3Bf-v%*O~r0$o{N<&J6s{qP5dDpZBfRW%pn8O?GNZ%MSw&ZtM)umW`}!( MQ>2;*ePw`b51G6_#sB~S literal 0 HcmV?d00001 diff --git a/target/classes/kalaygian/dennis/FamilyTree.class b/target/classes/kalaygian/dennis/part1/FamilyTree.class similarity index 74% rename from target/classes/kalaygian/dennis/FamilyTree.class rename to target/classes/kalaygian/dennis/part1/FamilyTree.class index 4417ea77a46271cf5463328216b3f943b72426ab..f391263a1436446c6319891908d593d9891dc514 100644 GIT binary patch delta 65 zcmX>uep!6NX9;DW?8KbJ%Jj^{JpGi^yu8d}{er}z62r}`j5nFZ6>&(uXSu-!06)qZ A6aWAK delta 53 ucmcaCeq4OQXCYai?8KbJ%Jj^{JpGi^yu8ff&D@MPnFXaWgnzT#U;_X#>J;Dr diff --git a/target/classes/kalaygian/dennis/part1/Main.class b/target/classes/kalaygian/dennis/part1/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..106086c55044e841f962c4e87192e4416f60eb78 GIT binary patch literal 832 zcmZ`%+iuf95IviuF>y^VX;Utx&`>T(3pIT%LP8Z052jG1s)TsjIE%Z*UPtRSBA*2h ztppMuz(*lwosa~HSn|$gXU?3N*H)`#GNf98J7RpfV#mMS_digFzh%-Vmh8QhON zk@4_U3u3V|uTp0cMD^TPUqUf3GF6#_M`U-?T!*3~Z6h^HYTxqk;9`-XIfwidlBgBD zb0cH_rPh2H$jsRE#|~N^+Sv85hbIo6df120usH|Q)@E3lPT_6uLWG84d+Iuhd6pfg zrjzEXKk0;Fy)`qvBB&VN3|M!V8IjN`)0`k1qi~t}?`YD7<}G+a(^-v#Dbim{p}7vv zhZeg%13q5O-?slnU~mQ&FQ!Hsvy>(aMHAQP@!78gnm!ik^vLo_GLj3sS72X@>+5t@ zM@}q}?v3?jtdLd1D(VDclTT144QTv8>3zL?g-Y-Z3wxKSUc#AzEm0V#zJ31dbXw4j aQ6kpJgMv?kd<-|ps*t=%|1Hu>xcvugk;PH~ literal 0 HcmV?d00001 diff --git a/target/test-classes/kalaygian/dennis/TestFamilyTree.class b/target/test-classes/kalaygian/dennis/TestFamilyTree.class deleted file mode 100644 index 7fcb7bf13c0b77f86f9c019e2563baa3d12a8e0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3197 zcma);Ygg1(6o%ge0~v=whT*PI23zGKGR0dJFD+6~>M*oGQE01%Oc;Wh1e1(P|5d-B ztFF}_&>z*+_aq_7$Uw`7$<8_Z?EUP^+2QYh{`?ETEDkdmz>I($236ev>aR6ucB@ zzi(KE_fVj9VscX;wP06tfv%Ea>E(KDM|U>V9g{2hlC7!crs^2-JzPwAdxk48R(h?P z>S5JTtzt#DEW<5s=&rY<)(rD-!_oD70#`h)ESRe6F4qoBy{229yKH&7v#VgBwZ}N*YpF=uq{`? zD}kZ4y5$))ebaCa1~+e6wx{~r0=bgyREzs{Cdm(qwua9Ng}FOsTCIDUU1LaMTcES1 zdwX^zTI)$bKC*37S1pY-dF zM_La$U{>~3%(=R=&tfL_ug9u4V)15F&cI85V{5XD!uFhO=KlUkhY#s8vu@WNOTyHzpwyg^@yA0Lw;Ww8e% zi+#Kn7+>-GreL^*pm?lg!Q0ad?;M*_MfKEz$B-46S=3+&Tt556PS9*w*fzDq^s}GYVq+&|;eyGk<1O!L%o}iJ@ec2KqfXSTv9I0%it#5@Mq|XXy3WlT!T6JdeNa1P_Ob}c6HP3~<0)MYM-w}JqM7qtJS^v3S9drAvK;vo7T?rWli!NF zO`IhH3rE1o6&Zu#_rmHf+je3*={_dxJ|>Ljm_Tm>Y8W7=z7f^wv(YCoaD1e(;W#Hc zEd5;a30f?|i1XcIgvZw(_kXk@|qPQoeoVYF;@)`UvOB`ONgS zkLZXk_oIy`y3vU|a_A*WKP?XUo~8n8p{Gvt;S#>2#~gLP!ez2uKpIylwPKuBQrw%s zBqhl^#izj4i0&|?8*89TJqX~+`RwpVbT)$2;KTW41!X))OTz7bb4- zKNB|_vDHJikw&&|pRJtFH?8P(g54n4EmrLtcE_Cr*hmDHi@-W@o%$`*PU9w})01{9 z0&7fK)Nef!toMwht&?qoY@1BlbFyqD*#3XgGVHer+-7ulKI^%=$AscM<4Chv)*5>5 z6MD8jpl>DLbA|3SdTtx&*2{H zagp)e=UXfFZ{i`P6fMuJv>3RE} IyDeD!7uH7TNB{r; diff --git a/target/test-classes/kalaygian/dennis/testpart1/TestFamilyTree.class b/target/test-classes/kalaygian/dennis/testpart1/TestFamilyTree.class new file mode 100644 index 0000000000000000000000000000000000000000..1a6d7184a8fb9b9ea07a01e6eae2cbe0e18fae92 GIT binary patch literal 3229 zcma)8Ygg1(6x|mFG7f_b!$VLhgBAruMtrrRwM7a_9fk@NEAkQce^giZO+u1^ffm+EPIAvZXYX_NJ(<7%`SULT)7a1892OKjPUA@ii})#n7Cco@ zN@GcyWx2kb#?Ki%!%7;f8MI?9jb9Y3%k}4J{F=rK1sn3|w+wo)AmhAL@Jc?sR`5ok z{efW_-a~=bvGH|*)SO+>1-eRxrI+iqP2E{jH%-3DmuyWn*Hy=m&*96Iw{5rr*GlhH zQ{Ar`s#UD$mSwm_Pj|gt)$yi_YqS>Bnqls*Il6vd;EG(EGga4JtnHe5O}9LE(eiX> zOV#uh-K#s++Wsz6X11bj0+)~H2;w)y&g*--y5{MXWSs8Oj`~3@nyOVT`gsW=<0KQ! z?`it3XV{jj;H|*mO5O5|n!awh2FcD^mhGwjvOun6JJsS&okjDhG1kS?2(gxjn3n6F zX4gneYzTDLbZ^_PMDKbMARpPbsjC)456jSx^`Kl&4Bb&3ZF@gSuCJ*F;~!>SSIxTL zzqkmio?}>5hVKZf5V~BIp%yLIQ^{WSbiY z46``vIO@K9O&n=G(809SS&VaebBE1Ltlx}XZ^h>AsGUKU{zj=%OQBrHo27qnJmEv8 z%&gjVN7EM!DgK_d1`$t5h*_M+1%Z)c(myIoZkPU3lJ!)?T0tcX9a}O?RiHa&9d=*f zY`jep%VHZw7CU$+aCOO7Pr+~tK?~W>g14;~J~}q7it4EakHi(2S=3+&jGn$@Gmu;s zHg*O2$5VfP`zXs!wLHb4yt@+)9OeL6A< z1=VzJ-qJ^0{`SubnGo$qT8l%K^9%)>m z)rzZ(lH%GJ#%W2s6TI_hLxgTWL^slaF7;giuAI+a{EW_K;La1=1wtG`zYnF505=kW z>kYwm5!@uM6I?$!FvW_V4DLn*ZZ8B^@WGuuEM3>qwFBf%DcmTrU134SFhIh?q$^t# z6s{0q>xl}N3kx^!pM{%_u+>9sLyg$FeQf1?zG+8q5ZE+<-D217P#t#@z=k4Vxd>P% zZqm1f-f7&Xb#l?}M8F!07U``=0_#1cXwQgkh1k|uv~^;6p1}71ind%e0xN5 z_YM(?v*eLxLsl9z_XRyKKA~?Z-*bTevY1JUnYR2n+B5BwgY5?xcs@DU7Ti+)?Yg{5 zQZow6J*b2ysMSB4cgY5L$?Gdt?=^G3A)mKAMJn-aQh*v!R`4Bv3C!{HzR0ipGraRT zuLS6#e$0pc=%e=x?z0~k$nOE4TIqiq4{4|lsWVE literal 0 HcmV?d00001 From f0914871096f7838418875f2a581b2ea46f108cb Mon Sep 17 00:00:00 2001 From: Dennis Kalaygian Date: Sat, 6 May 2017 14:48:31 -0400 Subject: [PATCH 12/14] Stubbed out test for addResult() method in Result class and created the class itself --- .idea/workspace.xml | 203 ++++++++++-------- .../java/kalaygian/dennis/part1/Main.java | 6 +- .../kalaygian/dennis/unitcorn/Result.java | 19 ++ .../dennis/testunitcorn/TestResult.java | 17 ++ .../classes/kalaygian/dennis/part1/Main.class | Bin 832 -> 880 bytes .../kalaygian/dennis/unitcorn/Result.class | Bin 0 -> 1014 bytes .../dennis/unitcorn/UnitCornTestRunner.class | Bin 0 -> 331 bytes .../dennis/testunitcorn/TestResult.class | Bin 0 -> 1106 bytes .../testunitcorn/TestUnitCornTestRunner.class | Bin 0 -> 351 bytes 9 files changed, 155 insertions(+), 90 deletions(-) create mode 100644 target/classes/kalaygian/dennis/unitcorn/Result.class create mode 100644 target/classes/kalaygian/dennis/unitcorn/UnitCornTestRunner.class create mode 100644 target/test-classes/kalaygian/dennis/testunitcorn/TestResult.class create mode 100644 target/test-classes/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6d65d0c..59f56eb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,9 @@ - - - - - - - - - + + + - + @@ -404,7 +417,7 @@ - + - + - + - - + + - - + - - - - - + + + + - - - - - + + + + + @@ -950,7 +957,7 @@ - + @@ -967,16 +974,10 @@ - - - - - - - + - + @@ -985,12 +986,19 @@ + + + + + + - + @@ -1002,12 +1010,12 @@ - + - + @@ -1044,7 +1052,9 @@ - + + + @@ -1090,7 +1100,9 @@ - + + + @@ -1136,7 +1148,9 @@ - + + + @@ -1202,14 +1216,6 @@ - - - - - - - - @@ -1240,10 +1246,20 @@ - + + + + + + + + + + + - + @@ -1256,19 +1272,30 @@ - + - - - + + + + + + + + + + + - + - - - + + + + + + diff --git a/src/main/java/kalaygian/dennis/part1/Main.java b/src/main/java/kalaygian/dennis/part1/Main.java index e8d9964..9612d92 100644 --- a/src/main/java/kalaygian/dennis/part1/Main.java +++ b/src/main/java/kalaygian/dennis/part1/Main.java @@ -5,7 +5,9 @@ public class Main { public static void main( String[] args ) throws ClassNotFoundException { - FamilyTree familyTree = new FamilyTree(ArrayList.class); - System.out.println(familyTree.getClassHierarchy()); + ArrayList th = new ArrayList(); + String element = "haha"; + th.add(element); + System.out.println(th); } } diff --git a/src/main/java/kalaygian/dennis/unitcorn/Result.java b/src/main/java/kalaygian/dennis/unitcorn/Result.java index bd66e32..376d064 100644 --- a/src/main/java/kalaygian/dennis/unitcorn/Result.java +++ b/src/main/java/kalaygian/dennis/unitcorn/Result.java @@ -1,7 +1,26 @@ package kalaygian.dennis.unitcorn; +import java.util.ArrayList; /** * Created by denniskalaygian on 5/6/17. */ public class Result { + + private ArrayList results; + + public Result(){ + results = new ArrayList(); + } + + public ArrayList getResults() { + return results; + } + + public void addResult(String s){ + results.add(s); + } + + public void displayResults(){ + System.out.println(results); + } } diff --git a/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java b/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java index 05c556d..952de4c 100644 --- a/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java +++ b/src/test/java/kalaygian/dennis/testunitcorn/TestResult.java @@ -1,7 +1,24 @@ package kalaygian.dennis.testunitcorn; +import org.junit.Test; +import org.junit.Assert; +import kalaygian.dennis.unitcorn.*; +import java.util.ArrayList; + /** * Created by denniskalaygian on 5/6/17. */ public class TestResult { + + @Test + public void testAddResult(){ + //Given + Result result = new Result(); + ArrayList expectedResults = new ArrayList(); + expectedResults.add("Error: Test failed"); + //When + result.addResult("Error: Test failed"); + //Then + Assert.assertEquals("Incorrect error message was added to the arraylist of errors", result.getResults(), expectedResults); + } } diff --git a/target/classes/kalaygian/dennis/part1/Main.class b/target/classes/kalaygian/dennis/part1/Main.class index 106086c55044e841f962c4e87192e4416f60eb78..6fc784daadc528f083f2133d8b0a56df69a36f56 100644 GIT binary patch delta 482 zcmZut%TB^T6g|^IOH0)Nq9XWyfv6Q-LQGufs^~(a(cMrQD5=HNYGh^n1k(?2;TPya z6HSb3|H41u3yin2F_BE>KF&RJa^`+WT}l7^etic}!iEY3Q!=Ji2$+gtCd{)6<}j~f z0gE!0WaRJkha16fGNg?bzvB9(Z#(+7=kbnVU-)GP*>bEi%k>$OJ%+>GhJN6Cw%efb zh|xB=bHqKH*BtAxb8a1m1w)~qUgf{UR@r1wcdkwA+_&5Ag^U9A2klGGw07-KNvU$% zT?^f5P!VTH^>NA&Y4Rp9mQj?kqG1(lGIR~=C^2O3zD9$4R>_IHUZ=n2|M=LiwJg&w z7fypN+YI)ERjG#rx5CLyhju2?Ix}w&PF^4y$w;-h@{H*56QtrZjXa4e>L{Ts zuq?20EAMvno;r8j=*YJ$hH~>vxhk?9<;i2q^PE8Tl^@pS{;#RQpzmFEt$yfSc!9ub ztXQE`{5Kb0vs~VQjx_<(Kn3dts@M?NG_VC34_G^!F`K9AQb|{Nw%m195Hu?7xXicB z3EK+4gagO&mES#y7&2z%kG&Q8j%UX$UekW)4e#_0k)WS}>=SrrGVy?9^ByDBA+#aH qfEFC%glVz?qjX&g8NxJ8x$hvRNC9bM$dbk|O;eKk4Am@gj{FBf^iy*H diff --git a/target/classes/kalaygian/dennis/unitcorn/Result.class b/target/classes/kalaygian/dennis/unitcorn/Result.class new file mode 100644 index 0000000000000000000000000000000000000000..c2ae9ca041dbea052fe292ca16e0cb3209595ed6 GIT binary patch literal 1014 zcmah|+iuf95IyTSF?LK7QlKrjUby7~HGM>>DghEt5g>ws;BAvwVT)r|z98kV06{B( z#0T(Eh_i8&(l!+@>zUa(XU@!yfB*UM3&0L`9N1X5u;IYKx{V9i)Yg`b+qmQ4F78>l zZ=o(=#eR|nX(Di?voAkMFH2S6J&9vE>8K=a3)o#X3T2wbzCdG9&TbwIWH|D=X{^Fg zdylx%t_oGUCs3$2dIILNXh?=iM}_{2Y~1(bH?kivQtLzm8T4eVv_A`)=?6tkTb++G zkdu*;p*QryP$gbQ(m@o5-s`Dw7IH>@nma_S)E8=GT5IvmIqGdW9Ok5)O#N(!x+TGS zwX;_OOGA|$Q1@Jw(~Yut;6GQo;c_0{*5h`ugo?oOg3-HhP5jI;46?w1txGA65mtzhz z7kx6!g*wnlL3mD~9yYm+Hn&u8A=x3nE|!2@>i5JEK!73tzx@lxn1C}{0{k}h>?oWLd#{8*j@4}JhYlsH?w zd2$why!V)SuwUOFp8zf}$uYuyhJy@aLVD%I_1A>a$?1|1&)StGj7ul>W_YfwUvSlE za#*%CH%s;|_}?(@A6-Y7mQUR9>)NrHl@)QF8ML%+y_g3TGZhQl^>>4a^_PVFz8!pR z=PooK{au-E_=O9^NC@Zu=_X9VscBf&=C<0{y2mjh{csr4r=7}Fo!NRIIeQ1aX%Hb( VrWyzCD2uI5u!~$BVNV&M_yMI4P-6f9 literal 0 HcmV?d00001 diff --git a/target/test-classes/kalaygian/dennis/testunitcorn/TestResult.class b/target/test-classes/kalaygian/dennis/testunitcorn/TestResult.class new file mode 100644 index 0000000000000000000000000000000000000000..c8a17f76dddebc060406b05b2f881a0c8ffbaacc GIT binary patch literal 1106 zcmZuw?M@Rx6g|@xT9(Duq97!p8_hOD>17m1hN`c$e4FlVNwX=oLW8rI1wO(RO||cJT;HWjuEA1Wy?neH`u3PI;a+Mk-`nGu_^8?Gie@ zBtoOPG|owyrda~PB=yYZ8!H~}5jY}s+a@WoV(28Se2-_9eX6Jc%AaKdt^qvyExE^pCQ?0+<~gtu^vIvW)D&+!5H1EPa*M!7Mn8I_=&307h|* zJd%Pg7qZLWQKS!O9Ha2z2u1%GC9(r=7V3kCD8HY#rcxi8KZLXJ6T`NC5w`v$A%JRB z$g2^`IMtrQ7-nf_F?n9Mhgl(ij53z;4f-Ysf09mFW_jc$MQ%~V@}45gaGTZw?)(F| Cof+Z) literal 0 HcmV?d00001 diff --git a/target/test-classes/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.class b/target/test-classes/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.class new file mode 100644 index 0000000000000000000000000000000000000000..0ee531cb6ca85ee81398bf76c6fad8c0b551777e GIT binary patch literal 351 zcmbV|y-EW?6ot>->`z=*6KqqZQws+{Y!sV-)uNzD`q|A8C$4v4c2@AQtOScZfDa|! z36@sQz{mX#!?`eD-=A9m=NRW0;2^_ch7lpXwru?kVQ_r1B*e3JWeB6vvbpPDD&yw5 zY9u)-+gdkE?QHPhF!oQjBV3lxy3ucIt68lKv+a~Oo$sZ%ZXK(+$U Date: Sun, 7 May 2017 16:54:33 -0400 Subject: [PATCH 13/14] Pivoting entire design based on another completed assignment --- .idea/workspace.xml | 410 ++++++++++++------ .../dennis/testunitcorn/ImitationTest.java | 35 ++ .../dennis/testunitcorn/TestResult.java | 24 - .../dennis/testunitcorn/ImitationTest.class | Bin 0 -> 1531 bytes .../dennis/testunitcorn/TestResult.class | Bin 1106 -> 0 bytes 5 files changed, 321 insertions(+), 148 deletions(-) create mode 100644 src/test/java/kalaygian/dennis/testunitcorn/ImitationTest.java delete mode 100644 src/test/java/kalaygian/dennis/testunitcorn/TestResult.java create mode 100644 target/test-classes/kalaygian/dennis/testunitcorn/ImitationTest.class delete mode 100644 target/test-classes/kalaygian/dennis/testunitcorn/TestResult.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 59f56eb..c674064 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,8 @@ - - - + + @@ -41,11 +38,22 @@ - - + + + + + + + + + + + + + + - @@ -55,10 +63,11 @@ - + + @@ -79,24 +88,11 @@ - - - - - - - - - - - - - - + @@ -105,11 +101,10 @@ - + - @@ -166,10 +161,11 @@ @@ -228,8 +224,6 @@ - - @@ -297,6 +291,10 @@ @@ -360,7 +358,9 @@ + + @@ -390,20 +390,20 @@ - - + + - - + - - + - - + - - - + - - - - - + + + + + - - - - - + + + + + @@ -957,34 +963,36 @@ - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -994,7 +1002,7 @@ - @@ -1009,8 +1017,8 @@ + - @@ -1021,8 +1029,8 @@ - + @@ -1039,7 +1047,7 @@ - @@ -1048,23 +1056,182 @@ - - + + - + - + - - + - - + - - - - - + + + + + - - - - - + + + + + @@ -965,7 +978,8 @@ - + + @@ -985,6 +999,9 @@ + + + @@ -994,15 +1011,12 @@ - - - - - + + - @@ -1011,7 +1025,6 @@ - @@ -1035,6 +1048,7 @@ + @@ -1056,23 +1070,6 @@ - - - - - - - - - - - - - - - - - @@ -1081,14 +1078,7 @@ - - - - - - - - + @@ -1101,9 +1091,7 @@ - - - + @@ -1145,16 +1133,7 @@ - - - - - - - - - - + @@ -1166,14 +1145,7 @@ - - - - - - - - + @@ -1186,9 +1158,7 @@ - - - + @@ -1230,9 +1200,7 @@ - - - + @@ -1274,9 +1242,7 @@ - - - + @@ -1318,9 +1284,7 @@ - - - + @@ -1366,37 +1330,30 @@ - + + - - + + - - - - - - - - - - - + - - + + - + - - - + + + + + @@ -1410,54 +1367,51 @@ - - + + - + - - + + - + - - + + - - - - - - - - + - + - - - - - + + + - + - - - - - + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index e748813..2f128a0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ junit junit - 3.8.1 + 4.12 test diff --git a/src/main/java/kalaygian/dennis/part1/FamilyTree.java b/src/main/java/kalaygian/dennis/part1/FamilyTree.java index 545c8ec..04d05b1 100644 --- a/src/main/java/kalaygian/dennis/part1/FamilyTree.java +++ b/src/main/java/kalaygian/dennis/part1/FamilyTree.java @@ -66,17 +66,17 @@ private String formatClassHierarchyArray(Class[] classList){ } public ArrayList instantiateClassHierarchy() throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException { - int count = getClassHierarchyLength(); // Count the number of classes in the hierarchy - Class[] classList = createClassHierarchyArray(count); // For every class in the hierarchy, add it to the class array - ArrayList returnList = new ArrayList(); // Instantiate a list of objects to be returned - for(int index = 0; index < count; index++){ // For every element in the class array - // The following line is throwing an IllegalAccessException - try{ // If the class can be instantiated (ie it is not abstract) - Object element = classList[index].newInstance(); // Create a new instance of the class and store in the element variable - returnList.add(element); // Add this variable to the list of objects to be returned - } catch(Exception e) { // If the class cannot be instantiated (ie it is abstract) + int count = getClassHierarchyLength(); + Class[] classList = createClassHierarchyArray(count); + ArrayList returnList = new ArrayList(); + for(int index = 0; index < count; index++){ + + try{ + Object element = classList[index].newInstance(); + returnList.add(element); + } catch(Exception e) { Object element = null; - returnList.add(element); // Add a value of null to the list + returnList.add(element); } } return returnList; diff --git a/src/main/java/kalaygian/dennis/part1/Main.java b/src/main/java/kalaygian/dennis/part1/Main.java index 9612d92..d8e8f72 100644 --- a/src/main/java/kalaygian/dennis/part1/Main.java +++ b/src/main/java/kalaygian/dennis/part1/Main.java @@ -5,9 +5,6 @@ public class Main { public static void main( String[] args ) throws ClassNotFoundException { - ArrayList th = new ArrayList(); - String element = "haha"; - th.add(element); - System.out.println(th); + } } diff --git a/src/main/java/kalaygian/dennis/unitcorn/Result.java b/src/main/java/kalaygian/dennis/unitcorn/Result.java index 376d064..2535901 100644 --- a/src/main/java/kalaygian/dennis/unitcorn/Result.java +++ b/src/main/java/kalaygian/dennis/unitcorn/Result.java @@ -6,21 +6,23 @@ */ public class Result { - private ArrayList results; + String methodName; + String result; - public Result(){ - results = new ArrayList(); + public Result(String methodName, String result) { + this.methodName = methodName; + this.result = result; } - public ArrayList getResults() { - return results; + public String getResult() { + return result; } - public void addResult(String s){ - results.add(s); + public String getMethodName() { + return methodName; } - public void displayResults(){ - System.out.println(results); + public String toString() { + return "Test result of " + methodName + ": " + result + ".\n"; } } diff --git a/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java b/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java index 409903b..7f003a8 100644 --- a/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java +++ b/src/main/java/kalaygian/dennis/unitcorn/UnitCornTestRunner.java @@ -1,5 +1,6 @@ package kalaygian.dennis.unitcorn; + /** * Created by denniskalaygian on 5/6/17. */ diff --git a/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java b/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java index a7a5b63..97c6639 100644 --- a/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java +++ b/src/test/java/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.java @@ -4,4 +4,5 @@ * Created by denniskalaygian on 5/6/17. */ public class TestUnitCornTestRunner { + } diff --git a/target/classes/kalaygian/dennis/unitcorn/Result.class b/target/classes/kalaygian/dennis/unitcorn/Result.class index c2ae9ca041dbea052fe292ca16e0cb3209595ed6..8e3bec42f596986405bc93cd0904da21b2807b23 100644 GIT binary patch literal 886 zcmah{-%r#)5dO9;cfC>$to#y13aIpo(D*9E2TgoBF#$rt3;vZy30J-7D9@zo?J?9cF({IpoPDWe{*GZQ7_S@8 zv`!eT4{1!evu&xwLDBDs?3j0wk}2)-zm3V41=HpB9F>e-xiP7otn6 zHUquA8o#_0DrVT3u<&uo!^!rrPXFGe2Vu}hO2|TsA!~u?@QAEO(J57!`YyZ!3%74z zgs*R4UQ^1zW3nDKfS@dbX%Ik@VCE^~S8Z6pB1IZp)3DOhLYN9PHd*V6Py-!SWW^2KVhBTValuBqE1s7ba-~>DghEt5g>ws;BAvwVT)r|z98kV06{B( z#0T(Eh_i8&(l!+@>zUa(XU@!yfB*UM3&0L`9N1X5u;IYKx{V9i)Yg`b+qmQ4F78>l zZ=o(=#eR|nX(Di?voAkMFH2S6J&9vE>8K=a3)o#X3T2wbzCdG9&TbwIWH|D=X{^Fg zdylx%t_oGUCs3$2dIILNXh?=iM}_{2Y~1(bH?kivQtLzm8T4eVv_A`)=?6tkTb++G zkdu*;p*QryP$gbQ(m@o5-s`Dw7IH>@nma_S)E8=GT5IvmIqGdW9Ok5)O#N(!x+TGS zwX;_OOGA|$Q1@Jw(~Yut;6GQo;c_0{*5h`ugo?oOg3-HhP5jI;46?w1txGA65mtzhz z7kx6!g*wnlL3mD~9yYm+Hn&u8A=x3nE|!2@>i5JeZ}@~yfFcqV9D)W;!7aE3vM9L-1qYzz7If5+5aZ+s*wXIK z`pvG3@T0Tm_x=E|!`eb)9AILRVj5s(FgI9S4sUlAtC~UJ?qa922urNoM{M0qo)d~X zeg4!SK#H;9S}MscdzuQc2pOZYt}{2O1X^Sz*`vx&o=rFjh}mmHq06d|0k8LN*zrW= qm3)awiIVHElGKKt9)Hm%>Guwp1wGZ4m&%28g-ZAT%^Py6#OMc_p&4EP literal 1531 zcmbtUYfl?T6g^|Fy^gafu6g9aqf2PO1d=VJZQ4Lc2!RC2At*seO+O801Vh)e&OX}m z2l_kuEuYB;h*Gsbpg*eW85@NVtX5HMY3A;od(S=h%-#L_pSOPjn8D*RDyWq(S;lot zl`!q%#yQ+X;Nq(?T-59`W0zUG+$!U1eBPP}OVPFx z=&5U?*0Sc7iZ|p|NKdsMHDtIcV{M<0old%|6M-A`pJXWaceFIYwlYR1L8_88BXA>% zO|aV3sZ4cbHt3xbsMyoxmzfN8y1y*&F;NGRsg-&Z?*x0cTF|Y)iqxUNC0lbX3&ZtDn^eWizcy6Ma$*6t=hye-&oT(5 z*$KKuk#(`TU)Ko<_5S!?@bfg*W{1b+=TR0n)QWDab*kl?7Td$;s0vJP>?%L~CGy!Y z)lGaEE1%u?%Ie{#kslf5OL}%y?Bb4xIm`=8{coC*ja|Q;MM+MY>F{%L*TVwt30(Z} z=s~8#Z54aCk43vY@UVo3E|xv4;E}+{NkTVa1U&2ZTOC=+^dn~B6w{|$d#XWsD<{{v zm?SEutIQdpu@Psys)5>B`Cr)CeZTAdBvnlgb(Ar^zmuS&V4athQW7Pb_C{r^rOY-5 zxC`XunJULhF>$E2`d`PTH0sDM&{sPfNPyn9sHX`DxGhUB6Pq!u2DF0~$H>aV@r;W%SebIsq8KMLzL;U~;aVY`8o04HV`JcL#@lhwHq8 zlV7OjhTkB6f;NBxqk0%!VSJTVACc`J{Q9&Jj?r!P%ecZSHg1qsj?pfLFpNA#7;l+< z!JRMOSsu;@Je+Pk28lUD{1GDiHJ}a+@yxi9-D~ihscU;RvOv{Olpl zIfp18;`|}JSMZ+jwE7wC19nniM^|xyysY+D*ds7bZ;k#bo=jrQex)(pX6m!X7)tby YF@x2PwJTr(U*a0^PU|$zm>eel1?{6$ga7~l diff --git a/target/test-classes/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.class b/target/test-classes/kalaygian/dennis/testunitcorn/TestUnitCornTestRunner.class index 0ee531cb6ca85ee81398bf76c6fad8c0b551777e..cef6f9cb687bef5a4405207e65e7d0320a09975e 100644 GIT binary patch delta 37 ocmcc5bf0O16Qe8_0|x^G0}lfukYr`xWZ(kQj11gBl8J!_0A|MnBme*a delta 37 ocmcc5bf0O16Qe8}0|x^G0}lfukYr`xWZ(kQj11gBl8J!_0A^DIAOHXW