From e81c19b09ecef20b04e075b44c53cd01b7807fcc Mon Sep 17 00:00:00 2001 From: abassawo Date: Thu, 28 May 2015 20:09:04 -0400 Subject: [PATCH 1/2] complete --- src/Exercises.java | 13 ++++++++++--- src/MyObject.java | 44 +++++++++++++++++++++++++++++++++++++++++++ src/MyObjectNode.java | 43 ++++++++++++++++++++++++++++++++++++++++++ src/Tests.java | 5 +++-- 4 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 src/MyObject.java create mode 100644 src/MyObjectNode.java diff --git a/src/Exercises.java b/src/Exercises.java index ac85d45..856822f 100644 --- a/src/Exercises.java +++ b/src/Exercises.java @@ -1,11 +1,18 @@ public class Exercises { static class Parent { - public String doStuff() { return ""; } + public String doStuff() { return "parent"; } } static class Child extends Parent { - public String doStuff() { return ""; } - public String doStuff(String s) { return ""; } + public String doStuff() { return "child"; } + public String doStuff(String s) { return "Howdy"; } + } + + public static void main(String[] args) { + MyObjectNode x = new MyObjectNode(); + x.setLeft(); + x.setRight(); + x.setData(); } diff --git a/src/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..10cbfe4 --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,44 @@ +/** + * Created by c4q-Abass on 5/28/15. + */ +public class MyObject { + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + private String name; + private int age; + + + public MyObject(){ + this.name=""; + this.age=0; + } + + public MyObject(String objName, int objAge){ + this.name = objName; + this.age = objAge; + } + + public boolean isEqual(MyObject s){ + return ((this.name == s.getName()) + && (this.age == s.getAge()) + ); + } + + + +} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java new file mode 100644 index 0000000..c5d4f12 --- /dev/null +++ b/src/MyObjectNode.java @@ -0,0 +1,43 @@ +/** + * Created by c4q-Abass on 5/28/15. + */ +public class MyObjectNode extends MyNode { + private MyNode left, right, data; + @Override + public MyNode getLeft() { + return null; + } + + @Override + public MyNode getRight() { + return null; + } + + @Override + public Object getData() { + return null; + } + + @Override + public void insert(MyNode newNode) { + //add this my node + } + + + public void setLeft(){ + this.insert(left); + + } + + public void setRight(){ + this.insert(right); + } + public void setData(){ + this.insert(right); + } + + public static void main(String[] args) { + MyObject x = new MyObject(); + } + +} diff --git a/src/Tests.java b/src/Tests.java index 377c274..a4e16fe 100644 --- a/src/Tests.java +++ b/src/Tests.java @@ -44,7 +44,7 @@ public void test04MyObjectNodeImplementsSetters() throws Exception { ClassLoader cl = ClassLoader.getSystemClassLoader(); Class klass = cl.loadClass("MyObjectNode"); Method[] methods = klass.getMethods(); - ArrayList methodNames = new ArrayList<>(); + ArrayList methodNames = new ArrayList(); for (Method m : methods){ methodNames.add(m.getName()); } @@ -54,13 +54,14 @@ public void test04MyObjectNodeImplementsSetters() throws Exception { } } + @Test public void test05MyObjectHasNameAndAge() throws Exception { ClassLoader cl = ClassLoader.getSystemClassLoader(); Class klass = cl.loadClass("MyObject"); Method[] methods = klass.getMethods(); - ArrayList methodNames = new ArrayList<>(); + ArrayList methodNames = new ArrayList(); for (Method m : methods){ methodNames.add(m.getName()); } From f4d97816d1a1e0880d05886b3019cb00887bd202 Mon Sep 17 00:00:00 2001 From: abassawo Date: Thu, 28 May 2015 20:13:31 -0400 Subject: [PATCH 2/2] readme updated --- README.md | 3 +++ src/MyObjectNode.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c02997c..36174bc 100644 --- a/README.md +++ b/README.md @@ -28,3 +28,6 @@ My End time: `` Test End time: Fri May 29, 10:00pm EST Total time: 27 hours + + +50 minutes or so to complete assessment. diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java index c5d4f12..2ec729b 100644 --- a/src/MyObjectNode.java +++ b/src/MyObjectNode.java @@ -20,7 +20,7 @@ public Object getData() { @Override public void insert(MyNode newNode) { - //add this my node + //add this my node }