From de1c7ec179bdd928b6c41712b7ea50062e798d9b Mon Sep 17 00:00:00 2001
From: tt0suzy <tt0suzy@gmail.com>
Date: Sun, 11 Dec 2022 00:45:23 -0600
Subject: [PATCH 1/2] fixed flaky test

---
 .../java/org/kohsuke/github/GHObjectTest.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/kohsuke/github/GHObjectTest.java b/src/test/java/org/kohsuke/github/GHObjectTest.java
index 05a8c1ae4e..91f3b8a403 100644
--- a/src/test/java/org/kohsuke/github/GHObjectTest.java
+++ b/src/test/java/org/kohsuke/github/GHObjectTest.java
@@ -19,10 +19,17 @@ public class GHObjectTest extends org.kohsuke.github.AbstractGitHubWireMockTest
     @Test
     public void test_toString() throws Exception {
         GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
-        assertThat(org.toString(),
-                containsString(
-                        "login=hub4j-test-org,location=<null>,blog=<null>,email=<null>,bio=<null>,name=<null>,company=<null>,type=Organization,followers=0,following=0,hireable=false"));
-
+        assertThat(org.toString(), containsString("login=hub4j-test-org"));
+        assertThat(org.toString(), containsString("location=<null>"));
+        assertThat(org.toString(), containsString("blog=<null>"));
+        assertThat(org.toString(), containsString("email=<null>"));
+        assertThat(org.toString(), containsString("bio=<null>"));
+        assertThat(org.toString(), containsString("name=<null>"));
+        assertThat(org.toString(), containsString("company=<null>"));
+        assertThat(org.toString(), containsString("type=Organization"));
+        assertThat(org.toString(), containsString("followers=0"));
+        assertThat(org.toString(), containsString("hireable=false"));
+        
         // getResponseHeaderFields is deprecated but we should not break it.
         assertThat(org.getResponseHeaderFields(), notNullValue());
         assertThat(org.getResponseHeaderFields().get("Cache-Control").get(0), is("private, max-age=60, s-maxage=60"));

From b61209e0bdcdaa5c22dd7c1e6f922f853e517ffd Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Wed, 25 Jan 2023 09:40:53 -0800
Subject: [PATCH 2/2] Fix formatting

---
 src/test/java/org/kohsuke/github/GHObjectTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/kohsuke/github/GHObjectTest.java b/src/test/java/org/kohsuke/github/GHObjectTest.java
index 91f3b8a403..66388e55ee 100644
--- a/src/test/java/org/kohsuke/github/GHObjectTest.java
+++ b/src/test/java/org/kohsuke/github/GHObjectTest.java
@@ -29,7 +29,7 @@ public void test_toString() throws Exception {
         assertThat(org.toString(), containsString("type=Organization"));
         assertThat(org.toString(), containsString("followers=0"));
         assertThat(org.toString(), containsString("hireable=false"));
-        
+
         // getResponseHeaderFields is deprecated but we should not break it.
         assertThat(org.getResponseHeaderFields(), notNullValue());
         assertThat(org.getResponseHeaderFields().get("Cache-Control").get(0), is("private, max-age=60, s-maxage=60"));