From 3d56bf3bcb1533e3db781be60c8c0c09654377aa Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Tue, 2 Sep 2014 17:44:27 -0400
Subject: [PATCH] remove an unneeded field and add more tests

---
 compiler/src/main/cpp/capnpc-java.c++                  | 10 +---------
 .../src/test/scala/org/capnproto/EncodingTest.scala    |  7 +++++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/compiler/src/main/cpp/capnpc-java.c++ b/compiler/src/main/cpp/capnpc-java.c++
index dc3a420..a405c66 100644
--- a/compiler/src/main/cpp/capnpc-java.c++
+++ b/compiler/src/main/cpp/capnpc-java.c++
@@ -1422,7 +1422,6 @@ private:
   };
 
   struct NodeTextNoSchema {
-    kj::StringTree outerTypeDecl;
     kj::StringTree outerTypeDef;
     kj::StringTree readerBuilderDefs;
     kj::StringTree inlineMethodDefs;
@@ -1531,10 +1530,8 @@ private:
         scope, name, schema,
         KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDef); }, indent);
 
-    KJ_LOG(ERROR, top.outerTypeDecl);
-
     return NodeText {
-      kj::mv(top.outerTypeDecl),
+      kj::strTree(),
 
       kj::strTree(
           kj::mv(top.outerTypeDef),
@@ -1588,7 +1585,6 @@ private:
         auto structNode = proto.getStruct();
 
         return NodeTextNoSchema {
-          kj::mv(structText.outerTypeDecl),
           kj::mv(structText.outerTypeDef),
           kj::mv(structText.readerBuilderDefs),
           kj::mv(structText.inlineMethodDefs),
@@ -1604,8 +1600,6 @@ private:
         auto enumerants = schema.asEnum().getEnumerants();
 
         return NodeTextNoSchema {
-          kj::strTree(),
-
           kj::strTree(
                       spaces(indent), "public enum ", name, " {\n",
                       KJ_MAP(e, enumerants) {
@@ -1633,7 +1627,6 @@ private:
         auto constText = makeConstText(scope, name, schema.asConst());
 
         return NodeTextNoSchema {
-          kj::strTree(),
           kj::mv(constText.decl),
           kj::strTree(),
           kj::strTree(),
@@ -1653,7 +1646,6 @@ private:
           kj::strTree(),
           kj::strTree(),
           kj::strTree(),
-          kj::strTree(),
         };
       }
     }
diff --git a/compiler/src/test/scala/org/capnproto/EncodingTest.scala b/compiler/src/test/scala/org/capnproto/EncodingTest.scala
index 74e5173..866032f 100644
--- a/compiler/src/test/scala/org/capnproto/EncodingTest.scala
+++ b/compiler/src/test/scala/org/capnproto/EncodingTest.scala
@@ -34,6 +34,13 @@ class EncodingSuite extends FunSuite {
 
   test("Constants") {
     assert(true == TestConstants.BOOL_CONST);
+    assert(-123 == TestConstants.INT8_CONST);
+    assert(-12345 == TestConstants.INT16_CONST);
+    assert(-12345678 == TestConstants.INT32_CONST);
+    assert(-123456789012345L == TestConstants.INT64_CONST);
+
+    assert(1234.5f == TestConstants.FLOAT32_CONST);
+    assert(-123e45 == TestConstants.FLOAT64_CONST);
   }