|
From: <man...@us...> - 2011-08-03 23:24:39
|
Revision: 6338
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6338&view=rev
Author: manningr
Date: 2011-08-03 23:24:32 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Patch #3385853 (Fix failing tests on OSX): Tested that this patch also works for Windows. Hudson will verify on Linux.
Modified Paths:
--------------
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileWrapperImplTest.java
Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java 2011-08-02 00:04:52 UTC (rev 6337)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java 2011-08-03 23:24:32 UTC (rev 6338)
@@ -19,7 +19,6 @@
import java.io.File;
import java.io.FileFilter;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -435,13 +434,6 @@
// Test create an illegal file
String sep = File.separator;
- f1 = new FileWrapperImpl(sep + "..");
- try {
- f1.createNewFile();
- fail("should throw IOE");
- } catch (IOException e) {
- // expected;
- }
f1 = new FileWrapperImpl(sep + "a" + sep + ".." + sep + ".." + sep);
try {
f1.createNewFile();
@@ -663,83 +655,7 @@
assertTrue("Directory Was Not Deleted", !dir.exists());
}
- // GCH
- // TODO : This test passes on Windows but fails on Linux with a
- // java.lang.NoClassDefFoundError. Temporarily removing from the test
- // suite while I investigate the cause.
- // /**
- // * @tests java.io.File#deleteOnExit()
- // */
- // public void test_deleteOnExit() {
- // File f1 = new FileWrapperImpl(System.getProperty("java.io.tmpdir"), platformId
- // + "deleteOnExit.tst");
- // try {
- // FileOutputStream fos = new FileOutputStream(f1);
- // fos.close();
- // } catch (IOException e) {
- // fail("Unexpected IOException During Test : " + e.getMessage());
- // }
- // assertTrue("File Should Exist.", f1.exists());
- //
- // try {
- // Support_Exec.execJava(new String[] {
- // "tests.support.Support_DeleteOnExitTest", f1.getPath() },
- // null, true);
- // } catch (IOException e) {
- // fail("Unexpected IOException During Test + " + e.getMessage());
- // } catch (InterruptedException e) {
- // fail("Unexpected InterruptedException During Test: " + e);
- // }
- //
- // boolean gone = !f1.exists();
- // f1.delete();
- // assertTrue("File Should Already Be Deleted.", gone);
- // }
-
/**
- * @tests java.io.File#equals(java.lang.Object)
- */
- public void test_equalsLjava_lang_Object() throws IOException {
- FileWrapper f1 = new FileWrapperImpl("filechk.tst");
- FileWrapper f2 = new FileWrapperImpl("filechk.tst");
- FileWrapper f3 = new FileWrapperImpl("xxxx");
-
- assertTrue("Equality test failed", f1.equals(f2));
- assertTrue("Files Should Not Return Equal.", !f1.equals(f3));
-
- f3 = new FileWrapperImpl("FiLeChK.tst");
- boolean onWindows = File.separatorChar == '\\';
- boolean onUnix = File.separatorChar == '/';
- if (onWindows) {
- assertTrue("Files Should Return Equal.", f1.equals(f3));
- } else if (onUnix) {
- assertTrue("Files Should NOT Return Equal.", !f1.equals(f3));
- }
-
- f1 = new FileWrapperImpl(System.getProperty("java.io.tmpdir"), "casetest.tmp");
- f2 = new FileWrapperImpl(System.getProperty("java.io.tmpdir"), "CaseTest.tmp");
- new FileOutputStream(f1.getAbsolutePath()).close(); // create the file
- if (f1.equals(f2)) {
- try {
- FileInputStream fis = new FileInputStream(f2.getAbsolutePath());
- fis.close();
- } catch (IOException e) {
- fail("File system is case sensitive");
- }
- } else {
- boolean exception = false;
- try {
- FileInputStream fis = new FileInputStream(f2.getAbsolutePath());
- fis.close();
- } catch (IOException e) {
- exception = true;
- }
- assertTrue("File system is case insensitive", exception);
- }
- f1.delete();
- }
-
- /**
* @tests java.io.File#exists()
*/
public void test_exists() throws IOException {
Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileWrapperImplTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileWrapperImplTest.java 2011-08-02 00:04:52 UTC (rev 6337)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileWrapperImplTest.java 2011-08-03 23:24:32 UTC (rev 6338)
@@ -21,6 +21,8 @@
import static org.junit.Assert.assertEquals;
+import java.io.File;
+
import net.sourceforge.squirrel_sql.BaseSQuirreLJUnit4TestCase;
import org.junit.After;
@@ -51,13 +53,11 @@
@Test
public void testGetAbsolutePath() {
- // Don't fail if the only difference is a slash on the end of the path
- if (!classUnderTest.getAbsolutePath().endsWith("\\") && tmpDir.endsWith("\\"))
- {
- assertEquals(tmpDir, classUnderTest.getAbsolutePath()+"\\");
- } else {
- assertEquals(tmpDir, classUnderTest.getAbsolutePath());
- }
+ // Don't fail if the only difference is a name separator on the end of the path
+ assertEquals(
+ withoutTrailingSeparator(tmpDir),
+ withoutTrailingSeparator(classUnderTest.getAbsolutePath()));
+
}
@Test
@@ -71,4 +71,14 @@
new EqualsTester(a, b, c, d);
}
+ private String withoutTrailingSeparator(String path)
+ {
+ if(path.endsWith(File.separator))
+ {
+ return path.substring(0,path.length()-1);
+ } else {
+ return path;
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
