Skip to content
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

Jump to bottom

Move gRPC integration tests to correct location #1621

Merged
merged 5 commits into from
Apr 8, 2020
Merged

Move gRPC integration tests to correct location #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e59089e
move gRPC integration tests to correct location
tmiddlet2666 Apr 7, 2020
7cbc0a8
fixup some static imports
tmiddlet2666 Apr 7, 2020
125228c
further static import fixes
tmiddlet2666 Apr 7, 2020
27b589e
final static import fixes
tmiddlet2666 Apr 7, 2020
3d88d6d
update copyright
tmiddlet2666 Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 0 additions & 41 deletions microprofile/grpc/metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,46 +85,5 @@
<version>${version.plugin.os}</version>
</extension>
</extensions>

<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-compile</goal>
<goal>test-compile-custom</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
<executions>
<execution>
<id>verify</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
26 changes: 0 additions & 26 deletions microprofile/grpc/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,32 +112,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
<executions>
<execution>
<id>verify</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
128 changes: 128 additions & 0 deletions tests/integration/mp-grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2020 Oracle and/or its affiliates.

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>io.helidon.tests.integration</groupId>
<artifactId>helidon-tests-integration</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>helidon-tests-integration-mp-grpc</artifactId>
<name>Helidon Integration Test MP gRPC</name>

<dependencies>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>
<artifactId>helidon-microprofile-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.config</groupId>
<artifactId>helidon-microprofile-config</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.server</groupId>
<artifactId>helidon-microprofile-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.metrics</groupId>
<artifactId>helidon-microprofile-metrics</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>
<artifactId>internal-test-libs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.grpc</groupId>
<artifactId>helidon-microprofile-grpc-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.grpc</groupId>
<artifactId>helidon-microprofile-grpc-metrics</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- redirecting Weld logging to JUL logging -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>${version.plugin.os}</version>
</extension>
</extensions>

<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-compile</goal>
<goal>test-compile-custom</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
5 changes: 3 additions & 2 deletions ...ile/grpc/metrics/MetricsConfigurerIT.java → ...e/grpc/metrics/MetricsConfigurerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2020 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,6 +35,7 @@
import org.eclipse.microprofile.metrics.annotation.Counted;
import org.eclipse.microprofile.metrics.annotation.Metered;
import org.eclipse.microprofile.metrics.annotation.Timed;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

Expand All @@ -45,7 +46,7 @@
import static org.hamcrest.collection.IsEmptyIterable.emptyIterable;


public class MetricsConfigurerIT {
public class MetricsConfigurerTest {

private static MetricRegistry registry;

Expand Down
18 changes: 9 additions & 9 deletions .../microprofile/grpc/metrics/MetricsIT.java → ...icroprofile/grpc/metrics/MetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2020 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -62,8 +62,8 @@
* microprofile metrics annotations so they should automatically generate the correct metrics.
*/
@Disabled
public class MetricsIT {
private static final Logger LOGGER = Logger.getLogger(MetricsIT.class.getName());
public class MetricsTest {
private static final Logger LOGGER = Logger.getLogger(MetricsTest.class.getName());

private static Server server;

Expand All @@ -73,13 +73,13 @@ public class MetricsIT {

private static Channel channel;

private static StringServiceGrpc.StringServiceBlockingStub sringStub;
private static StringServiceGrpc.StringServiceBlockingStub stringStub;

private static Instance<Object> instance;

@BeforeAll
public static void startServer() throws Exception {
LogManager.getLogManager().readConfiguration(MetricsIT.class.getResourceAsStream("/logging.properties"));
LogManager.getLogManager().readConfiguration(MetricsTest.class.getResourceAsStream("/logging.properties"));

server = Server.create().start();
beanManager = CDI.current().getBeanManager();
Expand All @@ -97,7 +97,7 @@ public static void startServer() throws Exception {
.usePlaintext()
.build();

sringStub = StringServiceGrpc.newBlockingStub(channel);
stringStub = StringServiceGrpc.newBlockingStub(channel);
}

@AfterAll
Expand All @@ -116,7 +116,7 @@ public void shouldHaveCounterMetric() {
int count = json.getInt(StringService.class.getName() + ".upper");

assertThat(count, is(0));
sringStub.upper(StringMessage.newBuilder().setText("foo").build());
stringStub.upper(StringMessage.newBuilder().setText("foo").build());

json = getMetrics();
count = json.getInt(StringService.class.getName() + ".upper");
Expand All @@ -140,7 +140,7 @@ public void shouldHaveMeterMetric() {
assertThat(meanRate, is(notNullValue()));
assertThat(meanRate.doubleValue(), is(0.0));

sringStub.lower(StringMessage.newBuilder().setText("FOO").build());
stringStub.lower(StringMessage.newBuilder().setText("FOO").build());

json = getMetrics();
meter = json.getJsonObject(StringService.class.getName() + ".lower");
Expand Down Expand Up @@ -171,7 +171,7 @@ public void shouldHaveTimerMetric() {
assertThat(count, is(0));
assertThat(min, is(0));

Iterator<StringMessage> iterator = sringStub.split(StringMessage.newBuilder().setText("A B C").build());
Iterator<StringMessage> iterator = stringStub.split(StringMessage.newBuilder().setText("A B C").build());
while (iterator.hasNext()) {
iterator.next();
}
Expand Down