Fix Android test gate

iot-e2e-tests/android/.gitignore

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

iot-e2e-tests/android/app/.gitignore

@@ -0,0 +1 @@
+/build

iot-e2e-tests/android/app/build.gradle

@@ -1,4 +1,6 @@
-apply plugin: 'com.android.application'
+plugins {
+    alias(libs.plugins.android.application)
+}
 
 //***********************************************************************************************//
 def IOTHUB_CONNECTION_STRING_ENV_VAR_NAME = project.hasProperty('IOTHUB_CONNECTION_STRING') ? '"'+project.property('IOTHUB_CONNECTION_STRING')+'"' : '""'
@@ -13,68 +15,45 @@ def RECYCLE_TEST_IDENTITIES = project.hasProperty('RECYCLE_TEST_IDENTITIES') ? '
 def STRING='String'
 //***********************************************************************************************//
 
-android {
-    compileSdkVersion 28
+android.buildFeatures.buildConfig = true
 
+android {
+    namespace 'com.microsoft.azure.sdk.iot.androidtest'
+    compileSdk {
+        version = release(36)
+    }
+
     defaultConfig {
-        javaCompileOptions.annotationProcessorOptions.includeCompileClasspath true
-        applicationId "com.iothub.azure.microsoft.com.androide2e"
-        minSdkVersion 24
-        targetSdkVersion 28
+        applicationId "com.microsoft.azure.sdk.iot.androidtest"
+        minSdkVersion 26
+        targetSdk 28
         multiDexEnabled true
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        //********** We can define variables here **********
-        each {
-            //buildTypes.mBuildConfigFields 'DATATYPE','VARIABLE',|"GRADLE VARIABLE|"'
-            buildConfigField STRING, 'IOTHUB_CONNECTION_STRING', IOTHUB_CONNECTION_STRING_ENV_VAR_NAME
-            buildConfigField STRING, 'IOT_DPS_CONNECTION_STRING', IOT_DPS_CONNECTION_STRING
-            buildConfigField STRING, 'DPS_GLOBALDEVICEENDPOINT_INVALIDCERT', INVALID_DEVICE_PROVISIONING_SERVICE_GLOBAL_ENDPOINT
-            buildConfigField STRING, 'PROVISIONING_CONNECTION_STRING_INVALIDCERT', INVALID_DEVICE_PROVISIONING_SERVICE_CONNECTION_STRING
-            buildConfigField STRING, 'IOT_DPS_ID_SCOPE', DEVICE_PROVISIONING_SERVICE_ID_SCOPE
-            buildConfigField STRING, 'IS_BASIC_TIER_HUB', IS_BASIC_TIER_HUB
-            buildConfigField STRING, 'IS_PULL_REQUEST', IS_PULL_REQUEST
-            buildConfigField STRING, 'RECYCLE_TEST_IDENTITIES', RECYCLE_TEST_IDENTITIES
-        }
+        buildConfigField STRING, 'IOTHUB_CONNECTION_STRING', IOTHUB_CONNECTION_STRING_ENV_VAR_NAME
+        buildConfigField STRING, 'IOT_DPS_CONNECTION_STRING', IOT_DPS_CONNECTION_STRING
+        //buildConfigField STRING, 'DPS_GLOBALDEVICEENDPOINT_INVALIDCERT', INVALID_DEVICE_PROVISIONING_SERVICE_GLOBAL_ENDPOINT
+        //buildConfigField STRING, 'PROVISIONING_CONNECTION_STRING_INVALIDCERT', INVALID_DEVICE_PROVISIONING_SERVICE_CONNECTION_STRING
+        buildConfigField STRING, 'IOT_DPS_ID_SCOPE', DEVICE_PROVISIONING_SERVICE_ID_SCOPE
+        buildConfigField STRING, 'IS_BASIC_TIER_HUB', IS_BASIC_TIER_HUB
+        buildConfigField STRING, 'IS_PULL_REQUEST', IS_PULL_REQUEST
+        buildConfigField STRING, 'RECYCLE_TEST_IDENTITIES', RECYCLE_TEST_IDENTITIES
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
     }
-
-    packagingOptions {
-        exclude "META-INF/*.SF"
-        exclude "META-INF/*.DSA"
-        exclude "META-INF/*.RSA"
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'thirdpartynotice.txt'
-    }
-
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    lintOptions{
-        ignore 'InvalidPackage'
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:multidex:1.0.3'
 
     // This jar contains the test code that will be run on android. This jar isn't in the m2 folder, but rather it is in this cloned repo after mvn install is run
     implementation files('../../common/target/iot-e2e-common-1.0.0-tests.jar')
@@ -84,13 +63,18 @@ dependencies {
 
     implementation ('org.apache.commons:commons-lang3:3.6')
     implementation ('javax.xml.stream:stax-api:1.0-2')
-
-    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'junit:junit:4.12'
+
+    androidTestImplementation libs.runner
+    implementation libs.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.core
 }
 
 repositories {
-    mavenLocal()
+    google()
     mavenCentral()
+    gradlePluginPortal()
+    mavenLocal()
 }

iot-e2e-tests/android/app/proguard-rules.pro

@@ -1,31 +1,21 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\v-askhur.REDMOND\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
 
-# JSON parser classes don't mix well with minification because JSON parser classes use reflection
-# based on the name of the field to create the JSON, and minification changes those names. As a result
-# all the message payload serializing and deserializing breaks. These lines explicitly exclude
-# the packages where we keep our JSON parsing classes from minification to avoid this issue
--keep class com.microsoft.azure.sdk.iot.provisioning.device.internal.parser.* { *; }
--keep class com.microsoft.azure.sdk.iot.deps.serializer.* { *; }
--keep class com.microsoft.azure.sdk.iot.provisioning.service.configs.* { *; }
--keep class com.microsoft.azure.sdk.iot.deps.twin.* { *; }
--keep class com.microsoft.azure.sdk.iot.service.registry.ImportMode { *; }
--keep class com.microsoft.azure.sdk.iot.service.AuthenticationMechanism { *; }
--keep class com.microsoft.azure.sdk.iot.device.edge.MethodRequest { *; }
--keep class com.microsoft.azure.sdk.iot.device.hsm.parser.ErrorResponse { *; }
--keep class com.microsoft.azure.sdk.iot.device.hsm.parser.SignRequest { *; }
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/FileUploadAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/FileUploadAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.iothub;
+package com.microsoft.azure.sdk.iot.androidtest.iothub;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup10;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
 import com.microsoft.azure.sdk.iot.service.auth.AuthenticationType;
 import org.junit.runner.RunWith;

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/MultiplexingClientAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/MultiplexingClientAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.iothub;
+package com.microsoft.azure.sdk.iot.androidtest.iothub;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup6;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/TokenRenewalAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/TokenRenewalAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.iothub;
+package com.microsoft.azure.sdk.iot.androidtest.iothub;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup12;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 
 import tests.integration.com.microsoft.azure.sdk.iot.iothub.TokenRenewalTests;
 

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/connection/ConnectionTestsAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/connection/ConnectionTestsAndroidRunner.java

@@ -1,6 +1,6 @@
-package com.microsoft.azure.sdk.iot.android.iothub.connection;
+package com.microsoft.azure.sdk.iot.androidtest.iothub.connection;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup11;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
 import com.microsoft.azure.sdk.iot.service.auth.AuthenticationType;
 import org.junit.runner.RunWith;
@@ -12,8 +12,8 @@
 @RunWith(Parameterized.class)
 public class ConnectionTestsAndroidRunner extends ConnectionTests
 {
-    public ConnectionTestsAndroidRunner(IotHubClientProtocol protocol, AuthenticationType authenticationType, ClientType clientType, boolean withProxy) throws Exception
+    public ConnectionTestsAndroidRunner(IotHubClientProtocol protocol, AuthenticationType authenticationType, ClientType clientType, boolean withProxy, boolean withProxyAuth) throws Exception
     {
-        super(protocol, authenticationType, clientType, withProxy);
+        super(protocol, authenticationType, clientType, withProxy, withProxyAuth);
     }
 }

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/digitaltwin/DigitalTwinClientAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/digitaltwin/DigitalTwinClientAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.digitaltwin;
+package com.microsoft.azure.sdk.iot.androidtest.iothub.digitaltwin;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup10;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 
 import tests.integration.com.microsoft.azure.sdk.iot.digitaltwin.DigitalTwinClientTests;
 

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/digitaltwin/DigitalTwinClientComponentTestsAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/digitaltwin/DigitalTwinClientComponentTestsAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.digitaltwin;
+package com.microsoft.azure.sdk.iot.androidtest.iothub.digitaltwin;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup10;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 
 import tests.integration.com.microsoft.azure.sdk.iot.digitaltwin.DigitalTwinClientComponentTests;
 

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/errorinjection/DirectMethodsErrInjAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/errorinjection/DirectMethodsErrInjAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.iothub.errorinjection;
+package com.microsoft.azure.sdk.iot.androidtest.iothub.errorinjection;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup5;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
 import com.microsoft.azure.sdk.iot.service.auth.AuthenticationType;
 

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/errorinjection/ReceiveMessagesErrInjAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/errorinjection/ReceiveMessagesErrInjAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.iothub.errorinjection;
+package com.microsoft.azure.sdk.iot.androidtest.iothub.errorinjection;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup3;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
 import com.microsoft.azure.sdk.iot.service.auth.AuthenticationType;
 

iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/android/iothub/errorinjection/SendMessagesErrInjAndroidRunner.java → iot-e2e-tests/android/app/src/androidTest/java/com/microsoft/azure/sdk/iot/androidtest/iothub/errorinjection/SendMessagesErrInjAndroidRunner.java

@@ -3,9 +3,9 @@
  *  Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-package com.microsoft.azure.sdk.iot.android.iothub.errorinjection;
+package com.microsoft.azure.sdk.iot.androidtest.iothub.errorinjection;
 
-import com.microsoft.azure.sdk.iot.android.helper.TestGroup4;
+import com.microsoft.azure.sdk.iot.androidtest.testgroup.*;
 import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
 import com.microsoft.azure.sdk.iot.service.auth.AuthenticationType;