From 1b5d0f705a364f2bb1a4e844e32715b54aafd9c1 Mon Sep 17 00:00:00 2001 From: Jeff Xiong Date: Tue, 12 Mar 2013 17:13:01 -0700 Subject: [PATCH 1/6] Initial commit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..fad9eb0 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +java-dojo +========= + +Project skeleton for Java coding dojo. \ No newline at end of file From 77d7982ff6ca7ffadcfe142a18be214cbcbfb4f0 Mon Sep 17 00:00:00 2001 From: Jeff Xiong Date: Wed, 13 Mar 2013 08:36:58 +0800 Subject: [PATCH 2/6] add junit --- .gitignore | 4 ++++ pom.xml | 19 +++++++++++++++++++ .../java/org/thoughtworkers/SmokeTest.java | 13 +++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/test/java/org/thoughtworkers/SmokeTest.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..49ca981 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea +*.iml +target + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..70a23bb --- /dev/null +++ b/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + org.thoughtworkers + java-dojo + 1.0 + + + junit + junit + 4.8.2 + + + + + \ No newline at end of file diff --git a/src/test/java/org/thoughtworkers/SmokeTest.java b/src/test/java/org/thoughtworkers/SmokeTest.java new file mode 100644 index 0000000..ff2c2a2 --- /dev/null +++ b/src/test/java/org/thoughtworkers/SmokeTest.java @@ -0,0 +1,13 @@ +package org.thoughtworkers; + +import org.junit.Test; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +public class SmokeTest { + @Test + public void shouldAlwaysPass() throws Exception { + assertThat(1, is(1)); + } +} From 8826d8ad767e42ac609fd653bde1efb968f1d2f3 Mon Sep 17 00:00:00 2001 From: Jeff Xiong Date: Wed, 13 Mar 2013 08:46:27 +0800 Subject: [PATCH 3/6] added cobertura for 100% coverage --- pom.xml | 27 +++++++++++++++++++ src/main/java/org/thoughtworkers/Hello.java | 7 +++++ .../java/org/thoughtworkers/HelloTest.java | 14 ++++++++++ .../java/org/thoughtworkers/SmokeTest.java | 13 --------- 4 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 src/main/java/org/thoughtworkers/Hello.java create mode 100644 src/test/java/org/thoughtworkers/HelloTest.java delete mode 100644 src/test/java/org/thoughtworkers/SmokeTest.java diff --git a/pom.xml b/pom.xml index 70a23bb..f849aa0 100644 --- a/pom.xml +++ b/pom.xml @@ -16,4 +16,31 @@ + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.5.2 + + + test + + cobertura + + + + + + 100 + 100 + 100 + 100 + 100 + 100 + + + + + \ No newline at end of file diff --git a/src/main/java/org/thoughtworkers/Hello.java b/src/main/java/org/thoughtworkers/Hello.java new file mode 100644 index 0000000..169fcd1 --- /dev/null +++ b/src/main/java/org/thoughtworkers/Hello.java @@ -0,0 +1,7 @@ +package org.thoughtworkers; + +public class Hello { + public String say() { + return "Hello, world!"; + } +} diff --git a/src/test/java/org/thoughtworkers/HelloTest.java b/src/test/java/org/thoughtworkers/HelloTest.java new file mode 100644 index 0000000..ba514ce --- /dev/null +++ b/src/test/java/org/thoughtworkers/HelloTest.java @@ -0,0 +1,14 @@ +package org.thoughtworkers; + +import org.junit.Test; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +public class HelloTest { + @Test + public void shouldSayHelloToTheWorld() throws Exception { + Hello hello = new Hello(); + assertThat(hello.say(), is("Hello, world!")); + } +} diff --git a/src/test/java/org/thoughtworkers/SmokeTest.java b/src/test/java/org/thoughtworkers/SmokeTest.java deleted file mode 100644 index ff2c2a2..0000000 --- a/src/test/java/org/thoughtworkers/SmokeTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.thoughtworkers; - -import org.junit.Test; - -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; - -public class SmokeTest { - @Test - public void shouldAlwaysPass() throws Exception { - assertThat(1, is(1)); - } -} From a376a0ea52a655de7cee774524445e000a358278 Mon Sep 17 00:00:00 2001 From: Jeff Xiong Date: Wed, 13 Mar 2013 08:59:58 +0800 Subject: [PATCH 4/6] update readme --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fad9eb0..126d381 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,14 @@ -java-dojo +Java Dojo ========= -Project skeleton for Java coding dojo. \ No newline at end of file +# What to do? + +''' +git://github.com/gigix/java-dojo.git +cd java-dojo +mvn clean install +''' + +You should see build "BUILD SUCCESS" at the end. + +Enjoy your Dojo! From 761a81e9552f87aa4cba22a16f29a92345c8995f Mon Sep 17 00:00:00 2001 From: Jeff Xiong Date: Wed, 13 Mar 2013 09:00:46 +0800 Subject: [PATCH 5/6] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 126d381..dea635b 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ Java Dojo # What to do? -''' +``` git://github.com/gigix/java-dojo.git cd java-dojo mvn clean install -''' +``` You should see build "BUILD SUCCESS" at the end. From 5151dddd29a42dbd09d55adc07426520d92a9aa9 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Mar 2013 11:24:43 +0800 Subject: [PATCH 6/6] dfd --- a.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 a.txt diff --git a/a.txt b/a.txt new file mode 100644 index 0000000..481fb86 --- /dev/null +++ b/a.txt @@ -0,0 +1 @@ +afasd