1 files changed, 19 insertions, 2 deletions
diff --git a/java/src/test/java/com/google/protobuf/MicroTest.java b/java/src/test/java/com/google/protobuf/MicroTest.java
index 9e18feb..03005a7 100644
--- a/java/src/test/java/com/google/protobuf/MicroTest.java
+++ b/java/src/test/java/com/google/protobuf/MicroTest.java
@@ -30,14 +30,16 @@
 
 package com.google.protobuf;
 
+import com.google.protobuf.micro.ByteStringMicro;
+import com.google.protobuf.micro.CodedInputStreamMicro;
 import com.google.protobuf.micro.MicroOuterClass;
 import com.google.protobuf.micro.MicroOuterClass.TestAllTypesMicro;
+import com.google.protobuf.micro.MultipleImportingNonMultipleMicro1;
+import com.google.protobuf.micro.MultipleImportingNonMultipleMicro2;
 import com.google.protobuf.micro.RecursiveMessageMicro;
 import com.google.protobuf.micro.SimpleMessageMicro;
 import com.google.protobuf.micro.StringUtf8;
 import com.google.protobuf.micro.UnittestImportMicro;
-import com.google.protobuf.micro.ByteStringMicro;
-import com.google.protobuf.micro.CodedInputStreamMicro;
 
 import junit.framework.TestCase;
 
@@ -2101,6 +2103,21 @@ public class MicroTest extends TestCase {
     assertEquals("world", newMsg.getRepeatedCord(1));
   }
 
+  /**
+   * Tests that code generation with mixed values of the java_multiple_files
+   * options between the main source file and the imported source files would
+   * generate correct references. Any error would cause this method to fail
+   * compilation.
+   */
+  public void testMicroMultipleImportingNonMultiple() throws Exception {
+    UnittestImportMicro.ImportMessageMicro importMsg =
+        new UnittestImportMicro.ImportMessageMicro();
+    MultipleImportingNonMultipleMicro1 micro1 = new MultipleImportingNonMultipleMicro1();
+    micro1.setField(importMsg);
+    MultipleImportingNonMultipleMicro2 micro2 = new MultipleImportingNonMultipleMicro2();
+    micro2.setMicro1(micro1);
+  }
+
   public void testMicroDefaults() throws Exception {
     TestAllTypesMicro msg = new TestAllTypesMicro();
     assertFalse(msg.hasDefaultInt32());