Author: dain Date: Wed Jan 5 11:10:49 2005 New Revision: 124248 URL: http://svn.apache.org/viewcvs?view=rev&rev=124248 Log: Fixed cross platform problem with testing absolute paths.
Modified: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java Modified: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java?view=diff&rev=124248&p1=geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java&r1=124247&p2=geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java&r2=124248 ============================================================================== --- geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java (original) +++ geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java Wed Jan 5 11:10:49 2005 @@ -1,93 +1,93 @@ -/** - * - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.geronimo.system.serverinfo; - -import java.io.File; -import java.io.IOException; - -import junit.framework.TestCase; - -/** - * @version $Rev$ $Date$ - */ -public class ServerInfoTest extends TestCase { - - public final void testResolvePath() { - ServerInfo si = null; - - String pathArg; - { - si = new ServerInfo(); - pathArg = "/"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - pathArg = "/x"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - pathArg = "/x/y"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - pathArg = "C:/Documents and Settings/Administrator/Application Data/geronimo"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - - pathArg = "."; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - pathArg = "x"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - pathArg = "x/y"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - pathArg = "Documents and Settings/Administrator/Application Data/geronimo"; - assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - } - - try { - String basedir = "/"; - si = new ServerInfo(basedir); - pathArg = "Documents and Settings/Administrator/Application Data/geronimo"; - assertEquals(new File(basedir, pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - } catch (Exception e) { - fail("ServerInfo ctor threw exception " + e); - } - - try { - String basedir = "C:/"; - si = new ServerInfo(basedir); - pathArg = "Documents and Settings/Administrator/Application Data/geronimo"; - assertEquals(new File(basedir, pathArg).getAbsolutePath(), si.resolvePath(pathArg)); - } catch (Exception e) { - fail("ServerInfo ctor threw exception " + e); - } - } - - public final void testServerInfo() throws Exception { - File file; - try { - file = File.createTempFile("geronimo", null); - // a workaround - ServerInfo sets system-wide property - System.setProperty("geronimo.base.dir", file.getName()); - new ServerInfo(file.getName()); - fail("ServerInfo should throw exception when given non-directory path"); - } catch (IOException ioe) { - fail(ioe.getMessage()); - } catch (Exception expected) { - } - - String basedir = "."; - // a workaround - ServerInfo sets system-wide property - System.setProperty("geronimo.base.dir", basedir); - ServerInfo si = new ServerInfo(basedir); - assertNotNull(System.getProperty("geronimo.base.dir")); - assertEquals("base directory is incorrect", basedir, si.getBaseDirectory()); - } -} +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.geronimo.system.serverinfo; + +import java.io.File; +import java.io.IOException; + +import junit.framework.TestCase; + +/** + * @version $Rev$ $Date$ + */ +public class ServerInfoTest extends TestCase { + + public final void testResolvePath() { + ServerInfo si = null; + + String pathArg; + { + si = new ServerInfo(); + pathArg = "/"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + pathArg = "/x"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + pathArg = "/x/y"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + pathArg = "C:/Documents and Settings/Administrator/Application Data/geronimo"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + + pathArg = "."; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + pathArg = "x"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + pathArg = "x/y"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + pathArg = "Documents and Settings/Administrator/Application Data/geronimo"; + assertEquals(new File(pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + } + + try { + String basedir = "/"; + si = new ServerInfo(basedir); + pathArg = "Documents and Settings/Administrator/Application Data/geronimo"; + assertEquals(new File(basedir, pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + } catch (Exception e) { + fail("ServerInfo ctor threw exception " + e); + } + + try { + String basedir = File.listRoots()[0].getAbsolutePath(); + si = new ServerInfo(basedir); + pathArg = "Documents and Settings/Administrator/Application Data/geronimo"; + assertEquals(new File(basedir, pathArg).getAbsolutePath(), si.resolvePath(pathArg)); + } catch (Exception e) { + fail("ServerInfo ctor threw exception " + e); + } + } + + public final void testServerInfo() throws Exception { + File file; + try { + file = File.createTempFile("geronimo", null); + // a workaround - ServerInfo sets system-wide property + System.setProperty("geronimo.base.dir", file.getName()); + new ServerInfo(file.getName()); + fail("ServerInfo should throw exception when given non-directory path"); + } catch (IOException ioe) { + fail(ioe.getMessage()); + } catch (Exception expected) { + } + + String basedir = "."; + // a workaround - ServerInfo sets system-wide property + System.setProperty("geronimo.base.dir", basedir); + ServerInfo si = new ServerInfo(basedir); + assertNotNull(System.getProperty("geronimo.base.dir")); + assertEquals("base directory is incorrect", basedir, si.getBaseDirectory()); + } +}
