add test

thrift-labs · Nov 29, 2024 · 508df23 · 508df23
1 parent a84544a
commit 508df23
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 26 deletions.
diff --git a/java/src/main/java/thriftlabs/thriftparser/Thrift.java b/java/src/main/java/thriftlabs/thriftparser/Thrift.java
@@ -3,9 +3,6 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.ParserRuleContext;
-
-import thriftlabs.thriftparser.*;
 
 public class Thrift {
     public static final int CommentChannel = 2; // 定义评论通道的常量
@@ -27,27 +24,11 @@ public static ParserResult parse(String content) {
         return new ParserResult(lexer, tokens, parser, document);
     }
 
-    public static class ThriftData {
-        private CommonTokenStream tokens;
-        private ThriftParser.DocumentContext document;
-
-        public ThriftData(CharStream inputStream) {
-            ParserResult result = parse(inputStream);
-            this.tokens = result.tokens;
-            this.document = result.document;
-        }
-
-        public static ThriftData fromString(String data) {
-            CharStream inputStream = CharStreams.fromString(data);
-            return new ThriftData(inputStream);
-        }
-    }
-
     public static class ParserResult {
-        ThriftLexer lexer;
-        CommonTokenStream tokens;
-        ThriftParser parser;
-        ThriftParser.DocumentContext document;
+        public ThriftLexer lexer;
+        public CommonTokenStream tokens;
+        public ThriftParser parser;
+        public ThriftParser.DocumentContext document;
 
         public ParserResult(ThriftLexer lexer, CommonTokenStream tokens, ThriftParser parser,
                 ThriftParser.DocumentContext document) {

diff --git a/java/src/test/java/thriftlabs/thriftparser/ParserTest.java b/java/src/test/java/thriftlabs/thriftparser/ParserTest.java
@@ -7,9 +7,6 @@
 
 import java.util.List;
 
-import thriftlabs.thriftparser.ThriftLexer;
-import thriftlabs.thriftparser.ThriftParser;
-
 public class ParserTest {
 
     public static String content = "include \"./other.thrift\" \n" +

diff --git a/java/src/test/java/thriftlabs/thriftparser/integration/ParseIntegrationTest.java b/java/src/test/java/thriftlabs/thriftparser/integration/ParseIntegrationTest.java
@@ -0,0 +1,30 @@
+package thriftlabs.thriftparser.integration;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import thriftlabs.thriftparser.Thrift;
+import thriftlabs.thriftparser.ThriftParser;
+
+public class ParseIntegrationTest {
+
+    public static String content = "include \"./other.thrift\" \n" +
+            "namespace py demo_thrift\n" +
+            "namespace go demo_thrift\n" +
+            "namespace java thriftlabs.thriftxx.demo_thrift\n" +
+            "\n" +
+            "const string __VERSION__ = \"0.0.8\"\n" +
+            "\n" +
+            "struct DemoStruct {" +
+            "1: required string x1;" +
+            "}";
+
+    @Test
+    public void testThrift() {
+        Thrift.ParserResult td = Thrift.parse(content);
+        List<ThriftParser.HeaderContext> headers = td.document.header();
+        assertEquals(headers.size(), 4);
+    }
+}