ScriptName now returns FqName, fully qualified with package name. Update usages and convert to internal format as needed.

compiler/tests/org/jetbrains/jet/ScriptTest.java

@@ -49,6 +49,13 @@ public class ScriptTest {
         aClass.getConstructor(int.class).newInstance(4);
     }
 
+    @Test
+    public void testScriptWithPackage() throws Exception {
+        Class<?> aClass = compileScript("fib.pkg.ktscript", numIntParam(), Collections.<JetScriptDefinition>emptyList());
+        Assert.assertNotNull(aClass);
+        aClass.getConstructor(int.class).newInstance(4);
+    }
+
     @Test
     public void testScriptStandardExt() throws Exception {
         Class<?> aClass = compileScript("fib.kt", numIntParam(), Collections.<JetScriptDefinition>emptyList());

compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java

@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.lang.reflect.Constructor;
@@ -52,7 +53,8 @@ public class ScriptGenTest extends CodegenTestCase {
         loadFile(filename);
 
         try {
-            Class<?> scriptClass = generateClass(ScriptNameUtil.classNameForScript(myFiles.getPsiFile()));
+            FqName fqName = ScriptNameUtil.classNameForScript(myFiles.getPsiFile());
+            Class<?> scriptClass = generateClass(fqName.asString());
 
             Constructor constructor = getConstructor(scriptClass);
             scriptInstance = constructor.newInstance(myFiles.getScriptParameterValues().toArray());