From 527668c1b0a0373a3d97e24a4a441bddbb409603 Mon Sep 17 00:00:00 2001
From: mountford <mountford@google.com>
Date: Thu, 5 Jan 2017 13:37:17 -0800
Subject: [PATCH] Remove infinite recursion in HistoryEntrySubject

The HistoryEntrySubject.actualCustomStringRepresentation() was calling a superclass method which ultimately called HistoryEntrySubject.actualCustomStringRepresentation(). So any test which failed due to a HistoryEntry problem resulted in a stack overflow error instead of a more helpful error indicating the actual problem. The solution is not to call the superclass method.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143702856
---
 javatests/google/registry/testing/HistoryEntrySubject.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/javatests/google/registry/testing/HistoryEntrySubject.java b/javatests/google/registry/testing/HistoryEntrySubject.java
index c013dbb18..11126ebbc 100644
--- a/javatests/google/registry/testing/HistoryEntrySubject.java
+++ b/javatests/google/registry/testing/HistoryEntrySubject.java
@@ -40,7 +40,10 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
 
   @Override
   public String actualCustomStringRepresentation() {
-    return Optional.fromNullable(customDisplaySubject).or(super.actualAsString());
+    // This will unfortunately not use the customName field in the superclass, but we can't call
+    // super.actualAsString(), because as currently implemented, it would result in an infinite
+    // recursion.
+    return Optional.fromNullable(customDisplaySubject).or(String.valueOf(actual()));
   }
 
   public HistoryEntrySubject withCustomDisplaySubject(String customDisplaySubject) {