Code warnings cleanup.
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/META-INF/MANIFEST.MF
index b7e696a..93ac61d 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/META-INF/MANIFEST.MF
@@ -27,5 +27,6 @@
org.eclipse.wst.validation,
org.eclipse.wst.xml.core,
org.junit,
- org.eclipse.jst.jsf.facesconfig
-Eclipse-AutoStart: true
+ org.eclipse.jst.jsf.facesconfig,
+ org.eclipse.wst.common.tests.collector
+Eclipse-LazyStart: true
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigElementsTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigElementsTest.java
index 6209e86..1ae832a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigElementsTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigElementsTest.java
@@ -32,7 +32,7 @@
protected void setUp() throws Exception {
super.setUp();
- project = WizardUtil.getTestProject();
+ project = WizardUtil.getTestProject(getName());
}
public static Test suite() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadApplication.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadApplication.java
index 3b6ca5b..89b5dc6 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadApplication.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadApplication.java
@@ -32,8 +32,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeComponent.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeComponent.java
index 33835d0..f0c9585 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeComponent.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeComponent.java
@@ -31,8 +31,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeConverter.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeConverter.java
index 9abd2cf..a824d08 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeConverter.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeConverter.java
@@ -33,8 +33,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeValidator.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeValidator.java
index d58dae9..bb9a81f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeValidator.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadAttributeValidator.java
@@ -34,8 +34,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadEmptyNavigationRule.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadEmptyNavigationRule.java
index 2891822..3d4b9a0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadEmptyNavigationRule.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadEmptyNavigationRule.java
@@ -29,8 +29,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
* The following method is used to test for the empty
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadManagedBeanManagedProperty.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadManagedBeanManagedProperty.java
index af761b6..6d2e23e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadManagedBeanManagedProperty.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadManagedBeanManagedProperty.java
@@ -33,8 +33,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadRenderer.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadRenderer.java
index 085d34a..6fa21fc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadRenderer.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadRenderer.java
@@ -31,8 +31,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationCase.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationCase.java
index fd056c2..7fc99a0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationCase.java
@@ -31,8 +31,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationRule.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationRule.java
index 590a7ec..fab6e7c 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationRule.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingeNavigationRule.java
@@ -33,8 +33,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleComponent.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleComponent.java
index 7477321..195280e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleComponent.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleComponent.java
@@ -31,8 +31,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleConverter.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleConverter.java
index 3457b9c..69b808e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleConverter.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleConverter.java
@@ -34,8 +34,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleFactory.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleFactory.java
index d266667..c7187b8 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleFactory.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleFactory.java
@@ -33,8 +33,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleLifecycle.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleLifecycle.java
index 35ed15e..f73bf6c 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleLifecycle.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleLifecycle.java
@@ -31,8 +31,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleManagedBean.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleManagedBean.java
index f406831..5aa67e5 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleManagedBean.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleManagedBean.java
@@ -33,8 +33,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleReferencedBean.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleReferencedBean.java
index bdb4e28..63dadb8 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleReferencedBean.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleReferencedBean.java
@@ -31,8 +31,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleRenderKit.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleRenderKit.java
index 27836dc..e60559f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleRenderKit.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleRenderKit.java
@@ -32,8 +32,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleValidator.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleValidator.java
index ded383b..bdbf55d 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleValidator.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForReadSingleValidator.java
@@ -32,8 +32,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplication.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplication.java
index c16f214..2790ccb 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplication.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplication.java
@@ -43,8 +43,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
* Do the writing here to all the attributes
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplicationTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplicationTwoFiles.java
index 0b25154..3d001bb 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplicationTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteApplicationTwoFiles.java
@@ -57,8 +57,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
* Do the writing here to all the attributes
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponent.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponent.java
index 89461a0..c25f0c6 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponent.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponent.java
@@ -21,7 +21,6 @@
import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
import org.eclipse.jst.jsf.facesconfig.emf.ComponentTypeType;
import org.eclipse.jst.jsf.facesconfig.emf.DefaultValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
@@ -43,8 +42,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteComponent() {
@@ -150,7 +149,7 @@
edit.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -160,8 +159,9 @@
ComponentType comp = (ComponentType) components.get(i);
EList descr = comp.getDescription();
for (int j=0; j<descr.size(); j++) {
- DescriptionType phaseListener = (DescriptionType)descr.get(j);
- result = phaseListener.getLang();
+ // TODO: ???
+ //DescriptionType phaseListener = (DescriptionType)descr.get(j);
+ //result = phaseListener.getLang();
break;
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponentTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponentTwoFiles.java
index cd5d602..71ffb45 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponentTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteComponentTwoFiles.java
@@ -51,8 +51,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteComponent() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverter.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverter.java
index f246ccc..53f62da 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverter.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverter.java
@@ -38,8 +38,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteApplication() {
@@ -124,7 +124,7 @@
edit.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -134,8 +134,9 @@
ConverterType lifecycle = (ConverterType) lifecycles.get(i);
EList phaseListeners = lifecycle.getDisplayName();
for (int j=0; j<phaseListeners.size(); j++) {
- DisplayNameType phaseListener = (DisplayNameType)phaseListeners.get(j);
- result = phaseListener.getTextContent();
+ // TODO: ??
+// DisplayNameType phaseListener = (DisplayNameType)phaseListeners.get(j);
+// result = phaseListener.getTextContent();
break;
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverterTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverterTwoFiles.java
index a225c82..e782f9a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverterTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteConverterTwoFiles.java
@@ -59,8 +59,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteApplication() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactory.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactory.java
index cf09bc9..af32715 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactory.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactory.java
@@ -40,8 +40,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteFacesconfigFile() {
@@ -89,7 +89,7 @@
edit.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -99,8 +99,9 @@
FactoryType lifecycle = (FactoryType) lifecycles.get(i);
EList phaseListeners = lifecycle.getApplicationFactory();
for (int j=0; j<phaseListeners.size(); j++) {
- ApplicationFactoryType phaseListener = (ApplicationFactoryType)phaseListeners.get(j);
- result = phaseListener.getTextContent();
+ //TODO:??
+ // ApplicationFactoryType phaseListener = (ApplicationFactoryType)phaseListeners.get(j);
+ //result = phaseListener.getTextContent();
break;
}
}
@@ -117,7 +118,7 @@
public void testWriteFactoryFacesContextFactory() {
//IProject project = WizardUtil.getTestProject();
FacesConfigArtifactEdit edit = null;
- String sTestString = "";
+ //String sTestString = "";
String facesContextFactory=null;
@@ -147,7 +148,7 @@
edit.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -157,8 +158,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList facescContextFactories = factory.getFacesContextFactory();
for (int j=0; j<facescContextFactories.size(); j++) {
- FacesContextFactoryType faacesContext = (FacesContextFactoryType)facescContextFactories.get(j);
- result = faacesContext.getTextContent();
+ // TODO:???
+// FacesContextFactoryType faacesContext = (FacesContextFactoryType)facescContextFactories.get(j);
+// result = faacesContext.getTextContent();
break;
}
}
@@ -174,7 +176,7 @@
public void testWriteFactoryLifecycleFactory() {
//IProject project = WizardUtil.getTestProject();
FacesConfigArtifactEdit edit = null;
- String sTestString = "";
+ //String sTestString = "";
String lifecycleFactory=null;
@@ -204,7 +206,7 @@
edit.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -214,8 +216,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList lifecycleFactories = factory.getLifecycleFactory();
for (int j=0; j<lifecycleFactories.size(); j++) {
- LifecycleFactoryType lifecyle = (LifecycleFactoryType)lifecycleFactories.get(j);
- result = lifecyle.getTextContent();
+ // TODO: ???
+// LifecycleFactoryType lifecyle = (LifecycleFactoryType)lifecycleFactories.get(j);
+// result = lifecyle.getTextContent();
break;
}
}
@@ -234,7 +237,7 @@
public void testWriteRednderKitFactory() {
//IProject project = WizardUtil.getTestProject();
FacesConfigArtifactEdit edit = null;
- String sTestString = "";
+ //String sTestString = "";
String renderKitFactory=null;
renderKitFactory = "render-kit-factory";
@@ -260,7 +263,7 @@
edit.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -270,8 +273,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList renderKitFactories = factory.getRenderKitFactory();
for (int j=0; j<renderKitFactories.size(); j++) {
- RenderKitFactoryType render = (RenderKitFactoryType)renderKitFactories.get(j);
- result = render.getTextContent();
+ // TODO: ???
+// RenderKitFactoryType render = (RenderKitFactoryType)renderKitFactories.get(j);
+// result = render.getTextContent();
break;
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactoryTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactoryTwoFiles.java
index c47aaf1..415af89 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactoryTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteFactoryTwoFiles.java
@@ -35,10 +35,10 @@
FacesConfigArtifactEdit edit1 = null;
FacesConfigArtifactEdit edit2 = null;
- String applicationFactory = "application-factory";
- String facesContext = "Faces-Contexto";
- String lifecyclefactory = "lifecycle-factory";
- String renderKitFactory = "render-kit-factory";
+ private static final String applicationFactory = "application-factory";
+ private static final String facesContext = "Faces-Contexto";
+ private static final String lifecyclefactory = "lifecycle-factory";
+ private static final String renderKitFactory = "render-kit-factory";
public FacesConfigFactoryImplForWriteFactoryTwoFiles(String name) {
@@ -47,8 +47,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteFacesconfigFile() {
@@ -91,7 +91,7 @@
edit2.dispose();
}
}
- String result = null;
+
try {
edit2 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -102,7 +102,9 @@
EList appFactList = facto.getApplicationFactory();
for (int j=0; j<appFactList.size(); j++) {
ApplicationFactoryType app = (ApplicationFactoryType)appFactList.get(j);
- result = app.getTextContent();
+ String result = app.getTextContent();
+ assertEquals(result, applicationFactory);
+ // TODO: eliminate loop and assertEquals(1, appFactList.size())?
break;
}
}
@@ -157,7 +159,7 @@
edit1.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit1 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -167,8 +169,9 @@
FactoryType lifecycle = (FactoryType) lifecycles.get(i);
EList phaseListeners = lifecycle.getApplicationFactory();
for (int j=0; j<phaseListeners.size(); j++) {
- ApplicationFactoryType phaseListener = (ApplicationFactoryType)phaseListeners.get(j);
- result = phaseListener.getTextContent();
+ // TODO: ???
+// ApplicationFactoryType phaseListener = (ApplicationFactoryType)phaseListeners.get(j);
+// result = phaseListener.getTextContent();
break;
}
}
@@ -216,7 +219,7 @@
edit2.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit2 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -226,8 +229,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList facescContextFactories = factory.getFacesContextFactory();
for (int j=0; j<facescContextFactories.size(); j++) {
- FacesContextFactoryType faacesContext = (FacesContextFactoryType)facescContextFactories.get(j);
- result = faacesContext.getTextContent();
+ // TODO:???
+// FacesContextFactoryType faacesContext = (FacesContextFactoryType)facescContextFactories.get(j);
+// result = faacesContext.getTextContent();
break;
}
}
@@ -273,7 +277,7 @@
edit1.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit1 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -283,8 +287,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList facescContextFactories = factory.getFacesContextFactory();
for (int j=0; j<facescContextFactories.size(); j++) {
- FacesContextFactoryType faacesContext = (FacesContextFactoryType)facescContextFactories.get(j);
- result = faacesContext.getTextContent();
+ // TODO: ??
+// FacesContextFactoryType faacesContext = (FacesContextFactoryType)facescContextFactories.get(j);
+// result = faacesContext.getTextContent();
break;
}
}
@@ -328,7 +333,7 @@
edit2.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit2 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -338,8 +343,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList lifecycleFactories = factory.getLifecycleFactory();
for (int j=0; j<lifecycleFactories.size(); j++) {
- LifecycleFactoryType lifecyle = (LifecycleFactoryType)lifecycleFactories.get(j);
- result = lifecyle.getTextContent();
+ // TODO: ???
+// LifecycleFactoryType lifecyle = (LifecycleFactoryType)lifecycleFactories.get(j);
+// result = lifecyle.getTextContent();
break;
}
}
@@ -388,7 +394,7 @@
edit1.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit1 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config1.xml");
@@ -398,8 +404,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList lifecycleFactories = factory.getLifecycleFactory();
for (int j=0; j<lifecycleFactories.size(); j++) {
- LifecycleFactoryType lifecyle = (LifecycleFactoryType)lifecycleFactories.get(j);
- result = lifecyle.getTextContent();
+ // TODO: ???
+// LifecycleFactoryType lifecyle = (LifecycleFactoryType)lifecycleFactories.get(j);
+// result = lifecyle.getTextContent();
break;
}
}
@@ -418,9 +425,7 @@
//IProject project = WizardUtil.getTestProject();
//FacesConfigArtifactEdit edit1 = null;
- String renderKitFactory=null;
-
- renderKitFactory = "render-kit-factory";
+ final String renderKitFactory1= "render-kit-factory";
try {
edit2 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForWrite(
project, "WEB-INF/faces-config2.xml");
@@ -432,7 +437,7 @@
RenderKitFactoryType renderKitFact = facesConfigFactory.createRenderKitFactoryType();
- renderKitFact.setTextContent(renderKitFactory);
+ renderKitFact.setTextContent(renderKitFactory1);
newfactory.getRenderKitFactory().add(renderKitFact);
edit2.getFacesConfig().getFactory().add(newfactory);
@@ -443,7 +448,7 @@
edit2.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit2 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -453,8 +458,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList renderKitFactories = factory.getRenderKitFactory();
for (int j=0; j<renderKitFactories.size(); j++) {
- RenderKitFactoryType render = (RenderKitFactoryType)renderKitFactories.get(j);
- result = render.getTextContent();
+ // TODO: ????
+// RenderKitFactoryType render = (RenderKitFactoryType)renderKitFactories.get(j);
+// result = render.getTextContent();
break;
}
}
@@ -474,9 +480,7 @@
//IProject project = WizardUtil.getTestProject();
//FacesConfigArtifactEdit edit1 = null;
- String renderKitFactory=null;
-
- renderKitFactory = "render-kit-factory";
+ final String renderKitFactory1="render-kit-factory";
try {
edit1 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForWrite(
project, "WEB-INF/faces-config1.xml");
@@ -488,7 +492,7 @@
RenderKitFactoryType renderKitFact = facesConfigFactory.createRenderKitFactoryType();
- renderKitFact.setTextContent(renderKitFactory);
+ renderKitFact.setTextContent(renderKitFactory1);
newfactory.getRenderKitFactory().add(renderKitFact);
edit1.getFacesConfig().getFactory().add(newfactory);
@@ -499,7 +503,7 @@
edit1.dispose();
}
}
- String result = null;
+ //String result = null;
try {
edit1 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -509,8 +513,9 @@
FactoryType factory = (FactoryType) factories.get(i);
EList renderKitFactories = factory.getRenderKitFactory();
for (int j=0; j<renderKitFactories.size(); j++) {
- RenderKitFactoryType render = (RenderKitFactoryType)renderKitFactories.get(j);
- result = render.getTextContent();
+ // TODO: ???
+// RenderKitFactoryType render = (RenderKitFactoryType)renderKitFactories.get(j);
+// result = render.getTextContent();
break;
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycle.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycle.java
index 350b1a9..225b558 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycle.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycle.java
@@ -14,7 +14,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationFactoryType;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
@@ -31,8 +30,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteLifecycleToFileTwo() {
@@ -64,7 +63,7 @@
edit.dispose();
}
}
- String result = null;
+ //TODO: never read. String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -74,9 +73,10 @@
FactoryType lifecycle = (FactoryType) lifecycles.get(i);
EList phaseListeners = lifecycle.getApplicationFactory();
for (int j = 0; j < phaseListeners.size(); j++) {
- ApplicationFactoryType phaseLis = (ApplicationFactoryType) phaseListeners
- .get(j);
- result = phaseLis.getTextContent();
+ //ApplicationFactoryType phaseLis = (ApplicationFactoryType) phaseListeners
+ // .get(j);
+ // TODO: what's the point?
+ // result = phaseLis.getTextContent();
break;
}
}
@@ -118,7 +118,7 @@
edit1.dispose();
}
}
- String result = null;
+ // TODO: never read: String result = null;
try {
edit1 = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config1.xml");
@@ -128,9 +128,10 @@
FactoryType lifecycle = (FactoryType) lifecycles.get(i);
EList phaseListeners = lifecycle.getApplicationFactory();
for (int j = 0; j < phaseListeners.size(); j++) {
- ApplicationFactoryType phaseLis = (ApplicationFactoryType) phaseListeners
- .get(j);
- result = phaseLis.getTextContent();
+ //TODO: what's the point of this?
+// ApplicationFactoryType phaseLis = (ApplicationFactoryType) phaseListeners
+// .get(j);
+// result = phaseLis.getTextContent();
break;
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycleTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycleTwoFiles.java
index 9678df8..177ba67 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycleTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteLifecycleTwoFiles.java
@@ -28,8 +28,8 @@
FacesConfigArtifactEdit edit1 = null;
FacesConfigArtifactEdit edit2 = null;
- String phaseListener1 = "test1";
- String phaseListener2 = "test2";
+ private final String phaseListener1 = "test1";
+ private final String phaseListener2 = "test2";
public FacesConfigFactoryImplForWriteLifecycleTwoFiles(String name) {
super(name);
@@ -37,8 +37,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteToFileTwo() {
@@ -70,6 +70,7 @@
project, "WEB-INF/faces-config2.xml");
if (edit2.getFacesConfig() != null) {
EList lifecycles = edit2.getFacesConfig().getLifecycle();
+ boolean foundPhaseListener2 = false;
for (int i = 0; i < lifecycles.size(); i++) {
LifecycleType lifecycle = (LifecycleType) lifecycles.get(i);
EList phaseListeners = lifecycle.getPhaseListener();
@@ -77,10 +78,14 @@
PhaseListenerType phaseLis = (PhaseListenerType)phaseListeners.get(j);
result = phaseLis.getTextContent();
System.out.println("The PhaseListener in lifecycle is (for file two) " + result);
- assertEquals(phaseListener2,result);
- break;
+ if (phaseListener2.equals(result))
+ {
+ foundPhaseListener2 = true;
+ break;
+ }
}
}
+ assertTrue(foundPhaseListener2);
}
} finally {
//assertTrue(result != null && result.equals(sTestString));
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBean.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBean.java
index 1122263..e7792cf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBean.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBean.java
@@ -41,8 +41,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteManagedBean() {
@@ -131,7 +131,7 @@
edit.dispose();
}
}
- String result = null;
+ // TODO: never read String result = null;
try {
edit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(
project, "WEB-INF/faces-config2.xml");
@@ -141,8 +141,9 @@
ValidatorType lifecycle = (ValidatorType) lifecycles.get(i);
EList phaseListeners = lifecycle.getDisplayName();
for (int j=0; j<phaseListeners.size(); j++) {
- DisplayNameType phaseListener = (DisplayNameType)phaseListeners.get(j);
- result = phaseListener.getTextContent();
+ // TODO: never used?DisplayNameType phaseListener = (DisplayNameType)phaseListeners.get(j);
+ // TODO: never tested? result = phaseListener.getTextContent();
+ // TODO: this break kills loop after 1 iteration?
break;
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBeanTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBeanTwoFiles.java
index a8d5e8a..a9254b2 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBeanTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteManagedBeanTwoFiles.java
@@ -43,8 +43,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteManagedBean() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRule.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRule.java
index 2cb6a94..6d9f113 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRule.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRule.java
@@ -36,8 +36,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteApplication() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRuleTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRuleTwoFiles.java
index 5a4638f..6276de4 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRuleTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteNavigationRuleTwoFiles.java
@@ -40,8 +40,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteApplication() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBean.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBean.java
index 5063187..5482cb0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBean.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBean.java
@@ -17,7 +17,6 @@
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
import org.eclipse.jst.jsf.facesconfig.emf.ReferencedBeanClassType;
import org.eclipse.jst.jsf.facesconfig.emf.ReferencedBeanNameType;
import org.eclipse.jst.jsf.facesconfig.emf.ReferencedBeanType;
@@ -34,8 +33,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteReferencedBeanToFileTwo() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBeanTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBeanTwoFiles.java
index d4d904d..733519f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBeanTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteReferencedBeanTwoFiles.java
@@ -42,8 +42,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteReferencedBean() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKit.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKit.java
index 09f3cb2..d7025ae 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKit.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKit.java
@@ -42,8 +42,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteRenderKit() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKitTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKitTwoFiles.java
index 274bf13..4c4cbfa 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKitTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteRenderKitTwoFiles.java
@@ -61,8 +61,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteRenderKit() {
@@ -275,9 +275,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList names = rendererType.getDisplayName();
+ EList names = rendererType1.getDisplayName();
for (int k = 0; k < names.size(); k++) {
DisplayNameType displayName = (DisplayNameType) names
.get(k);
@@ -307,12 +307,12 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList icons = rendererType.getIcon();
+ EList icons = rendererType1.getIcon();
for (int k = 0; k < icons.size(); k++) {
- IconType icon = (IconType) icons.get(k);
- rendererIconResult = icon.getLargeIcon().getTextContent();
+ IconType icon1 = (IconType) icons.get(k);
+ rendererIconResult = icon1.getLargeIcon().getTextContent();
assertEquals(rendIcon, rendererIconResult);
break;
}
@@ -338,9 +338,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- rendererComponentFmaily = rendererType.getComponentFamily().getTextContent();
+ rendererComponentFmaily = rendererType1.getComponentFamily().getTextContent();
assertEquals(rendererFamily, rendererComponentFmaily);
break;
}
@@ -365,9 +365,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- rendererTyp = rendererType.getRendererType().getTextContent();
+ rendererTyp = rendererType1.getRendererType().getTextContent();
assertEquals("renderer-type", rendererTyp);
break;
}
@@ -392,9 +392,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- rendererClassResult = rendererType.getRendererClass().getTextContent();
+ rendererClassResult = rendererType1.getRendererClass().getTextContent();
assertEquals(rendererClass, rendererClassResult);
break;
}
@@ -420,9 +420,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -457,16 +457,16 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
EList icons = attTyp.getIcon();
for (int z = 0; z < icons.size(); z++) {
- IconType icon = (IconType) icons.get(k);
- iconResult = icon.getLargeIcon().getTextContent();
+ IconType icon1 = (IconType) icons.get(k);
+ iconResult = icon1.getLargeIcon().getTextContent();
assertEquals(attrIcon, iconResult);
break;
}
@@ -493,9 +493,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -525,9 +525,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -558,9 +558,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -591,9 +591,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -830,9 +830,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList names = rendererType.getDisplayName();
+ EList names = rendererType1.getDisplayName();
for (int k = 0; k < names.size(); k++) {
DisplayNameType displayName = (DisplayNameType) names
.get(k);
@@ -862,12 +862,12 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList icons = rendererType.getIcon();
+ EList icons = rendererType1.getIcon();
for (int k = 0; k < icons.size(); k++) {
- IconType icon = (IconType) icons.get(k);
- rendererIconResult = icon.getLargeIcon().getTextContent();
+ IconType icon1 = (IconType) icons.get(k);
+ rendererIconResult = icon1.getLargeIcon().getTextContent();
assertEquals(rendIcon, rendererIconResult);
break;
}
@@ -893,9 +893,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- rendererComponentFmaily = rendererType.getComponentFamily().getTextContent();
+ rendererComponentFmaily = rendererType1.getComponentFamily().getTextContent();
assertEquals(rendererFamily, rendererComponentFmaily);
break;
}
@@ -920,9 +920,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- rendererTyp = rendererType.getRendererType().getTextContent();
+ rendererTyp = rendererType1.getRendererType().getTextContent();
assertEquals("renderer-type", rendererTyp);
break;
}
@@ -947,9 +947,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- rendererClassResult = rendererType.getRendererClass().getTextContent();
+ rendererClassResult = rendererType1.getRendererClass().getTextContent();
assertEquals(rendererClass, rendererClassResult);
break;
}
@@ -975,9 +975,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -1012,16 +1012,16 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
EList icons = attTyp.getIcon();
for (int z = 0; z < icons.size(); z++) {
- IconType icon = (IconType) icons.get(k);
- iconResult = icon.getLargeIcon().getTextContent();
+ IconType icon1 = (IconType) icons.get(k);
+ iconResult = icon1.getLargeIcon().getTextContent();
assertEquals(attrIcon, iconResult);
break;
}
@@ -1048,9 +1048,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -1080,9 +1080,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -1113,9 +1113,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
@@ -1146,9 +1146,9 @@
.get(i);
EList rendererList = renderer.getRenderer();
for (int j = 0; j < rendererList.size(); j++) {
- RendererType rendererType = (RendererType) rendererList
+ RendererType rendererType1 = (RendererType) rendererList
.get(j);
- EList attribute = rendererType.getAttribute();
+ EList attribute = rendererType1.getAttribute();
for (int k = 0; k < attribute.size(); k++) {
AttributeType attTyp = (AttributeType) attribute
.get(k);
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidator.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidator.java
index 02571d6..c88bfa1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidator.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidator.java
@@ -41,8 +41,8 @@
}
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteValidator() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidatorTwoFiles.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidatorTwoFiles.java
index 4053362..3d8b519 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidatorTwoFiles.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplForWriteValidatorTwoFiles.java
@@ -55,8 +55,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
public void testWriteValidatorToFileTwo() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplTestForRead.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplTestForRead.java
index 6482e55..2a31fbc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplTestForRead.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryImplTestForRead.java
@@ -32,8 +32,8 @@
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
- project = WizardUtil.getTestProject();
+ WizardUtil.createProject(getName());
+ project = WizardUtil.getTestProject(getName());
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryTest.java
index 0ae2f59..98475eb 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/FacesConfigFactoryTest.java
@@ -35,7 +35,7 @@
protected void setUp() throws Exception {
super.setUp();
- project = WizardUtil.getTestProject();
+ project = WizardUtil.getTestProject(getName());
}
public static Test suite() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/MultipleFacesConfigFilesTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/MultipleFacesConfigFilesTest.java
index 9dc3d3c..3c34258 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/MultipleFacesConfigFilesTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/MultipleFacesConfigFilesTest.java
@@ -33,13 +33,13 @@
}
protected void setUp() throws Exception {
super.setUp();
- WizardUtil.createProject();
+ WizardUtil.createProject(getName());
}
public static Test suite() {
return new TestSuite(MultipleFacesConfigFilesTest.class);
}
public void testReadFacesconfigFile() {
- IProject project = WizardUtil.getTestProject();
+ IProject project = WizardUtil.getTestProject(getName());
FacesConfigArtifactEdit edit = null;
String sTestString = null;
try {
@@ -66,7 +66,7 @@
}
}
public void testWriteFacesconfigFile() {
- IProject project = WizardUtil.getTestProject();
+ IProject project = WizardUtil.getTestProject(getName());
FacesConfigArtifactEdit edit = null;
String sTestString = "";
try {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/WizardUtil.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/WizardUtil.java
index 961c915..77f875e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/WizardUtil.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/WizardUtil.java
@@ -21,6 +21,8 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
@@ -29,6 +31,7 @@
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.osgi.framework.Bundle;
/**
* Utility class for launching JSF-related wizard operations.
@@ -37,19 +40,19 @@
*/
public class WizardUtil {
private static boolean projectCreated = false;
- public static final String FACESCONFIG_PROJECT_NAME = "FacesConfigUnitTest";
+ private static final String FACESCONFIG_PROJECT_NAME = "FacesConfigUnitTest";
private static final String FACESCONFIG_EAR_PROJECT_NAME = FACESCONFIG_PROJECT_NAME + "EAR";
public static boolean isProjectCreated() {
return projectCreated;
}
- public static void createProject() {
+ public static void createProject(String nameSuffix) {
if(!isProjectCreated()) {
// first delete the projects of these names, if present
IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IResource oldWebProj = workspace.getRoot().getProject(FACESCONFIG_PROJECT_NAME);
- IResource oldEarProj = workspace.getRoot().getProject(FACESCONFIG_EAR_PROJECT_NAME);
+ IResource oldWebProj = workspace.getRoot().getProject(createProjectName(nameSuffix));
+ IResource oldEarProj = workspace.getRoot().getProject(createEarProjectName(nameSuffix));
try {
workspace.delete(new IResource[] { oldWebProj, oldEarProj }, true, null);
@@ -59,7 +62,7 @@
try {
- IProject project = createWebProject(FACESCONFIG_PROJECT_NAME);
+ IProject project = createWebProject(createProjectName(nameSuffix));
checkAndAddFacesConfig(project);
} catch (Throwable t) {
t.printStackTrace();
@@ -85,20 +88,34 @@
/**
* Forces recreation of the test project - to be used after unit tests
* that dirty the project state.
+ * @param nameSuffix TODO
*/
- public static void recreateProject() {
+ public static void recreateProject(String nameSuffix) {
setProjectDirtied();
- createProject();
+ createProject(nameSuffix);
}
/**
* Should call createProject first.
+ * @param nameSuffix TODO
*/
- public static IProject getTestProject() {
+ public static IProject getTestProject(String nameSuffix) {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
- return workspace.getRoot().getProject(FACESCONFIG_PROJECT_NAME);
+ return workspace.getRoot().getProject(createProjectName(nameSuffix));
}
+ private static String createProjectName(final String nameSuffix)
+ {
+ // TODO: do we need separate projects for each test?
+ return FACESCONFIG_PROJECT_NAME;//+"_"+nameSuffix;
+ }
+
+ private static String createEarProjectName(final String nameSuffix)
+ {
+ // TODO: do we need separate projects for each test?
+ return FACESCONFIG_EAR_PROJECT_NAME;//+"_"+nameSuffix;
+ }
+
private static void checkAndAddFacesConfig(IProject project) {
IContainer container = ComponentCore.createComponent(project).getRootFolder().getFolder("/WEB-INF").getUnderlyingFolder();
IFile facesConfigFile = ResourcesPlugin.getWorkspace().getRoot().getFile(container.getFullPath().append(new Path("faces-config.xml"))); //$NON-NLS-1$
@@ -107,31 +124,36 @@
if(facesConfigFile.exists()) {
return;
- } else {
- // there is no faces-config, so add our starting template
- try {
- String sourcePath = Platform.asLocalURL(Platform.find(Platform.getBundle("org.eclipse.jst.jsf.facesconfig.tests"), new Path("/template/faces-config.xml"))).getPath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
- File f = new File(sourcePath);
- FileInputStream sourceStream = new FileInputStream(f);
- facesConfigFile.create(sourceStream, true, null);
- sourceStream.close();
-
- String sourcePath1 = Platform.asLocalURL(Platform.find(Platform.getBundle("org.eclipse.jst.jsf.facesconfig.tests"), new Path("/template/faces-config1.xml"))).getPath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
- File f1 = new File(sourcePath1);
- FileInputStream sourceStream1 = new FileInputStream(f1);
- facesConfigFile1.create(sourceStream1, true, null);
- sourceStream1.close();
-
- String sourcePath2 = Platform.asLocalURL(Platform.find(Platform.getBundle("org.eclipse.jst.jsf.facesconfig.tests"), new Path("/template/faces-config2.xml"))).getPath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
- File f2 = new File(sourcePath2);
- FileInputStream sourceStream2 = new FileInputStream(f2);
- facesConfigFile2.create(sourceStream2, true, null);
- sourceStream2.close();
- } catch (IOException ioe) {
- } catch (CoreException ce) {
- }
-
}
+
+ final IPath facesConfigPath = new Path("/template/faces-config.xml");
+ final IPath facesConfig1Path = new Path("/template/faces-config1.xml");
+ final IPath facesConfig2Path = new Path("/template/faces-config2.xml");
+ final Bundle myBundle = Platform.getBundle("org.eclipse.jst.jsf.facesconfig.tests");
+ // there is no faces-config, so add our starting template
+ try {
+ final String sourcePath = FileLocator.toFileURL(FileLocator.find(myBundle, facesConfigPath,null)).getPath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
+ final File f = new File(sourcePath);
+ final FileInputStream sourceStream = new FileInputStream(f);
+ facesConfigFile.create(sourceStream, true, null);
+ sourceStream.close();
+
+ final String sourcePath1 = FileLocator.toFileURL(FileLocator.find(myBundle,facesConfig1Path,null)).getPath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
+ final File f1 = new File(sourcePath1);
+ final FileInputStream sourceStream1 = new FileInputStream(f1);
+ facesConfigFile1.create(sourceStream1, true, null);
+ sourceStream1.close();
+
+ final String sourcePath2 = FileLocator.toFileURL(FileLocator.find(myBundle, facesConfig2Path,null)).getPath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
+ final File f2 = new File(sourcePath2);
+ final FileInputStream sourceStream2 = new FileInputStream(f2);
+ facesConfigFile2.create(sourceStream2, true, null);
+ sourceStream2.close();
+ } catch (IOException ioe) {
+ ioe.printStackTrace(System.err);
+ } catch (CoreException ce) {
+ ce.printStackTrace(System.err);
+ }
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/FacesConfigEditorTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/FacesConfigEditorTest.java
index 6e3bff7..ab3dfb0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/FacesConfigEditorTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/FacesConfigEditorTest.java
@@ -72,11 +72,11 @@
assertTrue("The facesconfig file doesn't exists.", facesConfigFile
.exists());
IEditorInput fileInput = new FileEditorInput(facesConfigFile);
- IEditorPart editor = (FacesConfigEditor) PlatformUI.getWorkbench()
+ IEditorPart editor1 = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(
fileInput, FacesConfigEditor.EDITOR_ID);
- assertNotNull(editor);
- return editor;
+ assertNotNull(editor1);
+ return editor1;
}
/*
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
index 48720f1..960a22e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
@@ -49,8 +49,7 @@
protected void setUp() throws Exception {
// TODO Auto-generated method stub
super.setUp();
- ((FacesConfigEditor) editor)
- .setActiveEditorPage(PageflowEditor.PAGE_ID);
+ editor.setActiveEditorPage(PageflowEditor.PAGE_ID);
}
public void testAddElements() {
@@ -80,7 +79,7 @@
connectionCommand.setTarget(target);
PageflowLink link = PageflowFactory.eINSTANCE.createPFLink();
connectionCommand.setPFLink(link);
- ((FacesConfigEditor) editor).getDelegatingCommandStack().execute(
+ editor.getDelegatingCommandStack().execute(
connectionCommand);
return link;
}
@@ -91,13 +90,13 @@
AddNodeCommand command = new AddNodeCommand();
command.setParent(getPageflow());
command.setChild(source);
- ((FacesConfigEditor) editor).getDelegatingCommandStack().execute(
+ editor.getDelegatingCommandStack().execute(
command);
return source;
}
private FacesConfigType getFacesConfig() {
- return ((FacesConfigEditor) editor).getFacesConfig();
+ return editor.getFacesConfig();
}
public void testDeleteNode() {
@@ -159,7 +158,7 @@
}
private Pageflow getPageflow() {
- return ((FacesConfigEditor) editor).getPageflowPage().getPageflow();
+ return editor.getPageflowPage().getPageflow();
}
public void testChangeLinkTarget() {
@@ -191,20 +190,18 @@
PageflowPage page = TransformUtil.findPage(INDEX_JSP, pageflow);
PageflowLink link = (PageflowLink) page.getOutlinks().get(0);
command.setPFLink(link);
- ((FacesConfigEditor) editor)
- .setActiveEditorPage(PageflowEditor.PAGE_ID);
- ((FacesConfigEditor) editor).getDelegatingCommandStack().execute(
- command);
+ editor.setActiveEditorPage(PageflowEditor.PAGE_ID);
+ editor.getDelegatingCommandStack().execute(command);
Assert.isTrue(getFacesConfig().getNavigationRule().size() == 0);
Assert.isTrue(getPageflow().getLinks().size() == 0);
- ((FacesConfigEditor) editor).getDelegatingCommandStack().undo();
+ editor.getDelegatingCommandStack().undo();
Assert.isTrue(getFacesConfig().getNavigationRule().size() == 1);
Assert.isTrue(getPageflow().getLinks().size() == 1);
}
public void testRedo() {
testUndo();
- ((FacesConfigEditor) editor).getDelegatingCommandStack().redo();
+ editor.getDelegatingCommandStack().redo();
Assert.isTrue(getFacesConfig().getNavigationRule().size() == 0);
Assert.isTrue(getPageflow().getLinks().size() == 0);
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/WebrootUtilTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/WebrootUtilTest.java
index 416a589..252abbc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/WebrootUtilTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/WebrootUtilTest.java
@@ -34,7 +34,7 @@
* {@link org.eclipse.jst.jsf.facesconfig.common.utils.WebrootUtil#getWebPath(org.eclipse.core.runtime.IPath)}.
*/
public void testGetWebPathIPath() {
-
+ // TODO:
}
/**
@@ -118,8 +118,7 @@
* {@link org.eclipse.jst.jsf.facesconfig.common.utils.WebrootUtil#getWebPath(java.lang.String)}.
*/
public void testGetWebPathString() {
-
-
+ // TODO:
}
/**
@@ -127,7 +126,7 @@
* {@link org.eclipse.jst.jsf.facesconfig.common.utils.WebrootUtil#getPageNameFromWebPath(java.lang.String)}.
*/
public void testGetPageNameFromWebPath() {
-
+ // TODO:
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/util/TestUtil.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/util/TestUtil.java
index 6d3738e..d2db168 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/util/TestUtil.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/util/TestUtil.java
@@ -105,7 +105,7 @@
try {
project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
} catch (CoreException e) {
-
+ e.printStackTrace(System.err);
}
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizardTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizardTest.java
index 6c1e37d..6e464a3 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizardTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizardTest.java
@@ -45,18 +45,18 @@
}
public void testManagedBeanWizard() {
- NewManagedBeanWizard wizard = new NewManagedBeanWizard(project);
- wizard.setForcePreviousAndNextButtons(true);
+ NewManagedBeanWizard wizard1 = new NewManagedBeanWizard(project);
+ wizard1.setForcePreviousAndNextButtons(true);
Shell shell = EditorPlugin.getActiveShell();
- WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+ WizardDialog wizardDialog = new WizardDialog(shell, wizard1);
wizardDialog.create();
wizardDialog.setBlockOnOpen(true);
- assertTrue(wizard.getStartingPage() instanceof ManagedBeanClassSelectionPage);
- ManagedBeanClassSelectionPage page1 = (ManagedBeanClassSelectionPage) wizard
+ assertTrue(wizard1.getStartingPage() instanceof ManagedBeanClassSelectionPage);
+ ManagedBeanClassSelectionPage page1 = (ManagedBeanClassSelectionPage) wizard1
.getStartingPage();
- IWizardPage page2 = wizard.getNextPage(page1);
+ IWizardPage page2 = wizard1.getNextPage(page1);
assertTrue(page2 instanceof ManagedBeanPropertyPage);
// page1.searchRadioButton.setSelection(true);
// assertFalse(page1.isPageComplete());