Skip to content

Commit 4d0adfa

Browse files
authored
Add Mqtt5 PubSub sample to Android Testing (#451)
* Add mqtt5 PubSub sample test to Android Device Farm CI
1 parent a198a0e commit 4d0adfa

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@ jobs:
378378
jobsKey=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/Jobs/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$jobsKey" > jobsPrivatekey.pem
379379
shadowCert=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/Shadow/cert" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$shadowCert" > shadowCertificate.pem
380380
shadowKey=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/Shadow/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$shadowKey" > shadowPrivatekey.pem
381+
mqtt5PubSubCert=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/mqtt5/us/mqtt5_thing/cert" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$mqtt5PubSubCert" > mqtt5PubSubCertificate.pem
382+
mqtt5PubSubKey=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/mqtt5/us/mqtt5_thing/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$mqtt5PubSubKey" > mqtt5PubSubPrivatekey.pem
381383
cd ../../..
382384
../../../../android/gradlew assembledebug
383385
../../../../android/gradlew assembleAndroidTest

sdk/tests/android/testapp/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ android {
3838
sourceSets {
3939
main {
4040
java.srcDir '../../../../samples/Utils/CommandLineUtils'
41+
java.srcDir '../../../../samples/Mqtt5/PubSub/src/main/java'
4142
java.srcDir '../../../../samples/BasicPubSub/src/main/java'
4243
java.srcDir '../../../../samples/Jobs/src/main/java'
4344
java.srcDir '../../../../samples/Shadow/src/main/java'

sdk/tests/android/testapp/src/androidTest/java/software/amazon/awssdk/iottest/MainActivityTest.kt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ class MainActivityTest {
6161
"cognitoconnect.CognitoConnect" -> {
6262
resourceNames.add("cognitoIdentity.txt")
6363
}
64+
65+
"mqtt5.pubsub.PubSub" -> {
66+
resourceNames.add("mqtt5PubSubCertificate.pem")
67+
resourceNames.add("mqtt5PubSubPrivatekey.pem")
68+
}
6469
}
6570

6671
// Load resource into a cached location for use by sample
@@ -116,6 +121,14 @@ class MainActivityTest {
116121
"--signing_region", "us-east-1",
117122
"--cognito_identity", assetContents("cognitoIdentity.txt")))
118123
}
124+
125+
"mqtt5.pubsub.PubSub" -> {
126+
args.addAll(arrayOf(
127+
"--cert", resourceMap["mqtt5PubSubCertificate.pem"],
128+
"--key", resourceMap["mqtt5PubSubPrivatekey.pem"],
129+
"--message", "message.txt", "Hello World From Android"
130+
))
131+
}
119132
}
120133

121134
return args.toTypedArray()
@@ -154,4 +167,9 @@ class MainActivityTest {
154167
fun jobsSample(){
155168
runSample("jobs.JobsSample")
156169
}
157-
}
170+
171+
@Test
172+
fun mqtt5PubSubSample(){
173+
runSample("mqtt5.pubsub.PubSub")
174+
}
175+
}

0 commit comments

Comments
 (0)