From b9d30d67ac820fbc2b22fd9789da6dc49e0413d5 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Sun, 8 Dec 2019 21:30:01 +0000
Subject: [PATCH] Samples cleanup

---
 .../okhttp3/recipes/CertificatePinning.java   |  2 +-
 .../src/test/kotlin/okhttp3/AllMainsTest.kt   | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/samples/guide/src/main/java/okhttp3/recipes/CertificatePinning.java b/samples/guide/src/main/java/okhttp3/recipes/CertificatePinning.java
index 87ea03973..4de3ff1a9 100644
--- a/samples/guide/src/main/java/okhttp3/recipes/CertificatePinning.java
+++ b/samples/guide/src/main/java/okhttp3/recipes/CertificatePinning.java
@@ -26,7 +26,7 @@ public final class CertificatePinning {
   private final OkHttpClient client = new OkHttpClient.Builder()
       .certificatePinner(
           new CertificatePinner.Builder()
-              .add("publicobject.com", "sha256/afwiKY3RxoMmLkuRW1l7QsPZTJPwDS2pdDROQjXw8ig=")
+              .add("publicobject.com", "sha256/Vjs8r4z+80wjNcr1YKepWQboSIRi63WsWXhIMN+eWys=")
               .build())
       .build();
 
diff --git a/samples/guide/src/test/kotlin/okhttp3/AllMainsTest.kt b/samples/guide/src/test/kotlin/okhttp3/AllMainsTest.kt
index 21c932c46..c934c32b4 100644
--- a/samples/guide/src/test/kotlin/okhttp3/AllMainsTest.kt
+++ b/samples/guide/src/test/kotlin/okhttp3/AllMainsTest.kt
@@ -27,7 +27,8 @@ import java.lang.reflect.InvocationTargetException
 class AllMainsTest(val className: String) {
   @Test
   fun runMain() {
-    val mainMethod = Class.forName(className).methods.find { it.name == "main" }
+    val mainMethod = Class.forName(className)
+        .methods.find { it.name == "main" }
     try {
       mainMethod?.invoke(null, arrayOf<String>())
     } catch (ite: InvocationTargetException) {
@@ -37,7 +38,10 @@ class AllMainsTest(val className: String) {
     }
   }
 
-  private fun expectedFailure(className: String, cause: Throwable): Boolean {
+  private fun expectedFailure(
+    className: String,
+    cause: Throwable
+  ): Boolean {
     return when (className) {
       "okhttp3.recipes.CheckHandshake" -> true // by design
       "okhttp3.recipes.RequestBodyCompression" -> true // expired token
@@ -53,15 +57,23 @@ class AllMainsTest(val className: String) {
     fun data(): List<String> {
       val mainFiles = mainFiles()
       return mainFiles.map {
-        it.path.substring("$prefix/samples/guide/src/main/java".length, it.path.length - 5)
-            .replace('/', '.')
+        val suffix = it.path.replace("${prefix}samples/guide/src/main/java/", "")
+        suffix.replace("(.*)\\.(?:kt|java)".toRegex()) { mr ->
+          mr.groupValues[1].replace('/', '.')
+        }
       }.sorted()
     }
 
     private fun mainFiles(): List<File> {
-      return File("$prefix/samples/guide/src/main/java/okhttp3").listFiles()?.flatMap {
-        it?.listFiles()?.toList().orEmpty()
-      }.orEmpty()
+      val directories = listOf(
+          "$prefix/samples/guide/src/main/java/okhttp3/guide",
+          "$prefix/samples/guide/src/main/java/okhttp3/recipes",
+          "$prefix/samples/guide/src/main/java/okhttp3/recipes/kt"
+      ).map { File(it) }
+
+      return directories.flatMap {
+        it.listFiles().orEmpty().filter { f -> f.isFile }.toList()
+      }
     }
   }
 }