Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5338] trunk/installer/test/java/org/python/util/install /StartScriptGeneratorTest.java
|
From: <otm...@us...> - 2008-09-17 15:37:25
|
Revision: 5338
http://jython.svn.sourceforge.net/jython/?rev=5338&view=rev
Author: otmarhumbel
Date: 2008-09-17 22:37:23 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
all installer junit tests now pass
Modified Paths:
--------------
trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java
Modified: trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java
===================================================================
--- trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java 2008-09-17 22:36:45 UTC (rev 5337)
+++ trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java 2008-09-17 22:37:23 UTC (rev 5338)
@@ -12,93 +12,98 @@
public class StartScriptGeneratorTest extends TestCase {
private static final String AT_DATE = "@DATE";
+
private static final String WIN_CR_LF = StartScriptGenerator.WIN_CR_LF;
private StartScriptGenerator _generator;
+ private File _targetDir;
+
protected void setUp() throws Exception {
- _generator = new StartScriptGenerator(new File("C:\\target"), new File("C:\\java")); // dummy values here
+ String userDirName = System.getProperty("user.dir"); // only true in eclipse ?
+ File userDir = new File(userDirName);
+ File parentDir = userDir.getParentFile();
+ assertTrue(parentDir.exists());
+ _targetDir = new File(parentDir, "jython");
+ if (!_targetDir.exists()) {
+ _targetDir = new File(parentDir, "jython-trunk");
+ }
+ assertTrue(_targetDir.exists());
+ assertTrue(_targetDir.isDirectory());
+ _targetDir = new File(_targetDir, "src");
+ _targetDir = new File(_targetDir, "shell");
+ assertTrue(_targetDir.exists());
+ assertTrue(_targetDir.isDirectory());
+ File javaHome = new File(System.getProperty("java.home"));
+ _generator = new StartScriptGenerator(_targetDir, javaHome);
}
+ // TODO: test on Solaris
public void testUnix() throws IOException {
_generator.setFlavour(StartScriptGenerator.UNIX_FLAVOUR);
StringBuffer buf = new StringBuffer(100);
- buf.append("#!/bin/sh\n");
+ buf.append("#!/usr/bin/env bash\n");
buf.append("\n");
buf.append("# This file was generated by the Jython installer\n");
buf.append("# Created on " + AT_DATE + " by " + System.getProperty("user.name") + "\n");
buf.append("\n");
- buf.append("CP=\"C:\\target/" + JarInstaller.JYTHON_JAR + "\"\n");
- buf.append("if [ ! -z \"$CLASSPATH\" ]\n"); // quotes around $CLASSPATH are essential for Solaris
- buf.append("then\n");
- buf.append(" CP=$CP:$CLASSPATH\n");
- buf.append("fi\n");
- buf.append("\"C:\\java/bin/java\" -Dpython.home=\"C:\\target\" -classpath \"$CP\" org.python.util.jython \"$@\"\n");
- assertEquals(buf.toString().replaceAll(AT_DATE, new Date().toString()), _generator
- .getJythonScript(StartScriptGenerator.UNIX_FLAVOUR));
-
- buf = new StringBuffer(50);
- buf.append("#!/bin/sh\n");
- buf.append("\n");
- buf.append("# This file was generated by the Jython installer\n");
- buf.append("# Created on " + AT_DATE + " by " + System.getProperty("user.name") + "\n");
- buf.append("\n");
- buf.append("\"C:\\target/jython\" \"C:\\target/Tools/jythonc/jythonc.py\" \"$@\"\n");
-// assertEquals(buf.toString().replaceAll(AT_DATE, new Date().toString()), _generator
-// .getJythoncScript(StartScriptGenerator.UNIX_FLAVOUR));
+ buf.append("JAVA_HOME=\"");
+ buf.append(System.getProperty("java.home"));
+ buf.append("\"\n");
+ buf.append("JYTHON_HOME=\"");
+ buf.append(_targetDir.getAbsolutePath());
+ buf.append("\"\n");
+ // some rudimentary tests - feel free to do more
+ String start = buf.toString().replaceAll(AT_DATE, new Date().toString());
+ String unixScript = _generator.getJythonScript(StartScriptGenerator.UNIX_FLAVOUR);
+ assertTrue(unixScript.startsWith(start));
+ assertTrue(unixScript.length() > 3500);
+ assertTrue(unixScript.indexOf("-Dpython.home=") > start.length());
+ assertTrue(unixScript.indexOf("-Dpython.executable=") > start.length());
}
public void testWindows() throws IOException {
StringBuffer winBuf = new StringBuffer(100);
- winBuf.append("@echo off"+WIN_CR_LF);
- winBuf.append("rem This file was generated by the Jython installer"+WIN_CR_LF);
- winBuf.append("rem Created on " + AT_DATE + " by " + System.getProperty("user.name") + ""+WIN_CR_LF);
+ winBuf.append("@echo off" + WIN_CR_LF);
+ winBuf.append("rem This file was generated by the Jython installer" + WIN_CR_LF);
+ winBuf.append("rem Created on " + AT_DATE + " by " + System.getProperty("user.name") + ""
+ + WIN_CR_LF);
winBuf.append(WIN_CR_LF);
- winBuf.append("set ARGS="+WIN_CR_LF);
+ winBuf.append("set JAVA_HOME=\"");
+ winBuf.append(System.getProperty("java.home"));
+ winBuf.append("\"");
winBuf.append(WIN_CR_LF);
- winBuf.append(":loop"+WIN_CR_LF);
- winBuf.append("if [%1] == [] goto end"+WIN_CR_LF);
- winBuf.append(" set ARGS=%ARGS% %1"+WIN_CR_LF);
- winBuf.append(" shift"+WIN_CR_LF);
- winBuf.append(" goto loop"+WIN_CR_LF);
- winBuf.append(":end"+WIN_CR_LF);
+ winBuf.append("set JYTHON_HOME=\"");
+ winBuf.append(_targetDir.getAbsolutePath());
+ winBuf.append("\"");
winBuf.append(WIN_CR_LF);
-
- _generator.setFlavour(StartScriptGenerator.WINDOWS_FLAVOUR);
- StringBuffer buf = new StringBuffer(100);
- buf.append(winBuf);
- buf.append("\"C:\\java\\bin\\java.exe\" -Dpython.home=\"C:\\target\" -classpath \"C:\\target\\"
- + JarInstaller.JYTHON_JAR + ";%CLASSPATH%\" org.python.util.jython %ARGS%"+WIN_CR_LF);
- assertEquals(buf.toString().replaceAll(AT_DATE, new Date().toString()), _generator
- .getJythonScript(StartScriptGenerator.WINDOWS_FLAVOUR));
-
- buf = new StringBuffer(100);
- buf.append(winBuf);
- buf.append("\"C:\\target\\jython.bat\" \"C:\\target\\Tools\\jythonc\\jythonc.py\" %ARGS%"+WIN_CR_LF);
-// assertEquals(buf.toString().replaceAll(AT_DATE, new Date().toString()), _generator
-// .getJythoncScript(StartScriptGenerator.WINDOWS_FLAVOUR));
+ // some rudimentary tests - feel free to do more
+ String start = winBuf.toString().replaceAll(AT_DATE, new Date().toString());
+ String winScript = _generator.getJythonScript(StartScriptGenerator.WINDOWS_FLAVOUR);
+ assertTrue(winScript.startsWith(start));
+ assertTrue(winScript.length() > 3500);
+ assertTrue(winScript.indexOf("if not [%JAVA_HOME%] == []") > start.length());
+ assertTrue(winScript.indexOf("-Dpython.home=") > start.length());
+ assertTrue(winScript.indexOf("-Dpython.executable=") > start.length());
}
public void testFlavour() {
int expectedFlavour;
-
expectedFlavour = StartScriptGenerator.UNIX_FLAVOUR;
_generator.setFlavour(expectedFlavour);
assertEquals(expectedFlavour, _generator.getFlavour());
-
expectedFlavour = StartScriptGenerator.BOTH_FLAVOUR;
_generator.setFlavour(expectedFlavour);
assertEquals(expectedFlavour, _generator.getFlavour());
-
- TestStartScriptGenerator testGenerator = new TestStartScriptGenerator(new File("dummy"), new File("dummy"),
- false);
+ TestStartScriptGenerator testGenerator = new TestStartScriptGenerator(new File("dummy"),
+ new File("dummy"),
+ false);
expectedFlavour = StartScriptGenerator.WINDOWS_FLAVOUR;
testGenerator.setFlavour(expectedFlavour);
assertEquals(expectedFlavour, testGenerator.getFlavour());
expectedFlavour = StartScriptGenerator.UNIX_FLAVOUR;
testGenerator.setFlavour(expectedFlavour);
assertEquals(expectedFlavour, testGenerator.getFlavour());
-
testGenerator = new TestStartScriptGenerator(new File("dummy"), new File("dummy"), true);
testGenerator.setFlavour(StartScriptGenerator.WINDOWS_FLAVOUR);
assertEquals(StartScriptGenerator.BOTH_FLAVOUR, testGenerator.getFlavour());
@@ -110,21 +115,34 @@
if (!dir.exists()) {
assertTrue(dir.mkdirs());
}
+ File bin = new File(dir, "bin");
+ if (!bin.exists()) {
+ assertTrue(bin.mkdirs());
+ }
+ File jython = new File(bin, "jython");
+ if (!jython.exists()) {
+ assertTrue(jython.createNewFile());
+ }
+ File jython_bat = new File(bin, "jython.bat");
+ if (!jython_bat.exists()) {
+ assertTrue(jython_bat.createNewFile());
+ }
File javaHome = new File(System.getProperty("java.home"));
- TestStartScriptGenerator testGenerator = new TestStartScriptGenerator(dir, javaHome, true);
+ TestStartScriptGenerator testGenerator = new TestStartScriptGenerator(dir,
+ javaHome,
+ true);
// test generator constructor timing problem: do set the flavour once again
testGenerator.setFlavour(StartScriptGenerator.WINDOWS_FLAVOUR);
testGenerator.generateStartScripts();
String[] fileNames = dir.list();
- assertEquals(4, fileNames.length);
- Set fileNamesSet = new HashSet(4);
+ assertEquals(3, fileNames.length); // 2 files plus the /bin subdirectory
+ Set<String> fileNamesSet = new HashSet<String>(4);
for (int i = 0; i < fileNames.length; i++) {
fileNamesSet.add(fileNames[i]);
}
+ assertTrue(fileNamesSet.contains("bin"));
assertTrue(fileNamesSet.contains("jython"));
assertTrue(fileNamesSet.contains("jython.bat"));
- assertTrue(fileNamesSet.contains("jythonc"));
- assertTrue(fileNamesSet.contains("jythonc.bat"));
} finally {
if (dir.exists()) {
rmdir(dir);
@@ -147,6 +165,7 @@
}
class TestStartScriptGenerator extends StartScriptGenerator {
+
private boolean _hasBothFlavours;
public TestStartScriptGenerator(File targetDirectory, File javaHome, boolean hasBothFlavours) {
@@ -158,5 +177,4 @@
return _hasBothFlavours;
}
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|