refactoring, improved tests

Author: raydac

src/main/java/com/igormaznitsa/jbbp/JBBPParser.java

@@ -650,7 +650,7 @@ public List<ResultSrcItem> convertToSrc(final TargetSources target, final String
         switch (target) {
             case JAVA_1_6: {
                 final Properties metadata = new Properties();
-                metadata.setProperty("source", this.compiledBlock.getSource());
+                metadata.setProperty("script", this.compiledBlock.getSource());
                 metadata.setProperty("name", name);
                 metadata.setProperty("target", target.name());
                 metadata.setProperty("converter", JBBPToJava6Converter.class.getCanonicalName());
@@ -659,16 +659,15 @@ public List<ResultSrcItem> convertToSrc(final TargetSources target, final String
                 final String packageName;
                 final String className;
                 if (nameStart < 0) {
-                    packageName = null;
+                    packageName = "";
                     className = name;
                 } else {
                     packageName = name.substring(0, nameStart);
                     className = name.substring(nameStart + 1);
                 }
 
                 final String resultSources = JBBPToJava6Converter.makeBuilder(this).setClassPackage(packageName).setClassName(className).build().convert();
-
-                final Map<String, String> resultMap = Collections.<String, String>singletonMap(name, resultSources);
+                final Map<String, String> resultMap = Collections.<String, String>singletonMap(name.replace('.', '/') + ".java", resultSources);
 
                 return Collections.<ResultSrcItem>singletonList(new ResultSrcItem() {
                     @Override

src/test/java/com/igormaznitsa/jbbp/JBBPParserTest.java

@@ -29,6 +29,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.IOException;
+import java.util.List;
 
 import static org.junit.Assert.*;
 
@@ -1705,9 +1706,25 @@ public void testParse_NoErrorForIgnoreRemainingFieldsFlag() throws Exception {
     }
 
     @Test
-    public void testConvertToSrc_Java16() throws Exception {
+    public void testConvertToSrc_Java16_NamedPackage() throws Exception {
         final JBBPParser parser = JBBPParser.prepare("byte a;");
-        assertTrue(parser.convertToSrc(TargetSources.JAVA_1_6, "someclass").get(0).getResult().values().iterator().next().length() > 128);
+
+        final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA_1_6, "some.package.SomeClass");
+
+        assertEquals(1, src.size());
+        assertEquals("byte a;", src.get(0).getMetadata().getProperty("script"));
+        assertTrue(src.get(0).getResult().get("some/package/SomeClass.java").length() > 128);
+    }
+
+    @Test
+    public void testConvertToSrc_Java16_DefaultPackage() throws Exception {
+        final JBBPParser parser = JBBPParser.prepare("byte a;");
+
+        final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA_1_6, "SomeClass");
+
+        assertEquals(1, src.size());
+        assertEquals("byte a;", src.get(0).getMetadata().getProperty("script"));
+        assertTrue(src.get(0).getResult().get("SomeClass.java").length() > 128);
     }
 
 }