wlu: cont dev with JUNIT tests
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ConfigExportImport.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ConfigExportImport.java
index e5376e2..cffb8f3 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ConfigExportImport.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ConfigExportImport.java
@@ -42,9 +42,8 @@
}
protected void setUp() throws Exception {
- super.setUp();
-
- loadBaseLibOrBuildBaseWithDefault("Base_0");
+ super.setUp();
+ loadBaseLibOrBuildBaseWithDefault("Paris");
endSetUp();
}
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportBase.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportBase.java
index 06f9505..aa86cbd 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportBase.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportBase.java
@@ -97,13 +97,22 @@
currentBaseLib = null;
String libPath = (String) allLibs.get(name);
if (libPath == null) {
- libPath = testFolder.getAbsolutePath() + File.separator + name;
- currentBaseLib = service.createLibrary(libPath, name);
- if (ifNewThenBuildDeafaultLib) {
- buildDefaultLibrary();
+ libPath = testFolder.getAbsolutePath() + File.separator + name;
+ try {
+ currentBaseLib = service.copyFromTestLibs(libPath, name) ?
+ XMILibraryUtil.openMethodLibrary(libPath) : null;
+ } catch (Exception e) {
+ }
+ if (currentBaseLib == null) {
+ currentBaseLib = service.createLibrary(libPath, name);
+ if (ifNewThenBuildDeafaultLib) {
+ buildDefaultLibrary();
+ }
+ service.trace("Base lib \"" + name + "\" is created.");
+ } else {
+ service.trace("Base lib \"" + name + "\" is copied from testLibs and laoded.");
}
allLibs.put(name, libPath);
- service.trace("Base lib \"" + name + "\" is created.");
} else {
try {
currentBaseLib = XMILibraryUtil.openMethodLibrary(libPath);
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportTestService.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportTestService.java
index 1a9c7ce..c34eb0d 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportTestService.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/ExportImportTestService.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.epf.common.utils.FileUtil;
+import org.eclipse.epf.importing.services.PluginImportingService;
import org.eclipse.epf.library.project.MethodLibraryProject;
import org.eclipse.epf.library.services.SafeUpdateController;
import org.eclipse.epf.library.util.LibraryUtil;
@@ -43,6 +44,10 @@
private static final boolean trace = false;
private static final boolean removeFiles = true;
+ //Hard code for now
+ private static final String testLibsRootDir = "c:" + File.separator + "libs" + File.separator +
+ "TestLibs" + File.separator + "1.0.0" + File.separator;
+
private static final String TEST_PARENT_DIR = System.getProperty("user.home") + File.separator //$NON-NLS-2$
+ "EPF" + File.separator + "test" + File.separator; //$NON-NLS-1$ //$NON-NLS-2$
@@ -136,6 +141,20 @@
return lib[0];
}
+ public boolean copyFromTestLibs(String libPath, String libName) {
+ File libList[] = new File(testLibsRootDir).listFiles();
+ for (int i=0; i<libList.length; i++) {
+ File file = libList[i];
+ if (libName.equals(file.getName())) {
+ File source = new File(testLibsRootDir + libName);
+ File target = new File(libPath);
+ PluginImportingService.copyDir(source, target);
+ return true;
+ }
+ }
+ return false;
+ }
+
public void closeFolder(File folder) {
if (removeFiles) {
trace("Removing: " + folder);
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/PluginExportImport.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/PluginExportImport.java
index 37c0051..42d4970 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/PluginExportImport.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/PluginExportImport.java
@@ -42,9 +42,8 @@
}
protected void setUp() throws Exception {
- super.setUp();
-
- loadBaseLibOrBuildBaseWithDefault("Base_0");
+ super.setUp();
+ loadBaseLibOrBuildBaseWithDefault("Paris");
endSetUp();
}
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/XmlExportImport.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/XmlExportImport.java
index 5242799..1eb6ee8 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/XmlExportImport.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/XmlExportImport.java
@@ -25,9 +25,8 @@
}
protected void setUp() throws Exception {
- super.setUp();
-
- loadBaseLibOrBuildBaseWithDefault("Base_0");
+ super.setUp();
+ loadBaseLibOrBuildBaseWithDefault("Paris");
endSetUp();
}
