Skip to content

[BEAM-83] Move Java 8 tests to their own module #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kennknowles wants to merge 2 commits into from
Closed

[BEAM-83] Move Java 8 tests to their own module #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fab1a6a
Move Java 8 tests to their own module
kennknowles Mar 1, 2016
e621bc8
FIXUP: add profile control for Java 8 module
kennknowles Mar 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 183 additions & 0 deletions java8tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Copyright (C) 2015 Google Inc.
~
~ 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.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>

<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-java8tests-all</artifactId>
<name>Google Cloud Dataflow Java 8 Tests - All</name>
<description>Google Cloud Dataflow Java SDK provides a simple, Java-based
interface for processing virtually any size data using Google cloud
resources. This artifact includes tests of the SDK from a Java 8
user.</description>
<url>http://cloud.google.com/dataflow</url>

<packaging>jar</packaging>

<profiles>
<profile>
<id>DataflowPipelineTests</id>
<properties>
<runIntegrationTestOnService>true</runIntegrationTestOnService>
<testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
<testParallelValue>both</testParallelValue>
</properties>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals><goal>analyze-only</goal></goals>
<configuration>
<failOnWarning>true</failOnWarning>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.12</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.6</version>
</dependency>
</dependencies>
<configuration>
<configLocation>../checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeResources>false</includeResources>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Source plugin for generating source and test-source JARs. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>attach-test-sources</id>
<phase>test-compile</phase>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>default-test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Coverage analysis for unit tests. -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda.version}</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
0 ...flow/sdk/transforms/CombineJava8Test.java → ...flow/sdk/transforms/CombineJava8Test.java
View file
Open in desktop
File renamed without changes.
0 ...aflow/sdk/transforms/FilterJava8Test.java → ...aflow/sdk/transforms/FilterJava8Test.java
View file
Open in desktop
File renamed without changes.
0 .../transforms/FlatMapElementsJava8Test.java → .../transforms/FlatMapElementsJava8Test.java
View file
Open in desktop
File renamed without changes.
0 .../sdk/transforms/MapElementsJava8Test.java → .../sdk/transforms/MapElementsJava8Test.java
View file
Open in desktop
File renamed without changes.
0 ...ow/sdk/transforms/PartitionJava8Test.java → ...ow/sdk/transforms/PartitionJava8Test.java
View file
Open in desktop
File renamed without changes.
0 ...transforms/RemoveDuplicatesJava8Test.java → ...transforms/RemoveDuplicatesJava8Test.java
View file
Open in desktop
File renamed without changes.
0 ...low/sdk/transforms/WithKeysJava8Test.java → ...low/sdk/transforms/WithKeysJava8Test.java
View file
Open in desktop
File renamed without changes.
0 ...k/transforms/WithTimestampsJava8Test.java → ...k/transforms/WithTimestampsJava8Test.java
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@
</modules>

<profiles>
<profile>
<id>java8-tests</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<modules>
<module>java8tests</module>
</modules>
</profile>
<profile>
<id>doclint-java8-disable</id>
<activation>
Expand Down
71 changes: 0 additions & 71 deletions sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,77 +54,6 @@
<testParallelValue>both</testParallelValue>
</properties>
</profile>

<profile>
<id>java8tests</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>

<build>
<plugins>
<!-- Tells Maven about the Java 8 test source root. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-java8-test-source</id>
<phase>initialize</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.basedir}/src/test/java8</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<!-- Set `-source 1.8 -target 1.8` for Java 8 tests
and `-source 1.7 -target 1.7` for Java 7 tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<testSource>1.7</testSource>
<testTarget>1.7</testTarget>
<testExcludes>
<!-- This pattern is brittle; we would prefer to filter on the directory
but that seems to be unavailable to us. -->
<exclude>**/*Java8Test.java</exclude>
</testExcludes>
</configuration>
</execution>

<execution>
<id>java8-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
<testIncludes>
<include>**/*Java8Test.java</include>
</testIncludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
Expand Down