From f2f739913afdd02c1229a3a0c9b010039a2ef189 Mon Sep 17 00:00:00 2001 From: Miguel Aranda Date: Wed, 7 Jan 2026 10:48:21 +0000 Subject: [PATCH 1/2] Add change markers for ease of syncing in HttpsUrlConnectionTest --- .../org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java b/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java index da68612fe..2d3031c53 100644 --- a/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java +++ b/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +// g3-add: import static org.junit.Assume.assumeFalse; import static org.junit.Assert.fail; import java.io.IOException; @@ -28,6 +29,7 @@ import java.net.SocketException; import java.net.SocketTimeoutException; import java.net.URL; +// g3-add: import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; From d812642ec41ca7deb841009fb52a7976f22ee607 Mon Sep 17 00:00:00 2001 From: Miguel Aranda Date: Wed, 7 Jan 2026 10:52:29 +0000 Subject: [PATCH 2/2] Fix import ordering --- .../javax/net/ssl/HttpsURLConnectionTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java b/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java index 2d3031c53..2dbb056ce 100644 --- a/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java +++ b/common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java @@ -23,6 +23,13 @@ // g3-add: import static org.junit.Assume.assumeFalse; import static org.junit.Assert.fail; +import org.conscrypt.TestUtils; +import org.conscrypt.VeryBasicHttpServer; +import org.junit.After; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import java.io.IOException; import java.net.InetAddress; import java.net.Socket; @@ -34,16 +41,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; + import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; -import org.conscrypt.TestUtils; -import org.conscrypt.VeryBasicHttpServer; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class HttpsURLConnectionTest {