Skip to content

Smoke test maintenance #3379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2022
Merged

Smoke test maintenance #3379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions smoke-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import java.nio.file.Paths
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath "com.android.tools.build:gradle:3.4.3"
classpath "com.google.gms:google-services:4.3.0"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
classpath "com.google.gms:google-services:4.3.10"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
}
}

Expand Down Expand Up @@ -77,22 +77,21 @@ dependencies {
implementation "com.google.firebase:firebase-firestore"
implementation "com.google.firebase:firebase-functions"
implementation "com.google.firebase:firebase-inappmessaging"
// TODO(yifany): Restore after messaging in github is up to date
// implementation "com.google.firebase:firebase-messaging"
implementation "com.google.firebase:firebase-messaging"
implementation "com.google.firebase:firebase-ml-modeldownloader"
implementation "com.google.firebase:firebase-perf"
implementation "com.google.firebase:firebase-storage"

// Common utilities (application side)
implementation "androidx.test:rules:1.2.0"
implementation "androidx.test:runner:1.2.0"
implementation "com.google.truth:truth:0.44"
implementation "junit:junit:4.12"
implementation "androidx.test:core:1.3.0"
implementation "androidx.test:rules:1.4.0"
implementation "androidx.test:runner:1.4.0"
implementation "com.google.truth:truth:1.0.1"
implementation "junit:junit:4.13.2"
implementation "androidx.test:core:1.4.0"

// Common utilities (instrumentation side)
androidTestImplementation "androidx.test:runner:1.2.0"
androidTestImplementation "junit:junit:4.12"
androidTestImplementation "androidx.test:runner:1.4.0"
androidTestImplementation "junit:junit:4.13.2"
}

clean.doLast {
Expand Down
13 changes: 3 additions & 10 deletions smoke-tests/configure.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,8 @@ def configurePlatform() {
bom = project.getProperty("firebase-bom")
}

def version = project.gradle.gradleVersion
if (version.startsWith("4.")) {
project.dependencies.add("implementation", bom)
} else {
def platform = project.dependencies.platform(bom)
project.dependencies.add("implementation", platform)
logger.warn("Congrats on switching to Gradle 5.y!")
logger.warn("Perhaps remove the Gradle 4.x compat layer?")
}
def platform = project.dependencies.platform(bom)
project.dependencies.add("implementation", platform)
}

def configureRepositories() {
Expand All @@ -44,7 +37,7 @@ def configureRepositories() {
}

google()
jcenter()
mavenCentral()
}
}

Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
android.enableR8=true
android.useAndroidX=true

org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g
org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
10 changes: 5 additions & 5 deletions smoke-tests/src/main/java/com/google/firebase/testing/BuildOnlyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.google.firebase.appindexing.FirebaseAppIndex;
import com.google.firebase.inappmessaging.FirebaseInAppMessaging;
// import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
import com.google.firebase.perf.FirebasePerformance;
import org.junit.Test;
Expand All @@ -41,10 +41,10 @@ public void inappmessaging_IsNotNull() {
assertThat(FirebaseInAppMessaging.getInstance()).isNotNull();
}

// @Test
// public void messaging_IsNotNull() {
// assertThat(FirebaseMessaging.getInstance()).isNotNull();
// }
@Test
public void messaging_IsNotNull() {
assertThat(FirebaseMessaging.getInstance()).isNotNull();
}

@Test
public void modelDownloader_IsNotNull() {
Expand Down