Skip to content

Commit

Permalink
use copy of littleproxy
Browse files Browse the repository at this point in the history
  • Loading branch information
@timtay-microsoft
timtay-microsoft committed Apr 13, 2022
1 parent 9e4907d commit 95207e6
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 35 deletions.
39 changes: 30 additions & 9 deletions iot-e2e-tests/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,44 @@
<artifactId>jmockit</artifactId>
<version>1.24</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.littleshoot/littleproxy -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
<!-- Only required when running as a standalone jar -->
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
<version>1.1.2</version>
<artifactId>dnssec4j</artifactId>
<version>0.1.6</version>
<optional>true</optional>
<exclusions>
<!--Littleproxy is Android compatible except for this dependency. Luckily, we don't need this dependency for our tests-->
<exclusion>
<groupId>com.barchart.udt</groupId>
<artifactId>barchart-udt-bundle</artifactId>
<groupId>org.littleshoot</groupId>
<artifactId>dnsjava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<groupId>com.barchart.udt</groupId>
<artifactId>barchart-udt-bundle</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<!--
This newer Azure storage SDK has some compatibility issues with Android. Leaving this dependency alone
Expand Down
9 changes: 5 additions & 4 deletions ...ava/tests/integration/com/microsoft/azure/sdk/iot/digitaltwin/DigitalTwinClientTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@
import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.littleshoot.proxy.HttpProxyServer;
import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import tests.integration.com.microsoft.azure.sdk.iot.digitaltwin.helpers.E2ETestConstants;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.BasicProxyAuthenticator;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.IntegrationTest;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.SasTokenTools;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.Tools;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.annotations.DigitalTwinTest;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.annotations.StandardTierHubOnlyTest;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.proxy.HttpProxyServer;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.proxy.impl.DefaultHttpProxyServer;

import java.io.IOException;
import java.net.InetSocketAddress;
Expand Down Expand Up @@ -144,8 +145,8 @@ private DeviceClient createDeviceClient(IotHubClientProtocol protocol, String mo
public static void startProxy()
{
proxyServer = DefaultHttpProxyServer.bootstrap()
.withPort(testProxyPort)
.start();
.withPort(testProxyPort)
.start();
}

@AfterClass
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/tests/integration/com/microsoft/azure/sdk/iot/helpers/BasicProxyAuthenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package tests.integration.com.microsoft.azure.sdk.iot.helpers;

import org.littleshoot.proxy.ProxyAuthenticator;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.proxy.ProxyAuthenticator;

public class BasicProxyAuthenticator implements ProxyAuthenticator
{
Expand Down
19 changes: 3 additions & 16 deletions ...t/java/tests/integration/com/microsoft/azure/sdk/iot/iothub/setup/SendMessagesCommon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,9 @@
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.runners.Parameterized;
import org.littleshoot.proxy.HttpProxyServer;
import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.BasicProxyAuthenticator;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.ClientType;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.DeviceConnectionString;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.ErrorInjectionHelper;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.EventCallback;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.IntegrationTest;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.MessageAndResult;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.SSLContextBuilder;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.SasTokenProviderImpl;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.Success;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.TestConstants;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.TestDeviceIdentity;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.TestIdentity;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.Tools;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.*;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.proxy.HttpProxyServer;
import tests.integration.com.microsoft.azure.sdk.iot.helpers.proxy.impl.DefaultHttpProxyServer;

import javax.net.ssl.SSLContext;
import java.io.IOException;
Expand Down
15 changes: 10 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,27 +114,27 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.73.Final</version>
<version>4.1.74.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.73.Final</version>
<version>4.1.74.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.73.Final</version>
<version>4.1.74.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.73.Final</version>
<version>4.1.74.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.73.Final</version>
<version>4.1.74.Final</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down Expand Up @@ -166,6 +166,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.0-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
Expand Down

0 comments on commit 95207e6

Please sign in to comment.