commit a1a9eec91b5a9ca8da1f0c855624198946feeb53
author DarickTong <darick.tong@gmail.com> Tue Dec 23 10:32:00 2014 -0800
committer Jake Wharton <jw@squareup.com> Mon Dec 29 01:02:24 2014 -0800
tree 24dacf376a0eec16b5fb4f665e35bdd4221bcd70
parent 0e9f07e7520cb43fc9071650ac1f9a2d7673b27c

Fix infinite loop in ClassName.fromClass()

src/main/java/com/squareup/javawriter/ClassName.java

diff --git a/src/main/java/com/squareup/javawriter/ClassName.java b/src/main/java/com/squareup/javawriter/ClassName.java
index a0770fa..7fbb09a 100644
--- a/src/main/java/com/squareup/javawriter/ClassName.java
+++ b/src/main/java/com/squareup/javawriter/ClassName.java
@@ -163,7 +163,7 @@
     Class<?> current = clazz.getEnclosingClass();
     while (current != null) {
       enclosingNames.add(current.getSimpleName());
-      current = clazz.getEnclosingClass();
+      current = current.getEnclosingClass();
     }
     Collections.reverse(enclosingNames);
     return create(clazz.getPackage().getName(), enclosingNames, clazz.getSimpleName());

src/test/java/com/squareup/javawriter/ClassNameTest.java

diff --git a/src/test/java/com/squareup/javawriter/ClassNameTest.java b/src/test/java/com/squareup/javawriter/ClassNameTest.java
index b9c7825..304ec46 100644
--- a/src/test/java/com/squareup/javawriter/ClassNameTest.java
+++ b/src/test/java/com/squareup/javawriter/ClassNameTest.java
@@ -81,6 +81,13 @@
     assert_().that(ClassName.fromTypeElement(element).canonicalName())
         .isEqualTo("java.lang.Object");
   }
+  
+  @Test public void classNameFromClass() {
+    assert_().that(ClassName.fromClass(Object.class).canonicalName())
+        .isEqualTo("java.lang.Object");
+    assert_().that(ClassName.fromClass(OuterClass.InnerClass.class).canonicalName())
+        .isEqualTo("com.squareup.javawriter.ClassNameTest.OuterClass.InnerClass");
+  }
 
   @Test public void peerNamed_topLevelClass() {
     Elements elements = compilationRule.getElements();