From: Otmar H. <otm...@us...> - 2006-03-28 23:17:24
|
Update of /cvsroot/jython/installer/test/java/org/python/util/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19219/test/java/org/python/util/install Modified Files: InstallerCommandLineTest.java FrameInstallerTest.java Added Files: InstallationTypeTest.java Log Message: added finer control over parts to install - in silent mode - in console mode --- NEW FILE: InstallationTypeTest.java --- package org.python.util.install; import junit.framework.TestCase; public class InstallationTypeTest extends TestCase { private InstallationType _type; protected void setUp() { _type = new InstallationType(); } public void testConstruction() { assertTrue(_type.isStandard()); assertFalse(_type.isMinimum()); assertFalse(_type.isAll()); assertFalse(_type.isStandalone()); } public void testStandard() { _type.setStandard(); assertTrue(_type.isStandard()); assertTrue(_type.installLibraryModules()); assertTrue(_type.installDemosAndExamples()); assertTrue(_type.installDocumentation()); assertFalse(_type.installSources()); assertFalse(_type.isStandalone()); } public void testMinimum() { assertFalse(_type.isMinimum()); _type.setMinimum(); assertTrue(_type.isMinimum()); assertFalse(_type.installLibraryModules()); assertFalse(_type.installDemosAndExamples()); assertFalse(_type.installDocumentation()); assertFalse(_type.installSources()); assertFalse(_type.isStandalone()); } public void testAll() { assertFalse(_type.isAll()); _type.setAll(); assertTrue(_type.isAll()); assertTrue(_type.installLibraryModules()); assertTrue(_type.installDemosAndExamples()); assertTrue(_type.installDocumentation()); assertTrue(_type.installSources()); assertFalse(_type.isStandalone()); } public void testStandalone() { assertFalse(_type.isStandalone()); _type.setStandalone(); assertTrue(_type.isStandalone()); assertFalse(_type.isMinimum()); assertFalse(_type.isStandard()); assertFalse(_type.isAll()); // sure to handle this as follows? assertTrue(_type.installLibraryModules()); assertFalse(_type.installDemosAndExamples()); assertFalse(_type.installDocumentation()); assertFalse(_type.installSources()); } public void testAddRemove() { _type.removeDocumentation(); assertTrue(_type.installLibraryModules()); assertTrue(_type.installDemosAndExamples()); assertFalse(_type.installDocumentation()); assertFalse(_type.installSources()); assertFalse(_type.isMinimum()); assertFalse(_type.isStandard()); assertFalse(_type.isAll()); assertFalse(_type.isStandalone()); _type.removeDemosAndExamples(); assertTrue(_type.installLibraryModules()); assertFalse(_type.installDemosAndExamples()); assertFalse(_type.installDocumentation()); assertFalse(_type.installSources()); assertFalse(_type.isMinimum()); assertFalse(_type.isStandard()); assertFalse(_type.isAll()); assertFalse(_type.isStandalone()); _type.addSources(); assertTrue(_type.installLibraryModules()); assertFalse(_type.installDemosAndExamples()); assertFalse(_type.installDocumentation()); assertTrue(_type.installSources()); assertFalse(_type.isMinimum()); assertFalse(_type.isStandard()); assertFalse(_type.isAll()); assertFalse(_type.isStandalone()); _type.addDocumentation(); assertTrue(_type.installLibraryModules()); assertFalse(_type.installDemosAndExamples()); assertTrue(_type.installDocumentation()); assertTrue(_type.installSources()); assertFalse(_type.isMinimum()); assertFalse(_type.isStandard()); assertFalse(_type.isAll()); assertFalse(_type.isStandalone()); } } Index: InstallerCommandLineTest.java =================================================================== RCS file: /cvsroot/jython/installer/test/java/org/python/util/install/InstallerCommandLineTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstallerCommandLineTest.java 20 Mar 2006 22:45:36 -0000 1.3 --- InstallerCommandLineTest.java 28 Mar 2006 23:17:20 -0000 1.4 *************** *** 39,43 **** assertTrue(commandLine.hasArguments()); ! args = new String[] { "-type", "standard" }; // PosixParser bursts this into -t ype commandLine = new InstallerCommandLine(); assertFalse(commandLine.setArgs(args)); --- 39,43 ---- assertTrue(commandLine.hasArguments()); ! args = new String[] { "-type", "standard" }; commandLine = new InstallerCommandLine(); assertFalse(commandLine.setArgs(args)); *************** *** 84,88 **** assertTrue(commandLine.hasArguments()); ! args = new String[] { "-type" }; // PosixParser bursts -type into -t ype commandLine = new InstallerCommandLine(); assertFalse(commandLine.setArgs(args)); --- 84,88 ---- assertTrue(commandLine.hasArguments()); ! args = new String[] { "-type" }; commandLine = new InstallerCommandLine(); assertFalse(commandLine.setArgs(args)); *************** *** 93,96 **** --- 93,100 ---- assertFalse(commandLine.setArgs(args)); assertTrue(commandLine.hasArguments()); + + args = new String[] { "-" }; + commandLine = new InstallerCommandLine(); + assertFalse(commandLine.setArgs(args)); } *************** *** 196,199 **** --- 200,204 ---- String[] args; InstallerCommandLine commandLine; + InstallationType type; args = new String[] { "-t", "all" }; *************** *** 201,205 **** assertTrue(commandLine.setArgs(args)); assertTrue(commandLine.hasTypeOption()); ! assertEquals(Installation.ALL, commandLine.getInstallationType()); args = new String[] { "--type", "standard" }; --- 206,212 ---- assertTrue(commandLine.setArgs(args)); assertTrue(commandLine.hasTypeOption()); ! type = commandLine.getInstallationType(); ! assertNotNull(type); ! assertTrue(type.isAll()); args = new String[] { "--type", "standard" }; *************** *** 207,211 **** assertTrue(commandLine.setArgs(args)); assertTrue(commandLine.hasTypeOption()); ! assertEquals(Installation.STANDARD, commandLine.getInstallationType()); args = new String[] { "--type", "minimum" }; --- 214,220 ---- assertTrue(commandLine.setArgs(args)); assertTrue(commandLine.hasTypeOption()); ! type = commandLine.getInstallationType(); ! assertNotNull(type); ! assertTrue(type.isStandard()); args = new String[] { "--type", "minimum" }; *************** *** 213,221 **** assertTrue(commandLine.setArgs(args)); assertTrue(commandLine.hasTypeOption()); ! assertEquals(Installation.MINIMUM, commandLine.getInstallationType()); assertNull(commandLine.getJavaHome()); } public void testJavaHome() { String[] args; --- 222,356 ---- assertTrue(commandLine.setArgs(args)); assertTrue(commandLine.hasTypeOption()); ! type = commandLine.getInstallationType(); ! assertNotNull(type); ! assertTrue(type.isMinimum()); ! ! args = new String[] { "--type", "standalone" }; ! commandLine = new InstallerCommandLine(); ! assertTrue(commandLine.setArgs(args)); ! assertTrue(commandLine.hasTypeOption()); ! type = commandLine.getInstallationType(); ! assertNotNull(type); ! assertTrue(type.isStandalone()); assertNull(commandLine.getJavaHome()); } + public void testInclude() { + String[] args; + InstallerCommandLine commandLine; + InstallationType type; + + args = new String[] { "-t", "minimum", "-i", "mod" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasIncludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertTrue(type.installLibraryModules()); + assertFalse(type.installDemosAndExamples()); + assertFalse(type.installDocumentation()); + assertFalse(type.installSources()); + + args = new String[] { "-t", "minimum", "-i", "mod", "demo" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasIncludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertTrue(type.installLibraryModules()); + assertTrue(type.installDemosAndExamples()); + assertFalse(type.installDocumentation()); + assertFalse(type.installSources()); + + args = new String[] { "-t", "minimum", "-i", "mod", "demo", "doc" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasIncludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertTrue(type.installLibraryModules()); + assertTrue(type.installDemosAndExamples()); + assertTrue(type.installDocumentation()); + assertFalse(type.installSources()); + + args = new String[] { "-t", "minimum", "--include", "mod", "demo", "doc", "src" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasIncludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertTrue(type.installLibraryModules()); + assertTrue(type.installDemosAndExamples()); + assertTrue(type.installDocumentation()); + assertTrue(type.installSources()); + + args = new String[] { "-i", "modulo" }; + commandLine = new InstallerCommandLine(); + assertFalse(commandLine.setArgs(args)); + } + + public void testExclude() { + String[] args; + InstallerCommandLine commandLine; + InstallationType type; + + args = new String[] { "-t", "all", "-e", "mod" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasExcludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertFalse(type.installLibraryModules()); + assertTrue(type.installDemosAndExamples()); + assertTrue(type.installDocumentation()); + assertTrue(type.installSources()); + + args = new String[] { "-t", "all", "-e", "mod", "demo" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasExcludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertFalse(type.installLibraryModules()); + assertFalse(type.installDemosAndExamples()); + assertTrue(type.installDocumentation()); + assertTrue(type.installSources()); + + args = new String[] { "-t", "all", "-e", "mod", "demo", "doc" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasExcludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertFalse(type.installLibraryModules()); + assertFalse(type.installDemosAndExamples()); + assertFalse(type.installDocumentation()); + assertTrue(type.installSources()); + + args = new String[] { "-t", "all", "--exclude", "mod", "demo", "doc", "src" }; + commandLine = new InstallerCommandLine(); + assertTrue(commandLine.setArgs(args)); + assertTrue(commandLine.hasExcludeOption()); + type = commandLine.getInstallationType(); + assertNotNull(type); + assertFalse(type.isStandalone()); + assertFalse(type.installLibraryModules()); + assertFalse(type.installDemosAndExamples()); + assertFalse(type.installDocumentation()); + assertFalse(type.installSources()); + + args = new String[] { "--exclude", "sources" }; + commandLine = new InstallerCommandLine(); + assertFalse(commandLine.setArgs(args)); + } + public void testJavaHome() { String[] args; *************** *** 264,268 **** assertEquals("dir", commandLine.getTargetDirectory().getName()); assertTrue(commandLine.hasTypeOption()); ! assertEquals(Installation.STANDARD, commandLine.getInstallationType()); assertTrue(commandLine.hasJavaHomeOption()); assertEquals("java", commandLine.getJavaHome().getName()); --- 399,424 ---- assertEquals("dir", commandLine.getTargetDirectory().getName()); assertTrue(commandLine.hasTypeOption()); ! assertNotNull(commandLine.getInstallationType()); ! assertTrue(commandLine.getInstallationType().installDemosAndExamples()); ! assertTrue(commandLine.getInstallationType().installDocumentation()); ! assertTrue(commandLine.getInstallationType().installLibraryModules()); ! assertFalse(commandLine.getInstallationType().installSources()); ! assertTrue(commandLine.hasJavaHomeOption()); ! assertEquals("java", commandLine.getJavaHome().getName()); ! assertTrue(commandLine.hasVerboseOption()); ! ! args = new String[] { "-s", "-d", "dir", "-t", "standard", "-e", "doc", "demo", "-i", "src", "-j", "java", "-v" }; ! commandLine = new InstallerCommandLine(); ! assertTrue(commandLine.setArgs(args)); ! assertTrue(commandLine.hasSilentOption()); ! assertTrue(commandLine.hasDirectoryOption()); ! assertNotNull(commandLine.getTargetDirectory()); ! assertEquals("dir", commandLine.getTargetDirectory().getName()); ! assertTrue(commandLine.hasTypeOption()); ! assertNotNull(commandLine.getInstallationType()); ! assertFalse(commandLine.getInstallationType().installDemosAndExamples()); ! assertFalse(commandLine.getInstallationType().installDocumentation()); ! assertTrue(commandLine.getInstallationType().installLibraryModules()); ! assertTrue(commandLine.getInstallationType().installSources()); assertTrue(commandLine.hasJavaHomeOption()); assertEquals("java", commandLine.getJavaHome().getName()); Index: FrameInstallerTest.java =================================================================== RCS file: /cvsroot/jython/installer/test/java/org/python/util/install/FrameInstallerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FrameInstallerTest.java 20 Mar 2006 21:56:04 -0000 1.1 --- FrameInstallerTest.java 28 Mar 2006 23:17:20 -0000 1.2 *************** *** 7,11 **** public class FrameInstallerTest extends TestCase { ! public void testSetJavaVersionInfo() { String version = "1;2;3"; String vendor = "jython [macrosystems]"; --- 7,11 ---- public class FrameInstallerTest extends TestCase { ! public void testJavaVersionInfo() { String version = "1;2;3"; String vendor = "jython [macrosystems]"; *************** *** 20,23 **** --- 20,24 ---- JavaVersionInfo returnedInfo = FrameInstaller.getJavaVersionInfo(); + assertNotNull(returnedInfo); assertEquals(version, returnedInfo.getVersion()); assertEquals(vendor, returnedInfo.getVendor()); *************** *** 25,27 **** --- 26,44 ---- } + public void testInstallationType() { + InstallationType installationType = new InstallationType(); + installationType.addLibraryModules(); + installationType.removeDemosAndExamples(); + installationType.removeDocumentation(); + installationType.addSources(); + + FrameInstaller.setInstallationType(installationType); + InstallationType returnedType = FrameInstaller.getInstallationType(); + + assertNotNull(returnedType); + assertTrue(returnedType.installLibraryModules()); + assertFalse(returnedType.installDemosAndExamples()); + assertFalse(returnedType.installDocumentation()); + assertTrue(returnedType.installSources()); + } } |