This repository has been archived by the owner on Dec 12, 2024. It is now read-only.
Issue #8 - alternate /tests/ setup for 100% maven #45
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>com.google.cloud.runtimes.jetty.tests</groupId> | ||
| <artifactId>tests-parent</artifactId> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>gcloud-testing-core</artifactId> | ||
| <name>Jetty-Runtime :: Testing Core Lib</name> | ||
| <packaging>jar</packaging> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <configuration> | ||
| <source>1.8</source> | ||
| <target>1.8</target> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.yaml</groupId> | ||
| <artifactId>snakeyaml</artifactId> | ||
| <version>1.17</version> | ||
| </dependency> | ||
| <!-- | ||
| <dependency> | ||
| <groupId>com.google.cloud</groupId> | ||
| <artifactId>google-cloud-logging</artifactId> | ||
| <version>0.3.0</version> | ||
| </dependency> | ||
| --> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty.toolchain</groupId> | ||
| <artifactId>jetty-test-helper</artifactId> | ||
| <version>4.0</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.google.cloud.runtime.jetty.testing; | ||
|
|
||
| import org.eclipse.jetty.toolchain.test.MavenTestingUtils; | ||
| import org.yaml.snakeyaml.Yaml; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| public final class AppDeployment { | ||
|
There was a problem hiding this comment. Some javadoc comments please on what this class is doing. There was a problem hiding this comment. |
||
| public static final String PROJECT_ID; | ||
| public static final String VERSION_ID; | ||
| public static final String MODULE_ID; | ||
| public static final URI SERVER_URI; | ||
|
|
||
| static { | ||
| String projectId = System.getProperty("app.deploy.project"); | ||
| String version = System.getProperty("app.deploy.version"); | ||
|
|
||
| Objects.requireNonNull(projectId, "app.deploy.project"); | ||
| Objects.requireNonNull(version, "app.deploy.version"); | ||
|
|
||
| PROJECT_ID = projectId; | ||
| VERSION_ID = version; | ||
|
|
||
| String moduleId = null; | ||
|
|
||
| Path appYamlPath = MavenTestingUtils.getProjectFilePath("src/main/appengine/app.yaml"); | ||
| if (Files.exists(appYamlPath)) { | ||
| try (BufferedReader reader = Files.newBufferedReader(appYamlPath, StandardCharsets.UTF_8)) { | ||
| Yaml yaml = new Yaml(); | ||
| Map map = (Map) yaml.load(reader); | ||
| moduleId = (String) map.get("module"); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException("Unable to parse app.yaml", e); | ||
| } | ||
| } | ||
|
|
||
| MODULE_ID = moduleId; | ||
|
|
||
| StringBuilder uri = new StringBuilder(); | ||
| uri.append("https://"); | ||
| uri.append(version).append("-dot-"); | ||
| if (moduleId != null) { | ||
| uri.append(moduleId).append("-dot-"); | ||
| } | ||
| uri.append(projectId); | ||
| uri.append(".appspot.com/"); | ||
|
|
||
| SERVER_URI = URI.create(uri.toString()); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.google.cloud.runtime.jetty.testing; | ||
|
|
||
| import org.eclipse.jetty.toolchain.test.IO; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.io.StringWriter; | ||
| import java.net.HttpURLConnection; | ||
| import java.net.URI; | ||
| import java.nio.charset.Charset; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| public final class HttpURLUtil { | ||
|
There was a problem hiding this comment. Its specifically designed for the However, I filed it as Issue #49 |
||
| /** | ||
| * Open a new {@link HttpURLConnection} to the provided URI. | ||
| * | ||
| * <p> | ||
| * Note: will also set the 'User-Agent' to {@code jetty-runtime/gcloud-testing-core} | ||
| * </p> | ||
| * | ||
| * @param uri the URI to open to | ||
| * @return the open HttpURLConnection | ||
| * @throws IOException if unable to open the connection | ||
| */ | ||
| public static HttpURLConnection openTo(URI uri) throws IOException { | ||
| HttpURLConnection http = (HttpURLConnection) uri.toURL().openConnection(); | ||
| http.setRequestProperty("User-Agent", "jetty-runtime/gcloud-testing-core"); | ||
| return http; | ||
| } | ||
|
|
||
| /** | ||
| * Obtain the text (non-binary) response body from an {@link HttpURLConnection}, | ||
| * using the response provided charset. | ||
| * | ||
| * <p> | ||
| * Note: Normal HttpURLConnection doesn't use the provided charset properly. | ||
| * </p> | ||
| * | ||
| * @param http the {@link HttpURLConnection} to obtain the response body from | ||
| * @return the text of the response body | ||
| * @throws IOException if unable to get the text of the response body | ||
| */ | ||
| public static String getResponseBody(HttpURLConnection http) throws IOException { | ||
| Charset responseEncoding = StandardCharsets.UTF_8; | ||
| if (http.getContentEncoding() != null) { | ||
| responseEncoding = Charset.forName(http.getContentEncoding()); | ||
| } | ||
|
|
||
| try (InputStream in = http.getInputStream(); | ||
| InputStreamReader reader = new InputStreamReader(in, responseEncoding); | ||
| StringWriter writer = new StringWriter()) { | ||
| IO.copy(reader, writer); | ||
| return writer.toString(); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package com.google.cloud.runtime.jetty.testing; | ||
|
|
||
| import org.eclipse.jetty.toolchain.test.IO; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.OutputStream; | ||
| import java.util.Arrays; | ||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
| import java.util.concurrent.Future; | ||
|
|
||
| /** | ||
| * Utilities for executing and collecting output from command line processes. | ||
| */ | ||
| public final class ProcessUtil { | ||
| private static final ExecutorService executor = Executors.newFixedThreadPool(5); | ||
|
|
||
| /** | ||
| * Execute a command line. | ||
| * <p> | ||
| * Report output from command line to Writer | ||
| * </p> | ||
| * | ||
| * @param output where to put the output from the execution of the command line | ||
| * @param args the command line arguments | ||
| * @return the exit code from the execution | ||
| */ | ||
| public static int exec(OutputStream output, String... args) | ||
| throws IOException, InterruptedException, ExecutionException { | ||
| System.out.printf("exec(%s)%n", Arrays.toString(args)); | ||
| Process process = Runtime.getRuntime().exec(args); | ||
|
|
||
| InputStream in = process.getInputStream(); | ||
|
|
||
| Future<Void> fut = executor.submit(new Callable<Void>() { | ||
| @Override | ||
| public Void call() throws Exception { | ||
| IO.copy(in, output); | ||
| return null; | ||
| } | ||
| }); | ||
|
|
||
| fut.get(); | ||
|
|
||
| return process.waitFor(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this push to GCR should be moved to a different profile or deploy phase.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is important for the
jetty9:testingtag, as used by the various docker images int he test webapps.