更新代码

.gitignore

@@ -291,7 +291,6 @@ students/406400373/*
 students/549739951/*
 students/582161208/*
 students/592146505/*
-students/740707954/*
 students/844620174/*
 students/87049319/*
 students/183549495/*

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/bridge/GraphicLibrary1.java

@@ -0,0 +1,11 @@
+package com.coderising.dp.bridge;
+
+public class GraphicLibrary1 {
+	public void draw_a_line(int x1,int y1,int x2,int y2){
+
+	}
+	public void draw_a_circle(int x,int y, int r){
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/bridge/GraphicLibrary2.java

@@ -0,0 +1,11 @@
+package com.coderising.dp.bridge;
+
+public class GraphicLibrary2 {
+	public void drawLine(int x1,int x2,int y1,int y2){
+
+	}
+	public void drawCircle(int x,int y, int r){
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/builder/TagBuilder.java

@@ -1,30 +1,37 @@
 package com.coderising.dp.builder;
 
 public class TagBuilder {
-
+	private TagNode rootNode;
+	private TagNode currentNode;
+	private TagNode parentNode;
 	public TagBuilder(String rootTagName){
-
+		rootNode = new TagNode(rootTagName);
+		currentNode = rootNode;
+		parentNode = null;
 	}
 
 	public TagBuilder addChild(String childTagName){
-
-		return null;
+		parentNode = this.currentNode;
+		this.currentNode = new TagNode(childTagName);
+		parentNode.add(currentNode);
+		return this;
 	}
 	public TagBuilder addSibling(String siblingTagName){
 
-
-		return null;
+		this.currentNode = new TagNode(siblingTagName);
+		parentNode.add(this.currentNode);
+		return this;
 
 	}
 	public TagBuilder setAttribute(String name, String value){
-
-		return null;
+		this.currentNode.setAttribute(name, value);
+		return this;
 	}
 	public TagBuilder setText(String value){
-
-		return null;
+		this.currentNode.setValue(value);
+		return this;
 	}
 	public String toXML(){
-		return null;
+		return this.rootNode.toXML();
 	}
 }

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/builder/TagNode.java

@@ -19,6 +19,7 @@ public void setAttribute(String name, String value) {
 		Attribute attr = findAttribute(name);
 		if(attr != null){
 			attr.value = value;
+			return;
 		}
 
 		attributes.add(new Attribute(name,value));

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/composite/Line.java

@@ -0,0 +1,11 @@
+package com.coderising.dp.composite;
+
+public class Line implements Shape {
+
+	@Override
+	public void draw() {
+
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/composite/Rectangle.java

@@ -0,0 +1,11 @@
+package com.coderising.dp.composite;
+
+public class Rectangle implements Shape {
+
+	@Override
+	public void draw() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/composite/Shape.java

@@ -0,0 +1,5 @@
+package com.coderising.dp.composite;
+
+public interface Shape {
+	public void draw();
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/composite/Square.java

@@ -0,0 +1,11 @@
+package com.coderising.dp.composite;
+
+public class Square implements Shape {
+
+	@Override
+	public void draw() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/com/coderising/dp/composite/Text.java

@@ -0,0 +1,11 @@
+package com.coderising.dp.composite;
+
+public class Text implements Shape {
+
+	@Override
+	public void draw() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/extension/RepeatedTest.java

@@ -0,0 +1,32 @@
+package org.litejunit.extension;
+
+import org.litejunit.v2.Test;
+import org.litejunit.v2.TestResult;
+
+/**
+ * A Decorator that runs a test repeatedly.
+ *
+ */
+public class RepeatedTest extends  TestDecorator {
+	private int fTimesRepeat;
+
+	public RepeatedTest(Test test, int repeat) {
+		super(test);
+		if (repeat < 0)
+			throw new IllegalArgumentException("Repetition count must be > 0");
+		fTimesRepeat= repeat;
+	}
+	public int countTestCases() {
+		return super.countTestCases()*fTimesRepeat;
+	}
+	public void run(TestResult result) {
+		for (int i= 0; i < fTimesRepeat; i++) {
+			if (result.shouldStop())
+				break;
+			super.run(result);
+		}
+	}
+	public String toString() {
+		return super.toString()+"(repeated)";
+	}
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/extension/TestDecorator.java

@@ -0,0 +1,40 @@
+package org.litejunit.extension;
+
+import org.litejunit.v2.Assert;
+import org.litejunit.v2.Test;
+import org.litejunit.v2.TestResult;
+
+/**
+ * A Decorator for Tests. Use TestDecorator as the base class
+ * for defining new test decorators. Test decorator subclasses
+ * can be introduced to add behaviour before or after a test
+ * is run.
+ *
+ */
+public class TestDecorator extends Assert implements Test {
+	protected Test test;
+
+	public TestDecorator(Test test) {
+		this.test= test;
+	}
+	/**
+	 * The basic run behaviour.
+	 */
+	public void basicRun(TestResult result) {
+		test.run(result);
+	}
+	public int countTestCases() {
+		return test.countTestCases();
+	}
+	public void run(TestResult result) {
+		basicRun(result);
+	}
+
+	public String toString() {
+		return test.toString();
+	}
+
+	public Test getTest() {
+		return test;
+	}
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/extension/TestSetup.java

@@ -0,0 +1,39 @@
+package org.litejunit.extension;
+
+import org.litejunit.v2.Protectable;
+import org.litejunit.v2.Test;
+import org.litejunit.v2.TestResult;
+
+/**
+ * A Decorator to set up and tear down additional fixture state.
+ * Subclass TestSetup and insert it into your tests when you want
+ * to set up additional state once before the tests are run.
+ */
+public class TestSetup extends TestDecorator {
+
+	public TestSetup(Test test) {
+		super(test);
+	}
+	public void run(final TestResult result) {
+		Protectable p= new Protectable() {
+			public void protect() throws Exception {
+				setUp();
+				basicRun(result);
+				tearDown();
+			}
+		};
+		result.runProtected(this, p);
+	}
+	/**
+	 * Sets up the fixture. Override to set up additional fixture
+	 * state.
+	 */
+	protected void setUp() throws Exception {
+	}
+	/**
+	 * Tears down the fixture. Override to tear down the additional
+	 * fixture state.
+	 */
+	protected void tearDown() throws Exception {
+	}
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/sample/AllTest.java

@@ -0,0 +1,43 @@
+package org.litejunit.sample;
+
+import org.litejunit.extension.RepeatedTest;
+import org.litejunit.extension.TestSetup;
+import org.litejunit.sample.calculator.CalculatorSuite;
+import org.litejunit.v2.Test;
+import org.litejunit.v2.TestSuite;
+
+
+public class AllTest {
+	/*public static Test suite(){
+
+		TestSuite suite= new TestSuite("All Test");
+		suite.addTest(CalculatorSuite.suite());		
+		suite.addTestSuite(PersonTest.class);
+		return suite;
+
+	}*/
+
+	public static Test suite(){
+
+		TestSuite suite= new TestSuite("All Test");
+		suite.addTest(CalculatorSuite.suite());		
+		suite.addTest(new RepeatedTest(new TestSuite(PersonTest.class), 2));
+		return new OverallTestSetup(suite);
+	}
+
+
+	static class OverallTestSetup extends TestSetup{
+
+		public OverallTestSetup(Test test) {
+			super(test);
+
+		}
+		protected void setUp() throws Exception {
+			System.out.println("this is overall testsetup");
+		}
+		protected void tearDown() throws Exception {
+			System.out.println("this is overall teardown");
+		}
+
+	}
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/sample/PersonTest.java

@@ -0,0 +1,38 @@
+package org.litejunit.sample;
+
+import org.litejunit.v2.TestCase;
+
+public class PersonTest extends TestCase {
+
+	Person p = null;
+	protected void setUp() {
+		p = new Person("andy",30);
+	}
+	public PersonTest(String name) {
+		super(name);		
+	}
+	public void testAge(){
+		this.assertEquals(30, p.getAge());
+	}
+	public void testName(){
+		this.assertEquals("andy", p.getName());
+	}
+}
+class Person{
+	private String name;
+	private int age;
+
+	public Person(String name, int age) {
+
+		this.name = name;
+		this.age = age;
+	}
+	public String getName() {
+		return name;
+	}
+	public int getAge() {
+		return age;
+	}
+
+
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/sample/calculator/Calculator.java

@@ -0,0 +1,22 @@
+package org.litejunit.sample.calculator;
+
+public class Calculator {
+
+	private int result = 0;
+	public  void add(int x){
+		result += x;
+	}
+	public void subtract(int x){
+		result -=x;
+	}
+
+	public int getResult(){
+		return this.result;
+	}
+	public static void main(String[] args){
+		Calculator calculator = new Calculator();
+		calculator.add(10);
+		calculator.subtract(5);		
+		System.out.println(calculator.getResult());
+	}
+}

liuxin/ood/ood-assignment/src/main/java/org/litejunit/sample/calculator/CalculatorSuite.java

@@ -0,0 +1,12 @@
+package org.litejunit.sample.calculator;
+
+import org.litejunit.v2.Test;
+import org.litejunit.v2.TestSuite;
+
+public class CalculatorSuite {
+	public static Test suite(){
+		TestSuite suite= new TestSuite("Calculator All Test");
+		suite.addTestSuite(CalculatorTest.class);		
+		return suite;
+	}
+}