From ffe22145119b02082492b347bfc184c0e885fb0e Mon Sep 17 00:00:00 2001 From: Sorin Zamfir Date: Sat, 15 Aug 2020 14:42:21 +0300 Subject: [PATCH 1/6] BAEL-4516: First structure --- gradle-5/settings.gradle | 3 +- gradle-5/source-sets/build.gradle | 35 +++++++++++++++++++ .../com/baeldung/itest/SourceSetsItest.java | 19 ++++++++++ .../com/baeldung/main/SourceSetsMain.java | 9 +++++ .../com/baeldung/test/SourceSetsTest.java | 19 ++++++++++ 5 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 gradle-5/source-sets/build.gradle create mode 100644 gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java create mode 100644 gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java create mode 100644 gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java diff --git a/gradle-5/settings.gradle b/gradle-5/settings.gradle index 1997e12ca5..5384d071e7 100644 --- a/gradle-5/settings.gradle +++ b/gradle-5/settings.gradle @@ -1,3 +1,4 @@ rootProject.name='gradle-5-articles' include 'java-exec' -include 'unused-dependencies' \ No newline at end of file +include 'unused-dependencies' +include 'source-sets' \ No newline at end of file diff --git a/gradle-5/source-sets/build.gradle b/gradle-5/source-sets/build.gradle new file mode 100644 index 0000000000..909b125aed --- /dev/null +++ b/gradle-5/source-sets/build.gradle @@ -0,0 +1,35 @@ + +apply plugin: "eclipse" + +description = "Source Sets example" + +task printConfigurations(){ + doLast{ + configurations.each { + println it.name + } + } +} + +sourceSets{ + itest { + java { + } + } +} + +dependencies { + implementation('org.apache.httpcomponents:httpclient:4.5.12') + testImplementation('junit:junit:4.12') + itestImplementation('com.google.guava:guava:29.0-jre') +} + +configurations { + itestImplementation.extendsFrom(testImplementation) +} + +eclipse { + classpath { + plusConfigurations+=[configurations.itestCompileClasspath] + } +} \ No newline at end of file diff --git a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java new file mode 100644 index 0000000000..7f5d0699a2 --- /dev/null +++ b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java @@ -0,0 +1,19 @@ +package com.baeldung.itest; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +import java.util.List; + +import org.junit.Test; + +import com.google.common.collect.ImmutableList; + +public class SourceSetsItest { + + @Test + public void whenRunThenFail() { + List someStrings = ImmutableList.of("Baeldung", "is", "cool"); + assertThat(false, is(true)); + } +} diff --git a/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java b/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java new file mode 100644 index 0000000000..319894d336 --- /dev/null +++ b/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java @@ -0,0 +1,9 @@ +package com.baeldung.main; + +public class SourceSetsMain { + + public static void main(String[] args) { + System.out.println("Hell..oh...world!"); + } + +} diff --git a/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java b/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java new file mode 100644 index 0000000000..829b6ee36b --- /dev/null +++ b/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java @@ -0,0 +1,19 @@ +package com.baeldung.test; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +import java.util.List; + +import org.junit.Test; + +import com.google.common.collect.ImmutableList; + +public class SourceSetsTest { + + @Test + public void whenRunThenSuccess() { + List someStrings = ImmutableList.of("Baeldung", "is", "cool"); + assertThat(true, is(true)); + } +} From 11111fd086f914386f5d0b6665f8f3fe3172b2ed Mon Sep 17 00:00:00 2001 From: Sorin Zamfir Date: Sun, 16 Aug 2020 22:39:00 +0300 Subject: [PATCH 2/6] BAEL-4516: Task for config and srcset info --- gradle-5/source-sets/build.gradle | 47 +++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/gradle-5/source-sets/build.gradle b/gradle-5/source-sets/build.gradle index 909b125aed..47f64aca04 100644 --- a/gradle-5/source-sets/build.gradle +++ b/gradle-5/source-sets/build.gradle @@ -1,35 +1,52 @@ apply plugin: "eclipse" +apply plugin: "java" description = "Source Sets example" -task printConfigurations(){ +task printSourceSetInformation(){ doLast{ - configurations.each { - println it.name + sourceSets.each { srcSet -> + println "["+srcSet.name+"]" + print "-->Source directories: "+srcSet.allJava.srcDirs+"\n" + print "-->Output directories: "+srcSet.output.classesDirs.files+"\n" + print "-->Compile classpath:\n" + srcSet.compileClasspath.files.each { + print " "+it.path+"\n" + } + println "" } } } -sourceSets{ - itest { - java { +task printConfigurationInformation(){ + doLast{ + configurations.each { config -> + println "["+config.name+"]" } } } +// sourceSets{ + +// itest { +// java { +// } +// } +// } + dependencies { implementation('org.apache.httpcomponents:httpclient:4.5.12') testImplementation('junit:junit:4.12') - itestImplementation('com.google.guava:guava:29.0-jre') + // itestImplementation('com.google.guava:guava:29.0-jre') } -configurations { - itestImplementation.extendsFrom(testImplementation) -} +// configurations { +// itestImplementation.extendsFrom(testImplementation) +// } -eclipse { - classpath { - plusConfigurations+=[configurations.itestCompileClasspath] - } -} \ No newline at end of file +// eclipse { +// classpath { +// plusConfigurations+=[configurations.itestCompileClasspath] +// } +// } \ No newline at end of file From 75ae55f3f147ca24dfef10773de5546f6ca073c3 Mon Sep 17 00:00:00 2001 From: Sorin Zamfir Date: Mon, 17 Aug 2020 23:55:43 +0300 Subject: [PATCH 3/6] BAEL-4516: Refine examples --- gradle-5/source-sets/.gitignore | 1 + gradle-5/source-sets/build.gradle | 37 ++++++++++++++----- .../com/baeldung/itest/SourceSetsItest.java | 22 ++++++++--- .../com/baeldung/main/SourceSetsObject.java | 21 +++++++++++ gradle-5/source-sets/src/random/Random.java | 0 .../com/baeldung/test/SourceSetsTest.java | 11 +++--- 6 files changed, 71 insertions(+), 21 deletions(-) create mode 100644 gradle-5/source-sets/.gitignore create mode 100644 gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java create mode 100644 gradle-5/source-sets/src/random/Random.java diff --git a/gradle-5/source-sets/.gitignore b/gradle-5/source-sets/.gitignore new file mode 100644 index 0000000000..84c048a73c --- /dev/null +++ b/gradle-5/source-sets/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/gradle-5/source-sets/build.gradle b/gradle-5/source-sets/build.gradle index 47f64aca04..435c54c7a9 100644 --- a/gradle-5/source-sets/build.gradle +++ b/gradle-5/source-sets/build.gradle @@ -27,23 +27,40 @@ task printConfigurationInformation(){ } } -// sourceSets{ +sourceSets{ + itest { + compileClasspath += sourceSets.main.output + runtimeClasspath += sourceSets.main.output + java { + } + } +} -// itest { -// java { -// } -// } -// } +test { + testLogging { + events "passed","skipped", "failed" + } +} + // main { + // java { + // srcDir('src/random') + // } + // } dependencies { implementation('org.apache.httpcomponents:httpclient:4.5.12') testImplementation('junit:junit:4.12') - // itestImplementation('com.google.guava:guava:29.0-jre') + itestImplementation('com.google.guava:guava:29.0-jre') } -// configurations { -// itestImplementation.extendsFrom(testImplementation) -// } +configurations { + itestImplementation.extendsFrom(testImplementation) + itestRuntimeOnly.extendsFrom(t) +} + +task itest(Type: test) { + +} // eclipse { // classpath { diff --git a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java index 7f5d0699a2..6a528a9b9b 100644 --- a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java +++ b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java @@ -3,17 +3,27 @@ package com.baeldung.itest; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import java.util.List; +//import java.util.List; import org.junit.Test; -import com.google.common.collect.ImmutableList; +import com.baeldung.main.SourceSetsObject; +//import com.google.common.collect.ImmutableList; public class SourceSetsItest { - + @Test - public void whenRunThenFail() { - List someStrings = ImmutableList.of("Baeldung", "is", "cool"); - assertThat(false, is(true)); + public void whenRunThenSuccess() { + + SourceSetsObject underTest = new SourceSetsObject("lorem","ipsum"); + + assertThat(underTest.getUser(), is("lorem")); + assertThat(underTest.getPassword(), is("ipsum")); } + +// @Test +// public void whenRunThenFail() { +// List someStrings = ImmutableList.of("Baeldung", "is", "cool"); +// assertThat(false, is(true)); +// } } diff --git a/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java b/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java new file mode 100644 index 0000000000..130121789c --- /dev/null +++ b/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java @@ -0,0 +1,21 @@ +package com.baeldung.main; + +public class SourceSetsObject { + + private final String user; + private final String password; + + public SourceSetsObject(String user, String password) { + this.user = user; + this.password = password; + } + + public String getPassword() { + return password; + } + + public String getUser() { + return user; + } + +} diff --git a/gradle-5/source-sets/src/random/Random.java b/gradle-5/source-sets/src/random/Random.java new file mode 100644 index 0000000000..e69de29bb2 diff --git a/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java b/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java index 829b6ee36b..4891ffd694 100644 --- a/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java +++ b/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java @@ -3,17 +3,18 @@ package com.baeldung.test; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import java.util.List; - import org.junit.Test; -import com.google.common.collect.ImmutableList; +import com.baeldung.main.SourceSetsObject; public class SourceSetsTest { @Test public void whenRunThenSuccess() { - List someStrings = ImmutableList.of("Baeldung", "is", "cool"); - assertThat(true, is(true)); + + SourceSetsObject underTest = new SourceSetsObject("lorem","ipsum"); + + assertThat(underTest.getUser(), is("lorem")); + assertThat(underTest.getPassword(), is("ipsum")); } } From 949502e831c9bf229f9d5ddf215aff8f4d298e02 Mon Sep 17 00:00:00 2001 From: Sorin Zamfir Date: Tue, 18 Aug 2020 21:52:30 +0300 Subject: [PATCH 4/6] BAEL-4516: Cleanup sources --- gradle-5/build.gradle | 10 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle-5/source-sets/build.gradle | 37 +++++++++---------- .../com/baeldung/itest/SourceSetsItest.java | 22 ++++++----- gradle-5/source-sets/src/random/Random.java | 0 5 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 gradle-5/source-sets/src/random/Random.java diff --git a/gradle-5/build.gradle b/gradle-5/build.gradle index 84cf05bad6..a40afb7024 100644 --- a/gradle-5/build.gradle +++ b/gradle-5/build.gradle @@ -5,11 +5,11 @@ plugins{ description = "Gradle 5 root project" allprojects { apply plugin :"java" - apply plugin :"nebula.lint" - gradleLint { - rules=['unused-dependency'] - reportFormat = 'text' - } + // apply plugin :"nebula.lint" + // gradleLint { + // rules=['unused-dependency'] + // reportFormat = 'text' + // } group = "com.baeldung" version = "0.0.1" sourceCompatibility = "1.8" diff --git a/gradle-5/gradle/wrapper/gradle-wrapper.properties b/gradle-5/gradle/wrapper/gradle-wrapper.properties index 4c46317507..0b7ed8da04 100644 --- a/gradle-5/gradle/wrapper/gradle-wrapper.properties +++ b/gradle-5/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip diff --git a/gradle-5/source-sets/build.gradle b/gradle-5/source-sets/build.gradle index 435c54c7a9..d7d3f18df3 100644 --- a/gradle-5/source-sets/build.gradle +++ b/gradle-5/source-sets/build.gradle @@ -1,10 +1,12 @@ -apply plugin: "eclipse" +// apply plugin: "eclipse" apply plugin: "java" description = "Source Sets example" task printSourceSetInformation(){ + description = "Print source set information" + doLast{ sourceSets.each { srcSet -> println "["+srcSet.name+"]" @@ -19,14 +21,6 @@ task printSourceSetInformation(){ } } -task printConfigurationInformation(){ - doLast{ - configurations.each { config -> - println "["+config.name+"]" - } - } -} - sourceSets{ itest { compileClasspath += sourceSets.main.output @@ -42,26 +36,31 @@ test { } } - // main { - // java { - // srcDir('src/random') - // } - // } dependencies { implementation('org.apache.httpcomponents:httpclient:4.5.12') testImplementation('junit:junit:4.12') itestImplementation('com.google.guava:guava:29.0-jre') } -configurations { - itestImplementation.extendsFrom(testImplementation) - itestRuntimeOnly.extendsFrom(t) +task itest(type: Test) { + description = "Run integration tests" + group = "verification" + testClassesDirs = sourceSets.itest.output.classesDirs + classpath = sourceSets.itest.runtimeClasspath } -task itest(Type: test) { - +itest { + testLogging { + events "passed","skipped", "failed" + } } +configurations { + itestImplementation.extendsFrom(testImplementation) + itestRuntimeOnly.extendsFrom(testRuntimeOnly) +} + + // eclipse { // classpath { // plusConfigurations+=[configurations.itestCompileClasspath] diff --git a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java index 6a528a9b9b..fea54574d6 100644 --- a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java +++ b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java @@ -3,27 +3,29 @@ package com.baeldung.itest; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -//import java.util.List; +import java.util.List; import org.junit.Test; import com.baeldung.main.SourceSetsObject; -//import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class SourceSetsItest { - + @Test public void whenRunThenSuccess() { - SourceSetsObject underTest = new SourceSetsObject("lorem","ipsum"); + SourceSetsObject underTest = new SourceSetsObject("lorem", "ipsum"); assertThat(underTest.getUser(), is("lorem")); assertThat(underTest.getPassword(), is("ipsum")); } - -// @Test -// public void whenRunThenFail() { -// List someStrings = ImmutableList.of("Baeldung", "is", "cool"); -// assertThat(false, is(true)); -// } + + @Test + public void givenImmutableListwhenRunThenSuccess() { + + List someStrings = ImmutableList.of("Baeldung", "is", "cool"); + + assertThat(someStrings.size(), is(3)); + } } diff --git a/gradle-5/source-sets/src/random/Random.java b/gradle-5/source-sets/src/random/Random.java deleted file mode 100644 index e69de29bb2..0000000000 From 1430aad42b1c0be390fbd9ba489c207b49512136 Mon Sep 17 00:00:00 2001 From: Sorin Zamfir Date: Wed, 19 Aug 2020 21:11:19 +0300 Subject: [PATCH 5/6] BAEL-4516: Fixed formatting for sources --- gradle-5/build.gradle | 10 +++++----- gradle-5/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle-5/source-sets/build.gradle | 13 ++++++------- .../java/com/baeldung/itest/SourceSetsItest.java | 12 ++++++------ .../test/java/com/baeldung/test/SourceSetsTest.java | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/gradle-5/build.gradle b/gradle-5/build.gradle index a40afb7024..84cf05bad6 100644 --- a/gradle-5/build.gradle +++ b/gradle-5/build.gradle @@ -5,11 +5,11 @@ plugins{ description = "Gradle 5 root project" allprojects { apply plugin :"java" - // apply plugin :"nebula.lint" - // gradleLint { - // rules=['unused-dependency'] - // reportFormat = 'text' - // } + apply plugin :"nebula.lint" + gradleLint { + rules=['unused-dependency'] + reportFormat = 'text' + } group = "com.baeldung" version = "0.0.1" sourceCompatibility = "1.8" diff --git a/gradle-5/gradle/wrapper/gradle-wrapper.properties b/gradle-5/gradle/wrapper/gradle-wrapper.properties index 0b7ed8da04..4c46317507 100644 --- a/gradle-5/gradle/wrapper/gradle-wrapper.properties +++ b/gradle-5/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip diff --git a/gradle-5/source-sets/build.gradle b/gradle-5/source-sets/build.gradle index d7d3f18df3..8325450cfd 100644 --- a/gradle-5/source-sets/build.gradle +++ b/gradle-5/source-sets/build.gradle @@ -1,5 +1,5 @@ -// apply plugin: "eclipse" +apply plugin: "eclipse" apply plugin: "java" description = "Source Sets example" @@ -60,9 +60,8 @@ configurations { itestRuntimeOnly.extendsFrom(testRuntimeOnly) } - -// eclipse { -// classpath { -// plusConfigurations+=[configurations.itestCompileClasspath] -// } -// } \ No newline at end of file +eclipse { + classpath { + plusConfigurations+=[configurations.itestCompileClasspath] + } +} \ No newline at end of file diff --git a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java index fea54574d6..59529f94ae 100644 --- a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java +++ b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java @@ -13,19 +13,19 @@ import com.google.common.collect.ImmutableList; public class SourceSetsItest { @Test - public void whenRunThenSuccess() { - + public void whenRun_ThenSuccess() { + SourceSetsObject underTest = new SourceSetsObject("lorem", "ipsum"); - + assertThat(underTest.getUser(), is("lorem")); assertThat(underTest.getPassword(), is("ipsum")); } @Test - public void givenImmutableListwhenRunThenSuccess() { - + public void givenImmutableList_whenRun_ThenSuccess() { + List someStrings = ImmutableList.of("Baeldung", "is", "cool"); - + assertThat(someStrings.size(), is(3)); } } diff --git a/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java b/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java index 4891ffd694..b033eb8e52 100644 --- a/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java +++ b/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java @@ -10,10 +10,10 @@ import com.baeldung.main.SourceSetsObject; public class SourceSetsTest { @Test - public void whenRunThenSuccess() { - - SourceSetsObject underTest = new SourceSetsObject("lorem","ipsum"); - + public void whenRun_ThenSuccess() { + + SourceSetsObject underTest = new SourceSetsObject("lorem", "ipsum"); + assertThat(underTest.getUser(), is("lorem")); assertThat(underTest.getPassword(), is("ipsum")); } From 8a3ac41907c4d7e2807da88dc9cd2d00a6f63759 Mon Sep 17 00:00:00 2001 From: Sorin Zamfir Date: Sun, 23 Aug 2020 00:03:45 +0300 Subject: [PATCH 6/6] BAEL-4516: Fix itest sample --- .../itest/java/com/baeldung/itest/SourceSetsItest.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java index 59529f94ae..3312c5b6e5 100644 --- a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java +++ b/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java @@ -13,19 +13,13 @@ import com.google.common.collect.ImmutableList; public class SourceSetsItest { @Test - public void whenRun_ThenSuccess() { + public void givenImmutableList_whenRun_ThenSuccess() { SourceSetsObject underTest = new SourceSetsObject("lorem", "ipsum"); + List someStrings = ImmutableList.of("Baeldung", "is", "cool"); assertThat(underTest.getUser(), is("lorem")); assertThat(underTest.getPassword(), is("ipsum")); - } - - @Test - public void givenImmutableList_whenRun_ThenSuccess() { - - List someStrings = ImmutableList.of("Baeldung", "is", "cool"); - assertThat(someStrings.size(), is(3)); } }