Skip to content

Commit

Permalink
update test libs and PTE
Browse files Browse the repository at this point in the history
  • Loading branch information
@ialokim @grote
ialokim authored and grote committed Aug 5, 2020
1 parent 4a0007c commit 1362cd3
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 24 deletions.
17 changes: 9 additions & 8 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,15 @@ dependencies {
implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"

implementation('com.gitlab.opentransitmap:public-transport-enabler:38b99f27') {
exclude module: 'service'
exclude group: 'com.google.guava', module: 'listenablefuture'
exclude group: 'com.google.guava', module: 'failureaccess'
implementation('com.google.guava:guava:29.0-android') {
exclude module: 'listenablefuture'
exclude module: 'failureaccess'
exclude group: 'com.google.j2objc'
}
implementation('com.gitlab.opentransitmap:public-transport-enabler:f5c9f80d') {
exclude group: 'com.google.guava' // included above
exclude group: 'org.json', module: 'json' // provided by Android
exclude group: 'net.sf.kxml', module: 'kxml2' // provided by Android
exclude group: 'com.google.j2objc'
exclude group: 'junit'
}
debugImplementation 'org.slf4j:slf4j-api:1.7.30'
debugImplementation 'com.github.tony19:logback-android:1.1.1-12'
Expand All @@ -159,11 +160,11 @@ dependencies {
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation "androidx.test.ext:junit:1.1.1"
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0') {
androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0') {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.google.code.findbugs'
}
androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') {
androidTestImplementation('androidx.test.espresso:espresso-contrib:3.2.0') {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.android.support', module: 'support-v4'
exclude group: 'com.android.support', module: 'design'
Expand Down
8 changes: 4 additions & 4 deletions app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ abstract class ScreengrabTest {
val networkId: NetworkId = when(getTestLocale()) {
Locale.FRANCE -> NetworkId.PARIS
Locale.US -> NetworkId.TLEM
Locale.forLanguageTag("pt-BR") -> NetworkId.BR
Locale.forLanguageTag("pt-BR") -> NetworkId.BRAZIL
else -> NetworkId.DB
}

val departureStation = when(networkId) {
NetworkId.PARIS -> "Gare De Lyon"
NetworkId.TLEM -> "Waterloo Station"
NetworkId.BR -> "Republica"
NetworkId.BRAZIL -> "Republica"
else -> "Berlin Hbf"
}

Expand All @@ -78,7 +78,7 @@ abstract class ScreengrabTest {
2 -> getLocation("Moorgate")
else -> throw RuntimeException()
}
NetworkId.BR -> when(i) {
NetworkId.BRAZIL -> when(i) {
0 -> WrapLocation(STATION, "stop_point:OSA:SP:2600672", -23555071, -46662131, "São Paulo", "Paulista", null)
1 -> getLocation("Pinheiros")
2 -> getLocation("Vila Madalena")
Expand All @@ -105,7 +105,7 @@ abstract class ScreengrabTest {
2 -> getLocation("Temple")
else -> throw RuntimeException()
}
NetworkId.BR -> when(i) {
NetworkId.BRAZIL -> when(i) {
0 -> WrapLocation(STATION, "stop_point:OSA:SP:18876", -23543118, -46589599, "São Paulo", "Belem", null)
1 -> getLocation("Trianon Masp")
2 -> getLocation("Anhangabaú")
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,14 +693,14 @@ private val networks = arrayOf(
Country(
R.string.np_name_br, flag = "🇧🇷", networks = listOf(
TransportNetwork(
id = NetworkId.BR,
id = NetworkId.BRAZIL,
name = R.string.np_name_br,
description = R.string.np_desc_br,
agencies = R.string.np_desc_br_networks,
logo = R.drawable.network_br_logo,
status = ALPHA,
goodLineNames = true,
factory = { BrProvider(NAVITIA) }
factory = { BrazilProvider(NAVITIA) }
),
TransportNetwork(
id = NetworkId.BRFLORIPA,
Expand Down
20 changes: 10 additions & 10 deletions app/witness.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ dependencyVerification {
'androidx.sqlite:sqlite-framework:2.0.1:sqlite-framework-2.0.1.aar:870e3bce33ad21ef034332b083b2925105becfd73d262e3a1270901229e45076',
'androidx.sqlite:sqlite:2.0.1:sqlite-2.0.1.aar:cdfceb8f6ec64aac217dc5a499a5edb6d610f9d6a575fba7bea06b2bfaf3ea7f',
'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0:swiperefreshlayout-1.0.0.aar:9761b3a809c9b093fd06a3c4bbc645756dec0e95b5c9da419bc9f2a3f3026e8d',
'androidx.test.espresso:espresso-contrib:3.1.0:espresso-contrib-3.1.0.aar:277c292f02816b5e49051485b11e612c0ba7d36fc76b7dac955fe37766ec2832',
'androidx.test.espresso:espresso-core:3.1.0:espresso-core-3.1.0.aar:af9c385fb753e4ee9f7def800dbbc4a25841bec95727e3ef30e9d04d76b73fe9',
'androidx.test.espresso:espresso-idling-resource:3.1.0:espresso-idling-resource-3.1.0.aar:c1a6a7add4f5d51627539fb8875a6cc3285d51638f6d638ee32f58254861f482',
'androidx.test.espresso:espresso-contrib:3.2.0:espresso-contrib-3.2.0.aar:9e43811e5845e84f2964f0032fd50cd11dca3dc8d3b0703626dd12d50433bb35',
'androidx.test.espresso:espresso-core:3.2.0:espresso-core-3.2.0.aar:beb4712c2520c1da30ac1f25506871f16ea5b83ee686ece5a258769df1a01e15',
'androidx.test.espresso:espresso-idling-resource:3.2.0:espresso-idling-resource-3.2.0.aar:c1a0454fe95788122ba652c3ecff7ec538c7e27de206aed970f2809fb8090d09',
'androidx.test.ext:junit:1.1.1:junit-1.1.1.aar:449df418d2916a0f86fe7dafb1edb09480fafb6e995d5c751c7d0d1970d4ae72',
'androidx.test:core:1.2.0:core-1.2.0.aar:c88b739b1c499afb792374be19b9cf829e89567f26441a74f664c0cf8de158a4',
'androidx.test:monitor:1.2.0:monitor-1.2.0.aar:fc97ca3f00f8ca30b7d5167fbd8736756048e2cc4f8e92dc891106751a5baeef',
Expand Down Expand Up @@ -100,7 +100,7 @@ dependencyVerification {
'com.android.tools:sdklib:26.5.1:sdklib-26.5.1.jar:007da104afb27c8c682a1628023fe9ec438249c8d15ef0fd6624c5bb8e23b696',
'com.github.omadahealth:swipy:1.2.3:swipy-1.2.3.aar:63bff6e181742e3e243c29b595062ca65b4274bf7033c65460924f64f65c01e0',
'com.github.tony19:logback-android:1.1.1-12:logback-android-1.1.1-12.aar:3102228f0e408e3c003b34e96a604e9b9f59d314dcf8f03aa78d9d3648198932',
'com.gitlab.opentransitmap:public-transport-enabler:38b99f27:public-transport-enabler-38b99f27.jar:269bf01636b86f854d753e1ef1b3883e4e764d4eca5528d5ff6f7e5d924a6aa1',
'com.gitlab.opentransitmap:public-transport-enabler:f5c9f80d:public-transport-enabler-f5c9f80d.jar:3972d3a9329c94afc372fedf9649bdf687575850a6c2a454c0f8a9ce71961c28',
'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f',
'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc',
'com.google.android:flexbox:0.3.2:flexbox-0.3.2.aar:610a6a00695e873b4b6b785b7dce1c60f6a5964044b6d093b4d1060cbf13c278',
Expand All @@ -116,13 +116,13 @@ dependencyVerification {
'com.google.dagger:dagger:2.22.1:dagger-2.22.1.jar:329d4340f24c4f5717af016c097e90668bfea2a5376e6aa9964b01cef3fd241a',
'com.google.errorprone:error_prone_annotations:2.1.3:error_prone_annotations-2.1.3.jar:03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8',
'com.google.errorprone:error_prone_annotations:2.2.0:error_prone_annotations-2.2.0.jar:6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a',
'com.google.errorprone:error_prone_annotations:2.3.2:error_prone_annotations-2.3.2.jar:357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d',
'com.google.errorprone:error_prone_annotations:2.3.4:error_prone_annotations-2.3.4.jar:baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c',
'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9',
'com.google.guava:guava:27.0.1-jre:guava-27.0.1-jre.jar:e1c814fd04492a27c38e0317eabeaa1b3e950ec8010239e400fe90ad6c9107b4',
'com.google.guava:guava:28.1-android:guava-28.1-android.jar:e112ce92c0f0733965eede73d94589c59a72128b06b08bba5ebe2f9ea672ef60',
'com.google.guava:guava:29.0-android:guava-29.0-android.jar:00ba22cb0e32610db7cf8ab4c20017c85d11788600734ff1d86995345eb5bc3b',
'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
Expand All @@ -143,8 +143,10 @@ dependencyVerification {
'com.mikepenz:iconics-core:3.1.0:iconics-core-3.1.0.aar:eac6d9a2983412dba7e7e9df82206e0d55c9708149d35d21a72479a8b32a8998',
'com.mikepenz:materialdrawer:6.1.1:materialdrawer-6.1.1.aar:01d2c1e3b9bb4dbeb9546630afb1494179ed5437443560e2a5159e0f7ed2765b',
'com.mikepenz:materialize:1.2.0:materialize-1.2.0.aar:9f676d602932398d2d79ef35127d1777baa91a042b8ad3068a0d647463dec1a7',
'com.squareup.okhttp3:logging-interceptor:3.12.6:logging-interceptor-3.12.6.jar:d6e00845d40978640379dbc9337d7bdea0668d941f55724dbcfcf36f2fa798db',
'com.squareup.okhttp3:okhttp:3.12.6:okhttp-3.12.6.jar:ab45b9be99d9f070662b722cece5bdc2a0449fd34b9d5e51cdcd34663ae7b610',
'com.squareup.okhttp3:logging-interceptor:3.12.12:logging-interceptor-3.12.12.jar:dbf83bebfae07c7d9823eb0cd3a11d74e3b387f9fd98ce6438c6c12c1d9f870f',
'com.squareup.okhttp3:okhttp:3.10.0:okhttp-3.10.0.jar:4aca3e552afb1ceb47f8956685f6295a276e49fa03f9066f8b6be83bec56fb66',
'com.squareup.okhttp3:okhttp:3.12.12:okhttp-3.12.12.jar:36f1cd0798fb231e5be189d0bfe2634d5879f73082be5718ca30a73d1ee15e4b',
'com.squareup.okio:okio:1.14.0:okio-1.14.0.jar:4633c331f50642ebe795dc089d6a5928aff43071c9d17e7840a009eea2fe95a3',
'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2',
'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
'com.squareup:javawriter:2.1.1:javawriter-2.1.1.jar:f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e',
Expand Down Expand Up @@ -182,7 +184,6 @@ dependencyVerification {
'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
Expand Down Expand Up @@ -216,7 +217,6 @@ dependencyVerification {
'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215',
'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6',
'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461',
'org.slf4j:slf4j-api:1.7.29:slf4j-api-1.7.29.jar:47b624903c712f9118330ad2fb91d0780f7f666c3f22919d0fc14522c5cad9ea',
'org.slf4j:slf4j-api:1.7.30:slf4j-api-1.7.30.jar:cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57',
'org.xerial:sqlite-jdbc:3.25.2:sqlite-jdbc-3.25.2.jar:a45da61abed61568a533fdece125093180828edeb0d4b6f6d572e0cf457465f6',
'tools.fastlane:screengrab:1.1.0:screengrab-1.1.0.aar:03ce3868ee8a0082d14e7a1de0999f91531c0cc794392688beb08ee9bc4495fd',
Expand Down

0 comments on commit 1362cd3

Please sign in to comment.