Merge pull request #411 from madvay/systemTestsBeachHead

Multi-project system test.

systemTests/multiProject1/base/build.gradle

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'java'
+apply plugin: 'com.github.j2objccontrib.j2objcgradle'
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    // Intentionally testing e2e use of a built-in j2objc library, Guava.
+    compile 'com.google.guava:guava:17.0'
+    testCompile 'junit:junit:4.12'
+}
+
+j2objcConfig {
+    finalConfigure()
+}

systemTests/multiProject1/base/src/main/java/com/example/Cube.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example;
+
+import com.google.common.base.Joiner;
+
+public class Cube {
+
+    protected final int dimension;
+
+    public Cube(int dimension) {
+        this.dimension = dimension;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[Cube %d]", dimension);
+    }
+
+    public String exerciseGuava() {
+        return Joiner.on(' ').join('a', 'b', 'c');
+    }
+}

systemTests/multiProject1/base/src/test/java/com/example/CubeTest.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CubeTest {
+
+    @Test
+    public void testToString() {
+        Assert.assertEquals("[Cube 7]", new Cube(7).toString());
+    }
+
+    @Test
+    public void testExerciseGuava() {
+        Assert.assertEquals("a b c", new Cube(7).exerciseGuava());
+    }
+}

systemTests/multiProject1/build.gradle

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        // This is the build output of the plugin itself.
+        classpath fileTree(dir: '../../build/libs', include: ['*.jar'])
+    }
+}
+
+allprojects {
+    apply plugin: 'java'
+    test {
+        testLogging {
+            // Provide full exception info on failure, instead
+            // of just pointing to an HTML file.
+            exceptionFormat = 'full'
+        }
+    }
+}

systemTests/multiProject1/extended/build.gradle

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'java'
+apply plugin: 'com.github.j2objccontrib.j2objcgradle'
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    compile project(':base')
+    // Intentionally testing e2e use of a built-in j2objc library, Guava.
+    compile 'com.google.guava:guava:17.0'
+    testCompile 'junit:junit:4.12'
+}
+
+j2objcConfig {
+    dependsOnJ2objcLib project(':base')
+
+    finalConfigure()
+}

systemTests/multiProject1/extended/src/main/java/com/example/ExtendedCube.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example;
+
+import java.lang.Override;
+
+import com.google.common.base.Joiner;
+
+public class ExtendedCube extends Cube {
+
+    public ExtendedCube(int dimension) {
+        super(dimension);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[ExtendedCube %d]", dimension);
+    }
+
+    @Override
+    public String exerciseGuava() {
+        return Joiner.on(';').join('a', 'b', 'c');
+    }
+}

systemTests/multiProject1/extended/src/test/java/com/example/ExtendedCubeTest.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ExtendedCubeTest {
+
+    @Test
+    public void testToString() {
+        Assert.assertEquals("[ExtendedCube 7]", new ExtendedCube(7).toString());
+    }
+
+    @Test
+    public void testExerciseGuava() {
+        Assert.assertEquals("a;b;c", new ExtendedCube(7).exerciseGuava());
+    }
+}

systemTests/multiProject1/gradlew

@@ -0,0 +1 @@
+../../gradlew

systemTests/multiProject1/local.properties

@@ -0,0 +1 @@
+../common/local.properties

systemTests/multiProject1/settings.gradle

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+include ':base', ':extended'

systemTests/run-all.sh

@@ -17,5 +17,22 @@
 # Fail if anything fails.
 set -e
 
-echo Running test simple1
-pushd simple1 && ./gradlew wrapper && ./gradlew clean && ./gradlew build && popd
+function runTest {
+    TEST_DIR=$1
+    echo Running test $TEST_DIR
+    set -e
+    pushd $TEST_DIR
+    ./gradlew wrapper
+    ./gradlew clean
+    ./gradlew build
+    popd
+}
+
+# TODO: Might want to infer the directories that have build.gradle files in them.
+
+# Simplest possible set-up.  A single project with no dependencies.
+runTest simple1
+
+# Two gradle projects, `extended` depends on `base`.  They also both test
+# dependency on built-in j2objc libraries, like Guava.
+runTest multiProject1