diff --git a/.travis.yml b/.travis.yml index a2b5b1be..085f242a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,11 @@ language: java script: ./gradlew build + +deploy: + provider: releases + api_key: "GITHUB OAUTH TOKEN" + file: "FILE TO UPLOAD" + skip_cleanup: true + on: + tags: true diff --git a/build.gradle b/build.gradle index 2850845b..03ae3cbb 100644 --- a/build.gradle +++ b/build.gradle @@ -31,21 +31,39 @@ dependencies { } */ +// The Java plugin adds Java compilation along with testing and bundling capabilities to a project apply plugin: 'java' +// The Eclipse plugins generate files used by Eclipse, making it possible to import project into Eclipse. apply plugin: 'eclipse' +//The Application plugin facilitates creating an executable JVM application. apply plugin: 'application' + +sourceSets { + main { + java { srcDir 'src' } + resources { srcDir 'src' } + } + + test { + resources { srcDir 'test' } + } +} + +// mainClassName = 'package.mainClassName' mainClassName = 'hello.HelloWorld' // tag::repositories[] +// Usually, a Java project will have some dependencies on external JAR files. Gradle searches here for them repositories { mavenCentral() + jcenter() } // end::repositories[] // tag::jar[] jar { - baseName = 'jb-hello-world' + baseName = 'dl-hello-world' version = '0.1.0' } // end::jar[] @@ -54,14 +72,29 @@ jar { sourceCompatibility = 1.7 targetCompatibility = 1.7 +// joda-time provides the time stamping used in HelloWorld.java +// junit is to run the TestGreeter.java and others dependencies { compile "joda-time:joda-time:2.2" - testCompile "junit:junit:4.12" + compile "org.junit.jupiter:junit-jupiter-api:5.0.1" + testCompile "org.junit.jupiter:junit-jupiter-api:5.0.1" + + testImplementation( + 'org.junit.jupiter:junit-jupiter-api:5.1.0' + ) + testRuntimeOnly( + 'org.junit.jupiter:junit-jupiter-engine:5.1.0', + 'org.junit.vintage:junit-vintage-engine:5.1.0' + ) } // end::dependencies[] +test { + useJUnitPlatform() +} + // tag::wrapper[] task wrapper(type: Wrapper) { - gradleVersion = '3.5' + gradleVersion = '4.10.2' } // end::wrapper[] diff --git a/build/classes/java/main/hello/Greeter.class b/build/classes/java/main/hello/Greeter.class new file mode 100644 index 00000000..e58a8eac Binary files /dev/null and b/build/classes/java/main/hello/Greeter.class differ diff --git a/build/classes/java/main/hello/HelloWorld.class b/build/classes/java/main/hello/HelloWorld.class new file mode 100644 index 00000000..89256840 Binary files /dev/null and b/build/classes/java/main/hello/HelloWorld.class differ diff --git a/build/classes/java/main/hello/TestGreeter.class b/build/classes/java/main/hello/TestGreeter.class new file mode 100644 index 00000000..fbe771b1 Binary files /dev/null and b/build/classes/java/main/hello/TestGreeter.class differ diff --git a/build/classes/java/test/hello/TestGreeter.class b/build/classes/java/test/hello/TestGreeter.class new file mode 100644 index 00000000..fbe771b1 Binary files /dev/null and b/build/classes/java/test/hello/TestGreeter.class differ diff --git a/build/distributions/HelloWorld.tar b/build/distributions/HelloWorld.tar new file mode 100644 index 00000000..ad418046 Binary files /dev/null and b/build/distributions/HelloWorld.tar differ diff --git a/build/distributions/HelloWorld.zip b/build/distributions/HelloWorld.zip new file mode 100644 index 00000000..42949837 Binary files /dev/null and b/build/distributions/HelloWorld.zip differ diff --git a/build/libs/dl-hello-world-0.1.0.jar b/build/libs/dl-hello-world-0.1.0.jar new file mode 100644 index 00000000..1f4977a7 Binary files /dev/null and b/build/libs/dl-hello-world-0.1.0.jar differ diff --git a/build/reports/tests/test/classes/hello.TestGreeter.html b/build/reports/tests/test/classes/hello.TestGreeter.html new file mode 100644 index 00000000..bca54f30 --- /dev/null +++ b/build/reports/tests/test/classes/hello.TestGreeter.html @@ -0,0 +1,101 @@ + + + + + +Test results - TestGreeter + + + + + +
+

TestGreeter

+
+all > +hello > TestGreeter
+
+ + + + + +
+
+ + + + + + + +
+
+
2
+

tests

+
+		 +
+
0
+

failures

+
+		 +
+
0
+

ignored

+
+		 +
+
0.020s
+

duration

+
+
+
+		 +
+
100%
+

successful

+
+
+
+
+ +
+

Tests

+ + + + + + + + + + + + + + + + + + +
TestDurationResult
testGreeter()0.019spassed
testGreeterEmpty()0.001spassed
+
+
+ +
+ + diff --git a/build/reports/tests/test/css/base-style.css b/build/reports/tests/test/css/base-style.css new file mode 100644 index 00000000..4afa73e3 --- /dev/null +++ b/build/reports/tests/test/css/base-style.css @@ -0,0 +1,179 @@ + +body { + margin: 0; + padding: 0; + font-family: sans-serif; + font-size: 12pt; +} + +body, a, a:visited { + color: #303030; +} + +#content { + padding-left: 50px; + padding-right: 50px; + padding-top: 30px; + padding-bottom: 30px; +} + +#content h1 { + font-size: 160%; + margin-bottom: 10px; +} + +#footer { + margin-top: 100px; + font-size: 80%; + white-space: nowrap; +} + +#footer, #footer a { + color: #a0a0a0; +} + +#line-wrapping-toggle { + vertical-align: middle; +} + +#label-for-line-wrapping-toggle { + vertical-align: middle; +} + +ul { + margin-left: 0; +} + +h1, h2, h3 { + white-space: nowrap; +} + +h2 { + font-size: 120%; +} + +ul.tabLinks { + padding-left: 0; + padding-top: 10px; + padding-bottom: 10px; + overflow: auto; + min-width: 800px; + width: auto !important; + width: 800px; +} + +ul.tabLinks li { + float: left; + height: 100%; + list-style: none; + padding-left: 10px; + padding-right: 10px; + padding-top: 5px; + padding-bottom: 5px; + margin-bottom: 0; + -moz-border-radius: 7px; + border-radius: 7px; + margin-right: 25px; + border: solid 1px #d4d4d4; + background-color: #f0f0f0; +} + +ul.tabLinks li:hover { + background-color: #fafafa; +} + +ul.tabLinks li.selected { + background-color: #c5f0f5; + border-color: #c5f0f5; +} + +ul.tabLinks a { + font-size: 120%; + display: block; + outline: none; + text-decoration: none; + margin: 0; + padding: 0; +} + +ul.tabLinks li h2 { + margin: 0; + padding: 0; +} + +div.tab { +} + +div.selected { + display: block; +} + +div.deselected { + display: none; +} + +div.tab table { + min-width: 350px; + width: auto !important; + width: 350px; + border-collapse: collapse; +} + +div.tab th, div.tab table { + border-bottom: solid #d0d0d0 1px; +} + +div.tab th { + text-align: left; + white-space: nowrap; + padding-left: 6em; +} + +div.tab th:first-child { + padding-left: 0; +} + +div.tab td { + white-space: nowrap; + padding-left: 6em; + padding-top: 5px; + padding-bottom: 5px; +} + +div.tab td:first-child { + padding-left: 0; +} + +div.tab td.numeric, div.tab th.numeric { + text-align: right; +} + +span.code { + display: inline-block; + margin-top: 0em; + margin-bottom: 1em; +} + +span.code pre { + font-size: 11pt; + padding-top: 10px; + padding-bottom: 10px; + padding-left: 10px; + padding-right: 10px; + margin: 0; + background-color: #f7f7f7; + border: solid 1px #d0d0d0; + min-width: 700px; + width: auto !important; + width: 700px; +} + +span.wrapped pre { + word-wrap: break-word; + white-space: pre-wrap; + word-break: break-all; +} + +label.hidden { + display: none; +} \ No newline at end of file diff --git a/build/reports/tests/test/css/style.css b/build/reports/tests/test/css/style.css new file mode 100644 index 00000000..3dc4913e --- /dev/null +++ b/build/reports/tests/test/css/style.css @@ -0,0 +1,84 @@ + +#summary { + margin-top: 30px; + margin-bottom: 40px; +} + +#summary table { + border-collapse: collapse; +} + +#summary td { + vertical-align: top; +} + +.breadcrumbs, .breadcrumbs a { + color: #606060; +} + +.infoBox { + width: 110px; + padding-top: 15px; + padding-bottom: 15px; + text-align: center; +} + +.infoBox p { + margin: 0; +} + +.counter, .percent { + font-size: 120%; + font-weight: bold; + margin-bottom: 8px; +} + +#duration { + width: 125px; +} + +#successRate, .summaryGroup { + border: solid 2px #d0d0d0; + -moz-border-radius: 10px; + border-radius: 10px; +} + +#successRate { + width: 140px; + margin-left: 35px; +} + +#successRate .percent { + font-size: 180%; +} + +.success, .success a { + color: #008000; +} + +div.success, #successRate.success { + background-color: #bbd9bb; + border-color: #008000; +} + +.failures, .failures a { + color: #b60808; +} + +.skipped, .skipped a { + color: #c09853; +} + +div.failures, #successRate.failures { + background-color: #ecdada; + border-color: #b60808; +} + +ul.linkList { + padding-left: 0; +} + +ul.linkList li { + list-style: none; + margin-bottom: 5px; +} diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html new file mode 100644 index 00000000..4b103788 --- /dev/null +++ b/build/reports/tests/test/index.html @@ -0,0 +1,132 @@ + + + + + +Test results - Test Summary + + + + + +
+

Test Summary

+
+ + + + + +
+
+ + + + + + + +
+
+
2
+

tests

+
+		 +
+
0
+

failures

+
+		 +
+
0
+

ignored

+
+		 +
+
0.020s
+

duration

+
+
+
+		 +
+
100%
+

successful

+
+
+
+
+ +
+

Packages

+ + + + + + + + + + + + + + + + + + + + + +
PackageTestsFailuresIgnoredDurationSuccess rate
+hello +2000.020s100%
+
+
+

Classes

+ + + + + + + + + + + + + + + + + + + + +
ClassTestsFailuresIgnoredDurationSuccess rate
+hello.TestGreeter +2000.020s100%
+
+
+ +
+ + diff --git a/build/reports/tests/test/js/report.js b/build/reports/tests/test/js/report.js new file mode 100644 index 00000000..83bab4a1 --- /dev/null +++ b/build/reports/tests/test/js/report.js @@ -0,0 +1,194 @@ +(function (window, document) { + "use strict"; + + var tabs = {}; + + function changeElementClass(element, classValue) { + if (element.getAttribute("className")) { + element.setAttribute("className", classValue); + } else { + element.setAttribute("class", classValue); + } + } + + function getClassAttribute(element) { + if (element.getAttribute("className")) { + return element.getAttribute("className"); + } else { + return element.getAttribute("class"); + } + } + + function addClass(element, classValue) { + changeElementClass(element, getClassAttribute(element) + " " + classValue); + } + + function removeClass(element, classValue) { + changeElementClass(element, getClassAttribute(element).replace(classValue, "")); + } + + function initTabs() { + var container = document.getElementById("tabs"); + + tabs.tabs = findTabs(container); + tabs.titles = findTitles(tabs.tabs); + tabs.headers = findHeaders(container); + tabs.select = select; + tabs.deselectAll = deselectAll; + tabs.select(0); + + return true; + } + + function getCheckBox() { + return document.getElementById("line-wrapping-toggle"); + } + + function getLabelForCheckBox() { + return document.getElementById("label-for-line-wrapping-toggle"); + } + + function findCodeBlocks() { + var spans = document.getElementById("tabs").getElementsByTagName("span"); + var codeBlocks = []; + for (var i = 0; i < spans.length; ++i) { + if (spans[i].className.indexOf("code") >= 0) { + codeBlocks.push(spans[i]); + } + } + return codeBlocks; + } + + function forAllCodeBlocks(operation) { + var codeBlocks = findCodeBlocks(); + + for (var i = 0; i < codeBlocks.length; ++i) { + operation(codeBlocks[i], "wrapped"); + } + } + + function toggleLineWrapping() { + var checkBox = getCheckBox(); + + if (checkBox.checked) { + forAllCodeBlocks(addClass); + } else { + forAllCodeBlocks(removeClass); + } + } + + function initControls() { + if (findCodeBlocks().length > 0) { + var checkBox = getCheckBox(); + var label = getLabelForCheckBox(); + + checkBox.onclick = toggleLineWrapping; + checkBox.checked = false; + + removeClass(label, "hidden"); + } + } + + function switchTab() { + var id = this.id.substr(1); + + for (var i = 0; i < tabs.tabs.length; i++) { + if (tabs.tabs[i].id === id) { + tabs.select(i); + break; + } + } + + return false; + } + + function select(i) { + this.deselectAll(); + + changeElementClass(this.tabs[i], "tab selected"); + changeElementClass(this.headers[i], "selected"); + + while (this.headers[i].firstChild) { + this.headers[i].removeChild(this.headers[i].firstChild); + } + + var h2 = document.createElement("H2"); + + h2.appendChild(document.createTextNode(this.titles[i])); + this.headers[i].appendChild(h2); + } + + function deselectAll() { + for (var i = 0; i < this.tabs.length; i++) { + changeElementClass(this.tabs[i], "tab deselected"); + changeElementClass(this.headers[i], "deselected"); + + while (this.headers[i].firstChild) { + this.headers[i].removeChild(this.headers[i].firstChild); + } + + var a = document.createElement("A"); + + a.setAttribute("id", "ltab" + i); + a.setAttribute("href", "#tab" + i); + a.onclick = switchTab; + a.appendChild(document.createTextNode(this.titles[i])); + + this.headers[i].appendChild(a); + } + } + + function findTabs(container) { + return findChildElements(container, "DIV", "tab"); + } + + function findHeaders(container) { + var owner = findChildElements(container, "UL", "tabLinks"); + return findChildElements(owner[0], "LI", null); + } + + function findTitles(tabs) { + var titles = []; + + for (var i = 0; i < tabs.length; i++) { + var tab = tabs[i]; + var header = findChildElements(tab, "H2", null)[0]; + + header.parentNode.removeChild(header); + + if (header.innerText) { + titles.push(header.innerText); + } else { + titles.push(header.textContent); + } + } + + return titles; + } + + function findChildElements(container, name, targetClass) { + var elements = []; + var children = container.childNodes; + + for (var i = 0; i < children.length; i++) { + var child = children.item(i); + + if (child.nodeType === 1 && child.nodeName === name) { + if (targetClass && child.className.indexOf(targetClass) < 0) { + continue; + } + + elements.push(child); + } + } + + return elements; + } + + // Entry point. + + window.onload = function() { + initTabs(); + initControls(); + }; +} (window, window.document)); \ No newline at end of file diff --git a/build/reports/tests/test/packages/hello.html b/build/reports/tests/test/packages/hello.html new file mode 100644 index 00000000..da1dc104 --- /dev/null +++ b/build/reports/tests/test/packages/hello.html @@ -0,0 +1,103 @@ + + + + + +Test results - Package hello + + + + + +
+

Package hello

+
+all > hello
+
+ + + + + +
+
+ + + + + + + +
+
+
2
+

tests

+
+		 +
+
0
+

failures

+
+		 +
+
0
+

ignored

+
+		 +
+
0.020s
+

duration

+
+
+
+		 +
+
100%
+

successful

+
+
+
+
+ +
+

Classes

+ + + + + + + + + + + + + + + + + + + +
ClassTestsFailuresIgnoredDurationSuccess rate
+TestGreeter +2000.020s100%
+
+
+ +
+ + diff --git a/build/scripts/HelloWorld b/build/scripts/HelloWorld new file mode 100755 index 00000000..721036f9 --- /dev/null +++ b/build/scripts/HelloWorld @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## HelloWorld start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/.." >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="HelloWorld" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and HELLO_WORLD_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/lib/dl-hello-world-0.1.0.jar:$APP_HOME/lib/joda-time-2.2.jar:$APP_HOME/lib/junit-jupiter-api-5.0.1.jar:$APP_HOME/lib/opentest4j-1.0.0.jar:$APP_HOME/lib/junit-platform-commons-1.0.1.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $HELLO_WORLD_OPTS -classpath "\"$CLASSPATH\"" hello.HelloWorld "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/build/scripts/HelloWorld.bat b/build/scripts/HelloWorld.bat new file mode 100644 index 00000000..04815251 --- /dev/null +++ b/build/scripts/HelloWorld.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem HelloWorld startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME%.. + +@rem Add default JVM options here. You can also use JAVA_OPTS and HELLO_WORLD_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\lib\dl-hello-world-0.1.0.jar;%APP_HOME%\lib\joda-time-2.2.jar;%APP_HOME%\lib\junit-jupiter-api-5.0.1.jar;%APP_HOME%\lib\opentest4j-1.0.0.jar;%APP_HOME%\lib\junit-platform-commons-1.0.1.jar + +@rem Execute HelloWorld +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %HELLO_WORLD_OPTS% -classpath "%CLASSPATH%" hello.HelloWorld %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable HELLO_WORLD_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%HELLO_WORLD_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/build/test-results/test/TEST-hello.TestGreeter.xml b/build/test-results/test/TEST-hello.TestGreeter.xml new file mode 100644 index 00000000..949e6040 --- /dev/null +++ b/build/test-results/test/TEST-hello.TestGreeter.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/build/test-results/test/binary/output.bin b/build/test-results/test/binary/output.bin new file mode 100644 index 00000000..e69de29b diff --git a/build/test-results/test/binary/output.bin.idx b/build/test-results/test/binary/output.bin.idx new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/build/test-results/test/binary/output.bin.idx differ diff --git a/build/test-results/test/binary/results.bin b/build/test-results/test/binary/results.bin new file mode 100644 index 00000000..841e05a7 Binary files /dev/null and b/build/test-results/test/binary/results.bin differ diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF new file mode 100644 index 00000000..58630c02 --- /dev/null +++ b/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6b8e4f25..f4e321ed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-rc-2-all.zip + diff --git a/src/main/java/hello/Greeter.java b/src/main/java/hello/Greeter.java index 2a8dac70..f86285d1 100644 --- a/src/main/java/hello/Greeter.java +++ b/src/main/java/hello/Greeter.java @@ -4,52 +4,28 @@ public class Greeter { - - private String name = ""; - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String sayHello() - { - if (name == "") - { - return "Hello!"; - } - else - { - return "Hello " + name + "!"; - } - } } \ No newline at end of file diff --git a/src/main/java/hello/HelloWorld.java b/src/main/java/hello/HelloWorld.java index 263f9494..6918cb96 100644 --- a/src/main/java/hello/HelloWorld.java +++ b/src/main/java/hello/HelloWorld.java @@ -1,13 +1,20 @@ package hello; +/* a simple junit test */ +/* Add more and more and more comments */ + import org.joda.time.LocalTime; public class HelloWorld { - public static void main(String[] args) { + /* this the development branch and one more comment */ + public static void main(String[] args) + { + LocalTime currentTime = new LocalTime(); - System.out.println("The current local time is: " + currentTime); + System.out.println("Who will say the local time is: " + currentTime); Greeter greeter = new Greeter(); System.out.println(greeter.sayHello()); } } + diff --git a/src/test/java/hello/TestGreeter.java b/src/test/java/hello/TestGreeter.java index 69074062..213f796a 100644 --- a/src/test/java/hello/TestGreeter.java +++ b/src/test/java/hello/TestGreeter.java @@ -1,63 +1,33 @@ package hello; - - -import static org.junit.Assert.*; - - - -import org.junit.Before; - -import org.junit.Test; - - - - +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; public class TestGreeter { - - - private Greeter g; - - - - @Before - - public void setUp() throws Exception - - { - - g = new Greeter(); - - } - - + private Greeter g = new Greeter(); @Test - public void testGreeterEmpty() { + - assertEquals(g.getName(),""); + assertEquals(g.getName(),""); assertEquals(g.sayHello(),"Hello!"); } - - @Test - public void testGreeter() { g.setName("World"); - assertEquals(g.getName(),"World"); - assertEquals(g.sayHello(),"Hello World!"); } diff --git a/travis.yml b/travis.yml new file mode 100644 index 00000000..4c6d4077 --- /dev/null +++ b/travis.yml @@ -0,0 +1,5 @@ +language: java + + +#after_success: +#- bash <(curl -s https://codecov.io/bash)