added tests

Author: raydac

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJBBPToJava6ConverterCompilationTest.java

@@ -56,6 +56,27 @@ public void testForceAbstract() throws Exception {
     assertTrue(JBBPToJava6Converter.makeBuilder(parser).setMainClassName(CLASS_NAME).setDoMainClassAbstract(true).build().convert().contains("abstract"));
   }
 
+  @Test
+  public void testMapSubstructToSuperclassesInterface() throws Exception {
+    final JBBPParser parser = JBBPParser.prepare("a { b { c [_] { byte d;}} }");
+    final String text = JBBPToJava6Converter.makeBuilder(parser)
+        .setMainClassName(CLASS_NAME)
+        .setAddGettersSetters(true)
+        .setMapSubClassesSuperclasses(
+            makeMap(
+                "a.b","com.igormaznitsa.Impl",
+                "a.b.c", "com.igormaznitsa.Impl2"
+            )
+        )
+        .build()
+        .convert();
+    assertTrue(text.contains("public static class B extends com.igormaznitsa.Impl"));
+    assertTrue(text.contains("public static class C extends com.igormaznitsa.Impl2"));
+    assertTrue(text.contains("public B getB() { return this.b;}"));
+    assertTrue(text.contains("public C [] getC() { return this.c;}"));
+    System.out.println(text);
+  }
+
   @Test
   public void testMapSubstructToInterface() throws Exception {
     final JBBPParser parser = JBBPParser.prepare("a { b { c [_] { byte d;}} }");
@@ -312,4 +333,20 @@ public JBBPAbstractField readCustomFieldType(JBBPBitInputStream in, JBBPBitOrder
     assertCompilation(makeSources(parser, null, true));
   }
 
+  @Test
+  public void testStaticInternalClasses() throws Exception {
+    String text = JBBPToJava6Converter.makeBuilder(JBBPParser.prepare("somestruct {int a;}"))
+        .setMainClassPackage(PACKAGE_NAME).setMainClassName(CLASS_NAME)
+        .build().convert();
+    assertTrue(text.contains(" static class SOMESTRUCT {"));
+
+    text = JBBPToJava6Converter.makeBuilder(JBBPParser.prepare("somestruct {int a;}"))
+        .setMainClassPackage(PACKAGE_NAME).setMainClassName(CLASS_NAME)
+        .doInternalClassesNonStatic()
+        .build().convert();
+    assertFalse(text.contains(" static class SOMESTRUCT {"));
+    assertTrue(text.contains(" class SOMESTRUCT {"));
+  }
+
+
 }