[Nice-commit] Nice/src/nice/tools/testsuite TestCase.java,1.30,1.31 NiceSourceFile.java,1.18,1.19

[Daniel B. <bo...@us...>]

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

Modified Files:
	TestCase.java NiceSourceFile.java 
Log Message:
Cosmetic improvements on output.


Index: TestCase.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/testsuite/TestCase.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** TestCase.java	5 Aug 2004 12:20:16 -0000	1.30
--- TestCase.java	5 Aug 2004 12:33:21 -0000	1.31
***************
*** 463,466 ****
--- 463,468 ----
  				writer.close();
  
+ 				TestNice.getOutput().log("");
+ 
  				LineNumberReader lines = new LineNumberReader
  					(new StringReader(contentWriter.toString()));

Index: NiceSourceFile.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/testsuite/NiceSourceFile.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NiceSourceFile.java	8 Dec 2003 18:37:11 -0000	1.18
--- NiceSourceFile.java	5 Aug 2004 12:33:21 -0000	1.19
***************
*** 47,51 ****
  	 * 
  	 */
! 	public static final String DEFAULT_PACKAGE = "defaultpackage";
  	
  	/**
--- 47,51 ----
  	 * 
  	 */
! 	public static final String DEFAULT_PACKAGE = "testcase";
  	
  	/**
***************
*** 53,57 ****
  	 * 
  	 */
! 	private String _package = DEFAULT_PACKAGE + TestNice.getFileCounter();
  	/**
  	 * TODO
--- 53,57 ----
  	 * 
  	 */
! 	private String _package;
  	/**
  	 * TODO
***************
*** 235,252 ****
  	 */
  	public String getPackage() {
  		return _package;
  	}
! 	
  	/**
  	 * Returns the file name.
- 	 * The file name is calculated prom the package name suffixed with
- 	 * <code>_main.nice</code>
- 	 * 
  	 */
  	public String getFileName() {
! 		//return _fileName;
! 		return _package + "_main.nice";
  	}
! 	
  	/**
  	 * Returns the class name.
--- 235,251 ----
  	 */
  	public String getPackage() {
+ 		if (_package == null)
+ 			_package = DEFAULT_PACKAGE + TestNice.getFileCounter();
+ 
  		return _package;
  	}
! 
  	/**
  	 * Returns the file name.
  	 */
  	public String getFileName() {
! 		return "main.nice";
  	}
! 
  	/**
  	 * Returns the class name.
***************
*** 266,271 ****
  		if (isEmpty())
  			return;
! 			
! 		File packageFolder = new File(TestNice.getTempFolder(), _package.replace('.', File.separatorChar));
  		if (! packageFolder.exists()  &&  ! packageFolder.mkdirs())
  			throw new TestSuiteException("could not create folder: " + packageFolder);
--- 265,270 ----
  		if (isEmpty())
  			return;
! 
! 		File packageFolder = new File(TestNice.getTempFolder(), getPackage().replace('.', File.separatorChar));
  		if (! packageFolder.exists()  &&  ! packageFolder.mkdirs())
  			throw new TestSuiteException("could not create folder: " + packageFolder);
***************
*** 315,319 ****
  	private void writePackage(BufferedWriter writer) throws IOException {
  		writer.write("package ");
! 		writer.write(_package);
  		writer.write(";");
  		writer.newLine();
--- 314,318 ----
  	private void writePackage(BufferedWriter writer) throws IOException {
  		writer.write("package ");
! 		writer.write(getPackage());
  		writer.write(";");
  		writer.newLine();
***************
*** 393,395 ****
--- 392,395 ----
  // Local Variables:
  // tab-width: 2
+ // indent-tabs-mode: t
  // End: