Changes in tests: Check for return value.
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index d62b822..e62c593 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 VMware Inc.
+ * Copyright (c) 2009, 2014 VMware Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -462,9 +462,9 @@
this.container.stopWebApplication(handle2);
bundle2.uninstall();
- defaultContextXml.delete();
- defaultHostContextXml.delete();
- tomcatServerXml.delete();
+ assertTrue(defaultContextXml.delete());
+ assertTrue(defaultHostContextXml.delete());
+ assertTrue(tomcatServerXml.delete());
}
}
@@ -631,8 +631,8 @@
this.container.stopWebApplication(handle);
bundle.uninstall();
- tomcatServerXml.delete();
- defaultWebXml.delete();
+ assertTrue(tomcatServerXml.delete());
+ assertTrue(defaultWebXml.delete());
}
}
@@ -679,14 +679,16 @@
bundle.uninstall();
FileSystemUtils.deleteRecursively(webAppDir);
- tomcatServerXml.delete();
- defaultWebXml.delete();
+ assertTrue(tomcatServerXml.delete());
+ assertTrue(defaultWebXml.delete());
}
}
private void createFileWithContent(File file, String content) throws Exception {
- file.getParentFile().mkdirs();
- FileWriter fWriter = null;
+ if (!file.getParentFile().exists()) {
+ assertTrue(file.getParentFile().mkdirs());
+ }
+ FileWriter fWriter = null;
try {
fWriter = new FileWriter(file);
fWriter.write(content);
diff --git a/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocatorTests.java b/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocatorTests.java
index 5bfb142..c18ff23 100755
--- a/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocatorTests.java
+++ b/org.eclipse.gemini.web.tomcat/src/test/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocatorTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 SAP AG
+ * Copyright (c) 2010, 2014 SAP AG
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -84,8 +84,6 @@
URL urlFile2 = new URL(CONFIG_FILE_LOCATION_2);
URL jarFile1 = new URL(JAR_NAME_1);
URL jarFile2 = new URL(JAR_NAME_2);
- URL corruptedJarFile = new URL(CORRUPTED_JAR_NAME);
- new File(corruptedJarFile.getPath()).createNewFile();
byte[] buffer = new byte[1024];
int bytesRead;
