From 44329cbe112dc8460d02b27a5fd9e56b914c7676 Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 11 Apr 2019 18:04:36 -0500 Subject: [PATCH 01/11] Pass Test --- src/test/java/hello/TestGreeter.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index 69074062..1edb084b 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -62,4 +62,18 @@ public void testGreeter() } + @Test + + public void newtestHBWGreeterPass() + + { + + g.setName("Hollie, YOU ARE AMAZING"); + + assertEquals(g.getName(),"Hollie, YOU ARE AMAZING"); + + assertEquals(g.sayHello(),"Hello Hollie, YOU ARE AMAZING!"); + + } + } \ No newline at end of file From 223abf8e59b6dba4d15e5fdc218e60438261cb92 Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 11 Apr 2019 18:11:22 -0500 Subject: [PATCH 02/11] Test Fail --- src/test/java/hello/TestGreeter.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index 1edb084b..075a4c3d 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -76,4 +76,16 @@ public void newtestHBWGreeterPass() } + @Test + + public void newtestHBWGreeterFail() + + { + + assertEquals(g.getName(),"kittens"); + + assertEquals(g.sayHello(),"Hello puppies!"); + + } + } \ No newline at end of file From f2dced66e16002b3e7af03cf512df9c6989150ee Mon Sep 17 00:00:00 2001 From: Hollie <47045787+holliew@users.noreply.github.com> Date: Tue, 16 Apr 2019 17:27:48 -0500 Subject: [PATCH 03/11] Update .travis.yml --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index a2b5b1be..ccb80227 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,13 @@ language: java script: ./gradlew build + +deploy: + provider: releases + api_key: + secure: $GITHUB_OAUTH_TOKEN + file_glob: true + file: build/**/* + skip_cleanup: true + on: tags: true + From 59aff2ab635616133e577ac4ac1ce328dea38c17 Mon Sep 17 00:00:00 2001 From: Hollie <47045787+holliew@users.noreply.github.com> Date: Thu, 18 Apr 2019 17:59:04 -0500 Subject: [PATCH 04/11] Update .travis.yml --- .travis.yml | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccb80227..09035f96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,42 @@ language: java +# the following will skip the installation of dependencies. +install: true + +# the following forces the use of JDK 8 +# matrix: +# include: +# - jdk: oraclejdk8 + +script: + - gradle clean build + - gradle dist --rerun-tasks +# - gradle distSetup --rerun-tasks +# - gradle zipDist --rerun-tasks +# - gradle zipTest --rerun-tasks + +before_deploy: + - git config --global user.email "builds@travis-ci.com" + - git config --global user.name "Travis CI" + - export GIT_TAG=$TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER + - git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER" + - git push -q https://$GITPERM@github.com/drlehr/java-hello-world-with-gradle --tags + - ls -R + +deploy: + skip_cleanup: true + provider: releases + api_key: + secure: $GITPERM + + file: + - "README.md" + - "build.gradle" + - ".travis.yml" + + on: + tags: false + all_branches: true +Collapse -script: ./gradlew build -deploy: - provider: releases - api_key: - secure: $GITHUB_OAUTH_TOKEN - file_glob: true - file: build/**/* - skip_cleanup: true - on: tags: true From bc9dc10e6898662216ceda75ff760e53cda647dc Mon Sep 17 00:00:00 2001 From: Hollie <47045787+holliew@users.noreply.github.com> Date: Thu, 18 Apr 2019 18:00:07 -0500 Subject: [PATCH 05/11] Update build.gradle --- build.gradle | 80 +++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index 2850845b..0a80cb4e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,62 +6,72 @@ * For more details take a look at the Java Quickstart chapter in the Gradle * user guide available at https://docs.gradle.org/2.8/userguide/tutorial_java_projects.html */ - -/* -// Apply the java plugin to add support for Java -apply plugin: 'java' - -// In this section you declare where to find the dependencies of your project -repositories { - // Use 'jcenter' for resolving your dependencies. - // You can declare any Maven/Ivy/file repository here. - jcenter() -} - -// In this section you declare the dependencies for your production and test code -dependencies { - // The production code uses the SLF4J logging API at compile time - compile 'org.slf4j:slf4j-api:1.7.12' - - // Declare the dependency for your favourite test framework you want to use in your tests. - // TestNG is also supported by the Gradle Test task. Just change the - // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add - // 'test.useTestNG()' to your build script. - testCompile 'junit:junit:4.12' -} -*/ - apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'application' - mainClassName = 'hello.HelloWorld' - // tag::repositories[] repositories { mavenCentral() } // end::repositories[] - // tag::jar[] jar { baseName = 'jb-hello-world' version = '0.1.0' } // end::jar[] - // tag::dependencies[] -sourceCompatibility = 1.7 -targetCompatibility = 1.7 - +sourceCompatibility = 1.8 +targetCompatibility = 1.8 dependencies { compile "joda-time:joda-time:2.2" - testCompile "junit:junit:4.12" + testCompile "org.junit.jupiter:junit-jupiter-api:5.0.1" +// the following is a work around to fix the warning: +// warning: unknown enum constant Status.STABLE + testCompileOnly "org.apiguardian:apiguardian-api:1.0.0" } // end::dependencies[] - +task dist { + description "Generate the dist(s) into the dist folder." +} +task distSetup { + description "Generate the dist folder." + delete "${projectDir}/dist" + copy { + from "${buildDir}/libs" + into "${projectDir}/dist/main" + } + copy { + from "${projectDir}/build/classes/test/Output" + into "${projectDir}/dist/test" + } +} +task zipDist(type: Zip, dependsOn: distSetup) { + from "${projectDir}/dist/main" + from "${projectDir}/Readme.md" + destinationDir = file("${projectDir}/dist") + version = "${version}" + appendix = "Main" + doLast { + println "Created ${zipDist.archiveName}" + } +} +task zipTest(type: Zip, dependsOn: distSetup) { + from "${projectDir}/dist/test" + from "${projectDir}/Readme.md" + destinationDir = file("${projectDir}/dist") + version = "${version}" + appendix = "Test Output" + doLast{ + println "Created ${zipTest.archiveName}" + } +} +distSetup.dependsOn(build) +dist.dependsOn(zipDist) +dist.dependsOn(zipTest) // tag::wrapper[] task wrapper(type: Wrapper) { - gradleVersion = '3.5' + gradleVersion = '4.9' } // end::wrapper[] From 8acb21a5e207ae2c48dd8e18d185ac15022a2fdc Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 18 Apr 2019 18:06:05 -0500 Subject: [PATCH 06/11] Update TestGreeter.java --- src/test/java/hello/TestGreeter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index 075a4c3d..c54d232c 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -76,7 +76,7 @@ public void newtestHBWGreeterPass() } - @Test + /*@Test public void newtestHBWGreeterFail() @@ -86,6 +86,6 @@ public void newtestHBWGreeterFail() assertEquals(g.sayHello(),"Hello puppies!"); - } + }*/ } \ No newline at end of file From 3d7285bf966c7c61b650add1c649437cfa48ff9a Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 18 Apr 2019 18:22:54 -0500 Subject: [PATCH 07/11] Update TestGreeter.java --- src/test/java/hello/TestGreeter.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index c54d232c..57ca73ea 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -76,6 +76,20 @@ public void newtestHBWGreeterPass() } + @Test + + public void newtestHBWGreeterPass() + + { + + g.setName("Hollie"); + + assertEquals(g.getName(),"Hollie"); + + assertEquals(g.sayHello(),"Hello Hollie!"); + + } + /*@Test public void newtestHBWGreeterFail() From 3f3d341d134460e016010f3d606360236fc7a949 Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 18 Apr 2019 18:52:50 -0500 Subject: [PATCH 08/11] Update TestGreeter.java --- src/test/java/hello/TestGreeter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index 57ca73ea..acd3c560 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -78,7 +78,7 @@ public void newtestHBWGreeterPass() @Test - public void newtestHBWGreeterPass() + public void newtestHBWGreeterPass2() { From 467d1db024a6e9d30ca880cefda8bda9d62e6658 Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 18 Apr 2019 18:57:20 -0500 Subject: [PATCH 09/11] Update TestGreeter.java --- src/test/java/hello/TestGreeter.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index acd3c560..35d895ab 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -1,19 +1,10 @@ package hello; - - import static org.junit.Assert.*; - - - import org.junit.Before; - import org.junit.Test; - - - public class TestGreeter { From 99146d4d1a57951b7ad23664b571260c51719980 Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 18 Apr 2019 19:10:02 -0500 Subject: [PATCH 10/11] Update TestGreeter.java --- src/test/java/hello/TestGreeter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index 35d895ab..c83c04dc 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -81,6 +81,8 @@ public void newtestHBWGreeterPass2() } + //test + /*@Test public void newtestHBWGreeterFail() From f7881150b47670f951f7bc9b4b0eee3ba2eaa37c Mon Sep 17 00:00:00 2001 From: Hollie Wilson Date: Thu, 18 Apr 2019 19:23:32 -0500 Subject: [PATCH 11/11] test --- src/test/java/hello/TestGreeter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index c83c04dc..7af08378 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -81,7 +81,7 @@ public void newtestHBWGreeterPass2() } - //test + //test2 /*@Test