[Nice-commit] Nice/testsuite helpers.nice,1.5,1.6

[Artem Gr K. <ar...@us...>]

Update of /cvsroot/nice/Nice/testsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31651/testsuite

Modified Files:
	helpers.nice 
Log Message:
TMP uppercased; NICE_JAR variable exported;
NICE_JAR added into the "run" classloader (requred to trace exceptions).

Index: helpers.nice
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/helpers.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** helpers.nice	29 Aug 2005 12:56:44 -0000	1.5
--- helpers.nice	29 Aug 2005 13:41:10 -0000	1.6
***************
*** 32,36 ****
  import java.util.jar.*;
  
! let File tmp = new File("temp-testcase");
  
  class HelpersOutput extends nice.tools.compiler.console.ConsoleOutput {
--- 32,37 ----
  import java.util.jar.*;
  
! public let File TMP = new File("temp-testcase");
! public let String NICE_JAR = "share/java/nice.jar";
  
  class HelpersOutput extends nice.tools.compiler.console.ConsoleOutput {
***************
*** 53,57 ****
  {
    let dirname = pkg.replace('.', File.separatorChar);
!   let dir = new File(tmp, dirname);
    dir.mkdirs();
    let source = new File(dir, "main.nice");
--- 54,58 ----
  {
    let dirname = pkg.replace('.', File.separatorChar);
!   let dir = new File(TMP, dirname);
    dir.mkdirs();
    let source = new File(dir, "main.nice");
***************
*** 62,70 ****
    let compilation = new bossa.modules.Compilation
      (listener: output, parser: new bossa.parser.JavaccParser());
!   compilation.sourcePath = tmp.getPath();
    if (imp != null)
!     compilation.packagePath = new File(tmp, imp + ".jar").toString();
    compilation.runtimeFile = "classes";
!   let outputJar = new File(tmp, pkg + ".jar");
    compilation.output = outputJar.getPath();
  
--- 63,71 ----
    let compilation = new bossa.modules.Compilation
      (listener: output, parser: new bossa.parser.JavaccParser());
!   compilation.sourcePath = TMP.getPath();
    if (imp != null)
!     compilation.packagePath = new File(TMP, imp + ".jar").toString();
    compilation.runtimeFile = "classes";
!   let outputJar = new File(TMP, pkg + ".jar");
    compilation.output = outputJar.getPath();
  
***************
*** 103,107 ****
  public void run(String jar)
  {
!   run(new java.io.File(tmp, jar + ".jar"));
  }
  
--- 104,108 ----
  public void run(String jar)
  {
!   run(new java.io.File(TMP, jar + ".jar"));
  }
  
***************
*** 111,115 ****
    let mainClassName =
      jarFile.getManifest().getMainAttributes().getValue("Main-Class");
!   let loader = new nice.tools.util.SelfContainedClassLoader([jar.toURL()]);
    nice.tools.util.JDK.setDefaultAssertionStatus(loader, true);
    let mainClass = loader.loadClass(mainClassName);
--- 112,116 ----
    let mainClassName =
      jarFile.getManifest().getMainAttributes().getValue("Main-Class");
!   let loader = new nice.tools.util.SelfContainedClassLoader([jar.toURL(),new File(NICE_JAR).toURL()]);
    nice.tools.util.JDK.setDefaultAssertionStatus(loader, true);
    let mainClass = loader.loadClass(mainClassName);