Merge branch 'develop' of https://github.com/Sybit-Education/airtable.java into develop

Author: stritti

.gitignore

@@ -13,6 +13,10 @@ hs_err_pid*
 build/
 .gradle/
 src/test/resources/credentials.properties
+src/itest/resources/credentials.properties
+.nb-gradle-properties
+.nb-gradle/
 
 # IDE
-.idea
+.idea
+src/itest/resources/credentials.properties

.nb-gradle-properties

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<gradle-project-properties>
+  <!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
+</gradle-project-properties>

.nb-gradle/private/cache/airtable.java-d41d8cd98f00b204e9800998ecf8427e

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<gradle-project-properties>
+  <!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
+  <auxiliary>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+      <group>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/build.gradle</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/test/java/com/sybit/airtable/CustomObjectMapperTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Thumbnail.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/itest/java/com/sybit/airtable/TableSelectTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/.travis.yml</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/Airtable.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Attachment.java</file>
+      </group>
+    </open-files>
+    <editor-bookmarks lastBookmarkId="0" xmlns="http://www.netbeans.org/ns/editor-bookmarks/2"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+      <group>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/.gitignore</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Thumbnail.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/itest/java/com/sybit/airtable/TableSelectTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/test/java/com/sybit/airtable/AirtableTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/Airtable.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Attachment.java</file>
+      </group>
+    </open-files>
+  </auxiliary>
+</gradle-project-properties>

.nb-gradle/profiles/private/aux-config

@@ -4,7 +4,9 @@ jdk:
 before_install:
 - chmod +x ./gradlew
 script:
-- "./gradlew check sendCoverageToCodacy"
+- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./gradlew check; fi'
+- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./gradlew test integrationTest; fi'
+- "./gradlew sendCoverageToCodacy"
 deploy:
 - provider: releases
   api_key:
@@ -17,7 +19,7 @@ deploy:
     tags: true
 - provider: script
   skip_cleanup: true
-  script: "./gradlew install bintrayUpload"
+  script: "./gradlew -i bintrayUpload"
   on:
     repo: Sybit-Education/airtable.java
     tags: true

.travis.yml

@@ -350,6 +350,10 @@ Short overview of features, which are supported:
 
 We are glad to see your pull requests. 
 
+We use Travis as our continous integration build. Because of Travis security reasons on a Pull Request only JUnit tests run. 
+The integration tests need a valid AIRTABLE_API_KEY which travis doesent provide on PR's from forked reposiorys.
+However the integration tests you wrote will run after the PR is confirmed and merged.
+
 ## Current status
 
 The current status of our project is maintained on our agile board:
@@ -366,8 +370,8 @@ We use [Gradle](https://gradle.org) to compile and package project:
 + build jar: `./gradlew jar` (The built JARs will be placed under `build/libs`.)
 
 ## Testing
-There are JUnit tests to verify the API.
-The tests are based on the Airtable template [Movies](https://airtable.com/templates/groups-clubs-and-hobbies/exprTnrH3YV8Vv9BI/favorite-movies) which could be created in your account.
+There are JUnit tests and integration tests to verify the API.
+The integration tests are based on the Airtable template [Movies](https://airtable.com/templates/groups-clubs-and-hobbies/exprTnrH3YV8Vv9BI/favorite-movies) which could be created in your account.
 For testing, the JSON-responses are mocked by [WireMock](http://wiremock.org/). 
 
 # Other Airtable Projects

README.md

@@ -24,21 +24,27 @@ def getVersionName = { ->
 
 buildscript {
     repositories {
+        mavenLocal()
         jcenter()
    }
 
-    dependencies {
-        classpath 'com.palantir:jacoco-coverage:0.4.0'
-        classpath "com.smokejumperit.gradle.license:Gradle-License-Report:0.0.2"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-	}
+   dependencies {
+       classpath 'com.palantir:jacoco-coverage:0.4.0'
+       classpath "com.smokejumperit.gradle.license:Gradle-License-Report:0.0.2"
+       classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+   }
 }
 
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'com.palantir.jacoco-coverage'
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
+allprojects {
+    repositories {
+        jcenter()
+    }
+    apply plugin: 'java'
+    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
+    apply plugin: 'com.palantir.jacoco-coverage'
+    apply plugin: 'com.jfrog.bintray'
+}
 
 group = 'com.sybit'
 version = getVersionName()
@@ -51,7 +57,26 @@ tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
 }
 
+sourceSets {
+    integrationTest {
+        compileClasspath += main.output + test.output
+        runtimeClasspath += main.output + test.output
+        // You can add other directories to the classpath like this:
+        //runtimeClasspath += files('src/itest/resources/com/buransky')
+        // Use "java" if you don't use Scala as a programming language
+        java.srcDir file('src/itest/java')
+  }
+  // This is just to trick IntelliJ IDEA to add integration test
+  // resources to classpath when running integration tests from
+  // the IDE. It's is not a good solution but I don't know about
+  // a better one.
+  test {
+    resources.srcDir file('src/itest/resources')
+  }
+}
+
 repositories {
+    mavenLocal()
     jcenter()
     mavenCentral()
     maven { url "https://jitpack.io" }
@@ -60,6 +85,8 @@ repositories {
 
 configurations {
     codacy
+    integrationTestCompile.extendsFrom testCompile
+    integrationTestRuntime.extendsFrom testRuntime
 }
 
 dependencies {
@@ -95,6 +122,7 @@ artifacts {
     archives sourcesJar, javadocJar
 }
 
+//task to send coverage data to Codacy
 task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
     main = "com.codacy.CodacyCoverageReporter"
     classpath = configurations.codacy
@@ -106,28 +134,51 @@ task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
     ]
 }
 
+task integrationTest(type: Test) {
+  testClassesDir = sourceSets.integrationTest.output.classesDir
+  classpath = sourceSets.integrationTest.runtimeClasspath
+  // This is not needed, but I like to see which tests have run
+  testLogging {
+    events "passed", "skipped", "failed"
+  }
+}
+
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+
+        MyPublication(MavenPublication) {
+            //we have to change scope from runtime to compile. Especially for Gson-lib.
+            pom.withXml {
+                asNode().dependencies.'*'.findAll() {
+                    it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
+                        dep.name == it.artifactId.text()
+                    }
+                }.each { it.scope*.value = 'compile' }
+            }
+
             if (plugins.hasPlugin('war')) {
                 from components.web
             } else {
                 from components.java
             }
+            groupId group
+            artifactId rootProject.name
+            version getVersionName()
 
             artifact sourcesJar
             artifact javadocJar
         }
+
     }
 }
 
 bintray {
     user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
 
-    //publications = ['mavenJava']
-    configurations = ['archives']
+    publications = ['MyPublication']
+    //configurations = ['archives']
 
     dryRun = false //Whether to run this as dry-run, without deploying
     publish = true //If version should be auto published after an upload
@@ -144,3 +195,6 @@ bintray {
         }
     }
 }
+
+integrationTest.mustRunAfter test 
+

build.gradle

@@ -5,10 +5,13 @@
  */
 package com.sybit.airtable;
 
+
+import com.sybit.airtable.Base;
+import com.sybit.airtable.Table;
 import com.sybit.airtable.exception.AirtableException;
 import com.sybit.airtable.movies.Actor;
 import com.sybit.airtable.movies.Movie;
-import com.sybit.airtable.test.WireMockBaseTest;
+import com.sybit.airtable.mock.WireMockBaseTest;
 import com.sybit.airtable.vo.Attachment;
 import com.sybit.airtable.vo.Thumbnail;
 import java.util.List;

…m/sybit/airtable/TableConverterTest.java …m/sybit/airtable/TableConverterTest.javasrc/test/java/com/sybit/airtable/TableConverterTest.java renamed to src/itest/java/com/sybit/airtable/TableConverterTest.java src/test/java/com/sybit/airtable/TableConverterTest.java renamed to src/itest/java/com/sybit/airtable/TableConverterTest.java

@@ -5,10 +5,12 @@
  */
 package com.sybit.airtable;
 
+import com.sybit.airtable.Base;
+import com.sybit.airtable.Table;
 import com.sybit.airtable.exception.AirtableException;
 import com.sybit.airtable.movies.Actor;
 import com.sybit.airtable.movies.Movie;
-import com.sybit.airtable.test.WireMockBaseTest;
+import com.sybit.airtable.mock.WireMockBaseTest;
 import com.sybit.airtable.vo.Attachment;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;

…ybit/airtable/TableCreateRecordTest.java …ybit/airtable/TableCreateRecordTest.javasrc/test/java/com/sybit/airtable/TableCreateRecordTest.java renamed to src/itest/java/com/sybit/airtable/TableCreateRecordTest.java src/test/java/com/sybit/airtable/TableCreateRecordTest.java renamed to src/itest/java/com/sybit/airtable/TableCreateRecordTest.java

@@ -5,9 +5,11 @@
  */
 package com.sybit.airtable;
 
+import com.sybit.airtable.Base;
+import com.sybit.airtable.Table;
 import com.sybit.airtable.exception.AirtableException;
 import com.sybit.airtable.movies.Actor;
-import com.sybit.airtable.test.WireMockBaseTest;
+import com.sybit.airtable.mock.WireMockBaseTest;
 import java.util.List;
 import org.apache.http.client.HttpResponseException;
 import static org.junit.Assert.assertEquals;