wlu: updated
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/iface/TestCommand.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/iface/TestCommand.java
index 7570af3..918cd7d 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/iface/TestCommand.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/iface/TestCommand.java
@@ -21,6 +21,7 @@
*/
public interface TestCommand {
+ String AT_Disable = "disable";
String AT_LibFolderName = "libFolderName";
String AT_ExportFolderName = "exportFolderName";
String AT_ImportFolderName = "importFolderName";
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/impl/LibraryTesterImpl.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/impl/LibraryTesterImpl.java
index 40c5082..2101e08 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/impl/LibraryTesterImpl.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tester/impl/LibraryTesterImpl.java
@@ -204,23 +204,30 @@
public TCExeReplyList execute() {
trace("Begin executing: " + testFile);
+
+ TCExeReplyList result = null;
+ if (loadTest()) {
+ String path = testRootWorking.getAbsolutePath() + File.separator + testFile.getName() + ".dir";
+ openCurrTestDir(new File (path));
+ result = executeCommands();
+ closeCurrTestDir();
+ } {
+ result = new TCExeReplyListImpl();
+ trace("Test disabled");
+ }
- String path = testRootWorking.getAbsolutePath() + File.separator + testFile.getName() + ".dir";
- openCurrTestDir(new File (path));
-
- loadTest();
- TCExeReplyList result = executeCommands();
-
- closeCurrTestDir();
trace("End executing : " + testFile);
return result;
}
- private void loadTest() {
+ private boolean loadTest() {
testCommandList.clear();
try {
Document document = XMLUtil.loadXml(testFile);
Element root = document.getDocumentElement();
+ if (root.getAttribute(TestCommand.AT_Disable).equals("true")) {
+ return false;
+ }
NodeList nodes = root.getChildNodes();
int sz = nodes == null ? 0 : nodes.getLength();
for (int i=0; i<sz; i++) {
@@ -231,7 +238,9 @@
}
} catch (Exception e){
e.printStackTrace();
+ return false;
}
+ return true;
}
public TCExeReplyList executeCommands() {
