From e2cfb8aaf1030475294cdbb68a72f0422cef1177 Mon Sep 17 00:00:00 2001
From: Kuba Ober <kuba@bertec.com>
Date: Fri, 30 Aug 2019 11:23:44 -0400
Subject: [PATCH] Test constants in imported non-generated structures and
 interfaces.

---
 .../Properties/Resources.Designer.cs             |  10 ++++++++++
 capnpc-csharp.tests/Properties/Resources.resx    |   3 +++
 .../Resources/UnitTest11.capnp.bin               | Bin 0 -> 2080 bytes
 capnpc-csharp.tests/UnitTest11.capnp             |  15 +++++++++++++++
 capnpc-csharp.tests/UnitTest11b.capnp            |   9 +++++++++
 capnpc-csharp.tests/UnitTests.cs                 |   7 +++++++
 6 files changed, 44 insertions(+)
 create mode 100644 capnpc-csharp.tests/Resources/UnitTest11.capnp.bin
 create mode 100644 capnpc-csharp.tests/UnitTest11.capnp
 create mode 100644 capnpc-csharp.tests/UnitTest11b.capnp

diff --git a/capnpc-csharp.tests/Properties/Resources.Designer.cs b/capnpc-csharp.tests/Properties/Resources.Designer.cs
index 7c7c2e9..0f7df65 100644
--- a/capnpc-csharp.tests/Properties/Resources.Designer.cs
+++ b/capnpc-csharp.tests/Properties/Resources.Designer.cs
@@ -90,6 +90,16 @@ namespace capnpc_csharp.Tests.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] UnitTest11_capnp {
+            get {
+                object obj = ResourceManager.GetObject("UnitTest11_capnp", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
diff --git a/capnpc-csharp.tests/Properties/Resources.resx b/capnpc-csharp.tests/Properties/Resources.resx
index 6d2bda3..2404b46 100644
--- a/capnpc-csharp.tests/Properties/Resources.resx
+++ b/capnpc-csharp.tests/Properties/Resources.resx
@@ -136,4 +136,7 @@
   <data name="schema_with_offsets_capnp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\schema-with-offsets.capnp.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="UnitTest11_capnp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\UnitTest11.capnp.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/capnpc-csharp.tests/Resources/UnitTest11.capnp.bin b/capnpc-csharp.tests/Resources/UnitTest11.capnp.bin
new file mode 100644
index 0000000000000000000000000000000000000000..536360967d118087b8d9a5df18835172038d5730
GIT binary patch
literal 2080
zcmeHIO=}cE5Urhw@f$Rt5;3TVm<5e4Y6Q_s^s<NsO+>s1n_&X+Fj+Pe1O?9;P>A3m
z5`*U8MNm)=qL&=J>Op^iMkJ`moV+N$>YlgVGwiBAz*@TNqpPZWURC#sh=e6fhB{;;
z_;?`lHWb+oxdTI&PeXqSF0#_h+c2+?PU-&ma_h<2{x55dwf)qCBvV-44Zf$nTXW@6
zv@n0^`TSfLEV}>o-e0@!FTHup{pq+9i_1{<fp4Ml5B&Awhs|BjUOdsf_#`iHKByb{
z)?kzic@INZ1jre+yfibt_r&{8iXU8>xC9wq^iv$ZL(#kzNxP!BT%nW4`Q7V0TPyJ<
z;_qN#8vI}Ieb700cK@||vwB{|fpskAzJ+`N#tep!??dQ%esacLzR`bsYA#;f0Rvow
z`xJ4|^A2EWULS|M&|BefJ{e1g<B7CV>5FRhq>j{vR$(sTNBmbqAHm?hs$azzoJ`}!
zP}-P`QfQf8O<)|YMX`v>KVmmHT1^r!!rp_Dyo-(;EMGkJ3dfXl7}0n#k=BxQNRxuv
z<nea0e$2Np{Q29NA76hK^Hr^znM2$(CH+p9KRage!!kd`B{a8JBb9UqM`ehL6R8(M
z2%kgXf!T=>x~roKM8%VI0D{IH1J}5*9BLvPGDqHL#*uTKI=RW?p{9MR#QSSCH*?)t
ztmN>@>Y6#QZ+I^D4fC^a@?9Webnjd)zh4jMz&i6@D3${l7aFyCJ#LuO{Jp--e0_eL
zR_1@5Z9(<_sDutA&en>0LC|-r-TTIOg8s)L=zGMzpq-rWF?DkG4fP%fnuqTa?VBLz
xd9-f4VMfeNym7X^t^90X1<mi$7efDE*JEh@Vqd~!i2ca#(4F*u!};g$$!~g<EKC3Z

literal 0
HcmV?d00001

diff --git a/capnpc-csharp.tests/UnitTest11.capnp b/capnpc-csharp.tests/UnitTest11.capnp
new file mode 100644
index 0000000..5fda369
--- /dev/null
+++ b/capnpc-csharp.tests/UnitTest11.capnp
@@ -0,0 +1,15 @@
+@0xe4369c441ab8df19;
+
+using Imported = import "UnitTest11b.capnp";
+
+struct OuterStruct {
+	innerStruct @0: Imported.InnerStruct;
+	innerInterface @1: Imported.InnerInterface;
+}
+
+interface OuterInterface {
+	struct Wrapper {
+		innerStruct @0: Imported.InnerStruct;
+		innerInterface @1: Imported.InnerInterface;
+	}
+}
diff --git a/capnpc-csharp.tests/UnitTest11b.capnp b/capnpc-csharp.tests/UnitTest11b.capnp
new file mode 100644
index 0000000..c5b1926
--- /dev/null
+++ b/capnpc-csharp.tests/UnitTest11b.capnp
@@ -0,0 +1,9 @@
+@0xabc4e69d23fe287e;
+
+struct InnerStruct {
+	const constantS: Bool = false;
+}
+
+interface InnerInterface {
+	const constantI: Bool = false;
+}
diff --git a/capnpc-csharp.tests/UnitTests.cs b/capnpc-csharp.tests/UnitTests.cs
index c009ddd..1be2f38 100644
--- a/capnpc-csharp.tests/UnitTests.cs
+++ b/capnpc-csharp.tests/UnitTests.cs
@@ -71,6 +71,13 @@ namespace CapnpC
             Assert.AreEqual($"{innerNSStr}.Inner", innerNameSyntax.ToString());
         }
 
+        [TestMethod]
+        public void Test11ImportedConst()
+        {
+            var model = Load(Resources.UnitTest11_capnp);
+            // Should not throw
+        }
+
         [TestMethod]
         public void Test20AnnotationAndConst()
         {