Project health: fix Descriptor.getName() in j2objc proto runtime.

Change on 2019/03/14 by antoniocortes <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=238441842
google · Mar 14, 2019 · 59881f4 · 59881f4
1 parent 24b7b48
commit 59881f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/protobuf/runtime/src/com/google/protobuf/Descriptors.m b/protobuf/runtime/src/com/google/protobuf/Descriptors.m
@@ -219,7 +219,7 @@ - (instancetype)initWithMessageClass:(Class)messageClass
 }
 
 - (NSString *)getName {
-  return [[self java_getClass] getSimpleName];
+  return [[messageClass_ java_getClass] getSimpleName];
 }
 
 - (id<JavaUtilList>)getFields {

diff --git a/protobuf/tests/CompatibilityTest.java b/protobuf/tests/CompatibilityTest.java
@@ -1345,6 +1345,9 @@ public void testInvalidUtf8Bytes() throws Exception {
 
   public void testDescriptorGetName() throws Exception {
     Descriptor descriptor = TypicalData.Builder.getDescriptor();
-    assertEquals("TypicalData", descriptor.getName()); // Verify package isn't included.
+    // Java returns TypicalData.
+    // The transpiled code returns ProtosTypicalData because it does not have
+    // reflection metadata (i.e. defaults to NSStringFromClass).
+    assertTrue(descriptor.getName().endsWith("TypicalData"));
   }
 }