split tests from inttests, won't run on travis (no credentials for th…

…e bitly api)
stackmagic · Jun 23, 2015 · 664c954 · 664c954
1 parent ab012ef
commit 664c954
Show file tree

Hide file tree

Showing 29 changed files with 26 additions and 0 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,18 @@ version     = '0.8.0'
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
+// extra configuration for integration tests
+configurations {
+	intTestCompile
+}
+
+sourceSets {
+	intTest {
+		compileClasspath = sourceSets.main.output + configurations.testRuntime
+		runtimeClasspath = sourceSets.main.output + configurations.testRuntime + output
+	}
+}
+
 // normal repositories and dependencies
 repositories {
 	jcenter()
@@ -34,6 +46,11 @@ dependencies {
 	testCompile 'org.slf4j:jcl-over-slf4j:1.7.12'
 	testCompile 'ch.qos.logback:logback-classic:1.1.3'
 	testCompile 'org.testng:testng:6.8.8'
+
+	// integration testing
+	intTestCompile 'org.slf4j:jcl-over-slf4j:1.7.12'
+	intTestCompile 'ch.qos.logback:logback-classic:1.1.3'
+	intTestCompile 'org.testng:testng:6.8.8'
 }
 
 // testing
@@ -94,3 +111,12 @@ bintray {
 		}
 	}
 }
+
+task('intTest', type: Test, dependsOn: 'intTestClasses') {
+	useTestNG()
+	testLogging.showStandardStreams = true
+	group          = 'verification'
+	testSrcDirs    = sourceSets.intTest.java.srcDirs as List
+	testClassesDir = sourceSets.intTest.output.classesDir
+	classpath      = sourceSets.intTest.runtimeClasspath
+}
diff --git a/...t/AbstractBitlyClientIntegrationTest.java → ...t/AbstractBitlyClientIntegrationTest.java b/...t/AbstractBitlyClientIntegrationTest.java → ...t/AbstractBitlyClientIntegrationTest.java
diff --git a/...ech/bitly/test/ExpandIntegrationTest.java → ...ech/bitly/test/ExpandIntegrationTest.java b/...ech/bitly/test/ExpandIntegrationTest.java → ...ech/bitly/test/ExpandIntegrationTest.java
diff --git a/...stech/bitly/test/InfoIntegrationTest.java → ...stech/bitly/test/InfoIntegrationTest.java b/...stech/bitly/test/InfoIntegrationTest.java → ...stech/bitly/test/InfoIntegrationTest.java
diff --git a/...bitly/test/LinkClicksIntegrationTest.java → ...bitly/test/LinkClicksIntegrationTest.java b/...bitly/test/LinkClicksIntegrationTest.java → ...bitly/test/LinkClicksIntegrationTest.java
diff --git a/...ly/test/LinkCountriesIntegrationTest.java → ...ly/test/LinkCountriesIntegrationTest.java b/...ly/test/LinkCountriesIntegrationTest.java → ...ly/test/LinkCountriesIntegrationTest.java
diff --git a/...est/LinkEncodersCountIntegrationTest.java → ...est/LinkEncodersCountIntegrationTest.java b/...est/LinkEncodersCountIntegrationTest.java → ...est/LinkEncodersCountIntegrationTest.java
diff --git a/...h/bitly/test/LinkInfoIntegrationTest.java → ...h/bitly/test/LinkInfoIntegrationTest.java b/...h/bitly/test/LinkInfoIntegrationTest.java → ...h/bitly/test/LinkInfoIntegrationTest.java
diff --git a/...bitly/test/LinkLookupIntegrationTest.java → ...bitly/test/LinkLookupIntegrationTest.java b/...bitly/test/LinkLookupIntegrationTest.java → ...bitly/test/LinkLookupIntegrationTest.java
diff --git a/...ly/test/LinkReferrersIntegrationTest.java → ...ly/test/LinkReferrersIntegrationTest.java b/...ly/test/LinkReferrersIntegrationTest.java → ...ly/test/LinkReferrersIntegrationTest.java
diff --git a/.../LinkReferringDomainsIntegrationTest.java → .../LinkReferringDomainsIntegrationTest.java b/.../LinkReferringDomainsIntegrationTest.java → .../LinkReferringDomainsIntegrationTest.java
diff --git a/...ch/bitly/test/ShortenIntegrationTest.java → ...ch/bitly/test/ShortenIntegrationTest.java b/...ch/bitly/test/ShortenIntegrationTest.java → ...ch/bitly/test/ShortenIntegrationTest.java
diff --git a/...bitly/test/UserClicksIntegrationTest.java → ...bitly/test/UserClicksIntegrationTest.java b/...bitly/test/UserClicksIntegrationTest.java → ...bitly/test/UserClicksIntegrationTest.java
diff --git a/...ly/test/UserCountriesIntegrationTest.java → ...ly/test/UserCountriesIntegrationTest.java b/...ly/test/UserCountriesIntegrationTest.java → ...ly/test/UserCountriesIntegrationTest.java
diff --git a/...h/bitly/test/UserInfoIntegrationTest.java → ...h/bitly/test/UserInfoIntegrationTest.java b/...h/bitly/test/UserInfoIntegrationTest.java → ...h/bitly/test/UserInfoIntegrationTest.java
diff --git a/...tly/test/UserLinkEditIntegrationTest.java → ...tly/test/UserLinkEditIntegrationTest.java b/...tly/test/UserLinkEditIntegrationTest.java → ...tly/test/UserLinkEditIntegrationTest.java
diff --git a/.../test/UserLinkHistoryIntegrationTest.java → .../test/UserLinkHistoryIntegrationTest.java b/.../test/UserLinkHistoryIntegrationTest.java → .../test/UserLinkHistoryIntegrationTest.java
diff --git a/...y/test/UserLinkLookupIntegrationTest.java → ...y/test/UserLinkLookupIntegrationTest.java b/...y/test/UserLinkLookupIntegrationTest.java → ...y/test/UserLinkLookupIntegrationTest.java
diff --git a/...tly/test/UserLinkSaveIntegrationTest.java → ...tly/test/UserLinkSaveIntegrationTest.java b/...tly/test/UserLinkSaveIntegrationTest.java → ...tly/test/UserLinkSaveIntegrationTest.java
diff --git a/...st/UserNetworkHistoryIntegrationTest.java → ...st/UserNetworkHistoryIntegrationTest.java b/...st/UserNetworkHistoryIntegrationTest.java → ...st/UserNetworkHistoryIntegrationTest.java
diff --git a/...test/UserPopularLinksIntegrationTest.java → ...test/UserPopularLinksIntegrationTest.java b/...test/UserPopularLinksIntegrationTest.java → ...test/UserPopularLinksIntegrationTest.java
diff --git a/...ly/test/UserReferrersIntegrationTest.java → ...ly/test/UserReferrersIntegrationTest.java b/...ly/test/UserReferrersIntegrationTest.java → ...ly/test/UserReferrersIntegrationTest.java
diff --git a/.../UserReferringDomainsIntegrationTest.java → .../UserReferringDomainsIntegrationTest.java b/.../UserReferringDomainsIntegrationTest.java → .../UserReferringDomainsIntegrationTest.java
diff --git a/...est/UserShortenCountsIntegrationTest.java → ...est/UserShortenCountsIntegrationTest.java b/...est/UserShortenCountsIntegrationTest.java → ...est/UserShortenCountsIntegrationTest.java
diff --git a/...serTrackingDomainListIntegrationTest.java → ...serTrackingDomainListIntegrationTest.java b/...serTrackingDomainListIntegrationTest.java → ...serTrackingDomainListIntegrationTest.java
diff --git a/...tech/bitly/test/util/AccessTokenUtil.java → ...tech/bitly/test/util/AccessTokenUtil.java b/...tech/bitly/test/util/AccessTokenUtil.java → ...tech/bitly/test/util/AccessTokenUtil.java
diff --git a/...swisstech/bitly/test/util/AssertUtil.java → ...swisstech/bitly/test/util/AssertUtil.java b/...swisstech/bitly/test/util/AssertUtil.java → ...swisstech/bitly/test/util/AssertUtil.java
diff --git a/...t/swisstech/bitly/test/util/TestUtil.java → ...t/swisstech/bitly/test/util/TestUtil.java b/...t/swisstech/bitly/test/util/TestUtil.java → ...t/swisstech/bitly/test/util/TestUtil.java
diff --git a/src/test/resources/logback-test.xml → src/intTest/resources/logback-test.xml b/src/test/resources/logback-test.xml → src/intTest/resources/logback-test.xml