You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2015/05/19 20:27:35 UTC
svn commit: r1680366 [2/2] - in /db/jdo/trunk/api: src/java/javax/jdo/
src/java/javax/jdo/listener/ src/java/javax/jdo/spi/ test/java/javax/jdo/
test/java/javax/jdo/identity/ test/java/javax/jdo/listener/
test/java/javax/jdo/pc/ test/java/javax/jdo/sch...
Modified: db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java Tue May 19 18:27:34 2015
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package javax.jdo;
import java.io.IOException;
@@ -28,15 +27,12 @@ import javax.jdo.util.BatchTestRunner;
import junit.framework.TestSuite;
/**
- *
* Tests class javax.jdo.JDOHelper for META-INF/jdoconfig.xml compliance.
- *
*/
-public class JDOHelperConfigTest extends AbstractJDOConfigTest implements
- Constants {
+public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Constants {
public static void main(String args[]) {
- BatchTestRunner.run(JDOHelperConfigTest.class);
+ BatchTestRunner.run(JDOHelperConfigTest.class);
}
/**
@@ -45,7 +41,7 @@ public class JDOHelperConfigTest extends
* @return {@inheritDoc}
*/
public static TestSuite suite() {
- return new TestSuite(JDOHelperConfigTest.class);
+ return new TestSuite(JDOHelperConfigTest.class);
}
/**
@@ -81,67 +77,66 @@ public class JDOHelperConfigTest extends
* that can be used in this test suite.
*/
protected Map prepareInitialExpectedMap(String testVariant,
- int listenerCount, int vendorSpecificPropertyCount,
- boolean excludeName, boolean excludePUName) {
- Map<String, String> expected = new HashMap<String, String>();
-
- if (!excludeName) {
- expected.put(PROPERTY_NAME, PMF_ATTRIBUTE_NAME + "." + testVariant);
- }
- if (!excludePUName) {
- expected.put(PROPERTY_PERSISTENCE_UNIT_NAME,
- PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME + "." + testVariant);
- }
-
- expected.put(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS,
- PMF_ATTRIBUTE_CLASS + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_DRIVER_NAME,
- PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_FACTORY_NAME,
- PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_FACTORY2_NAME,
- PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_PASSWORD,
- PMF_ATTRIBUTE_CONNECTION_PASSWORD + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_URL, PMF_ATTRIBUTE_CONNECTION_URL
- + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_USER_NAME,
- PMF_ATTRIBUTE_CONNECTION_USER_NAME + "." + testVariant);
- expected.put(PROPERTY_IGNORE_CACHE, PMF_ATTRIBUTE_IGNORE_CACHE + "."
- + testVariant);
- expected.put(PROPERTY_MAPPING, PMF_ATTRIBUTE_MAPPING + "."
- + testVariant);
- expected.put(PROPERTY_MULTITHREADED, PMF_ATTRIBUTE_MULTITHREADED + "."
- + testVariant);
- expected.put(PROPERTY_NONTRANSACTIONAL_READ,
- PMF_ATTRIBUTE_NONTRANSACTIONAL_READ + "." + testVariant);
- expected.put(PROPERTY_NONTRANSACTIONAL_WRITE,
- PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE + "." + testVariant);
- expected.put(PROPERTY_OPTIMISTIC, PMF_ATTRIBUTE_OPTIMISTIC + "."
- + testVariant);
- expected.put(PROPERTY_RESTORE_VALUES, PMF_ATTRIBUTE_RESTORE_VALUES
- + "." + testVariant);
- expected.put(PROPERTY_RETAIN_VALUES, PMF_ATTRIBUTE_RETAIN_VALUES + "."
- + testVariant);
- expected.put(PROPERTY_DETACH_ALL_ON_COMMIT,
- PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
- expected.put(PROPERTY_SERVER_TIME_ZONE_ID,
- PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
-
- // listeners
- for (int i = 0; i < listenerCount; i++) {
- expected.put(PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER
- + "listener." + testVariant + ".listener" + i, "classes."
- + testVariant + ".classes" + i);
- }
-
- // vendor-specific properties
- for (int i = 0; i < vendorSpecificPropertyCount; i++) {
- expected.put("property." + testVariant + ".name" + i, "property."
- + testVariant + ".value" + i);
- }
+ int listenerCount, int vendorSpecificPropertyCount,
+ boolean excludeName, boolean excludePUName) {
+ Map<String, String> expected = new HashMap<String, String>();
+
+ if (!excludeName) {
+ expected.put(PROPERTY_NAME, PMF_ATTRIBUTE_NAME + "." + testVariant);
+ }
+ if (!excludePUName) {
+ expected.put(PROPERTY_PERSISTENCE_UNIT_NAME,
+ PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME + "." + testVariant);
+ }
+
+ expected.put(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS,
+ PMF_ATTRIBUTE_CLASS + "." + testVariant);
+ expected.put(PROPERTY_CONNECTION_DRIVER_NAME,
+ PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME + "." + testVariant);
+ expected.put(PROPERTY_CONNECTION_FACTORY_NAME,
+ PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME + "." + testVariant);
+ expected.put(PROPERTY_CONNECTION_FACTORY2_NAME,
+ PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME + "." + testVariant);
+ expected.put(PROPERTY_CONNECTION_PASSWORD,
+ PMF_ATTRIBUTE_CONNECTION_PASSWORD + "." + testVariant);
+ expected.put(PROPERTY_CONNECTION_URL, PMF_ATTRIBUTE_CONNECTION_URL
+ + "." + testVariant);
+ expected.put(PROPERTY_CONNECTION_USER_NAME,
+ PMF_ATTRIBUTE_CONNECTION_USER_NAME + "." + testVariant);
+ expected.put(PROPERTY_IGNORE_CACHE, PMF_ATTRIBUTE_IGNORE_CACHE + "."
+ + testVariant);
+ expected.put(PROPERTY_MAPPING, PMF_ATTRIBUTE_MAPPING + "."
+ + testVariant);
+ expected.put(PROPERTY_MULTITHREADED, PMF_ATTRIBUTE_MULTITHREADED + "."
+ + testVariant);
+ expected.put(PROPERTY_NONTRANSACTIONAL_READ,
+ PMF_ATTRIBUTE_NONTRANSACTIONAL_READ + "." + testVariant);
+ expected.put(PROPERTY_NONTRANSACTIONAL_WRITE,
+ PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE + "." + testVariant);
+ expected.put(PROPERTY_OPTIMISTIC, PMF_ATTRIBUTE_OPTIMISTIC + "."
+ + testVariant);
+ expected.put(PROPERTY_RESTORE_VALUES, PMF_ATTRIBUTE_RESTORE_VALUES
+ + "." + testVariant);
+ expected.put(PROPERTY_RETAIN_VALUES, PMF_ATTRIBUTE_RETAIN_VALUES + "."
+ + testVariant);
+ expected.put(PROPERTY_DETACH_ALL_ON_COMMIT,
+ PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
+ expected.put(PROPERTY_SERVER_TIME_ZONE_ID,
+ PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
+
+ // listeners
+ for (int i = 0; i < listenerCount; i++) {
+ expected.put(PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER
+ + "listener." + testVariant + ".listener" + i, "classes."
+ + testVariant + ".classes" + i);
+ }
+
+ // vendor-specific properties
+ for (int i = 0; i < vendorSpecificPropertyCount; i++) {
+ expected.put("property." + testVariant + ".name" + i, "property." + testVariant + ".value" + i);
+ }
- return expected;
+ return expected;
}
/**
@@ -169,11 +164,11 @@ public class JDOHelperConfigTest extends
* test.
*/
protected void doPositiveTest(String[] classpaths, String testVariantName,
- int listenerCount, int vendorSpecificPropertyCount,
- boolean checkEqualProperties) throws IOException {
+ int listenerCount, int vendorSpecificPropertyCount,
+ boolean checkEqualProperties) throws IOException {
- doPositiveTest(classpaths, testVariantName, listenerCount,
- vendorSpecificPropertyCount, checkEqualProperties, false, false);
+ doPositiveTest(classpaths, testVariantName, listenerCount,
+ vendorSpecificPropertyCount, checkEqualProperties, false, false);
}
/**
@@ -211,323 +206,275 @@ public class JDOHelperConfigTest extends
* test.
*/
protected void doPositiveTest(String[] classpaths, String testVariantName,
- int listenerCount, int vendorSpecificPropertyCount,
- boolean checkEqualProperties, boolean excludeName,
- boolean excludePUName) throws IOException {
-
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), classpaths);
-
- Map expected = prepareInitialExpectedMap(testVariantName,
- listenerCount, vendorSpecificPropertyCount, excludeName,
- excludePUName);
-
- String name = testVariantName == null ? null : (String) expected
- .get(PROPERTY_NAME);
-
- Map actual = JDOHelper.getPropertiesFromJdoconfig(name, loader);
-
- assertNotNull("No properties found", actual);
- if (checkEqualProperties) {
- assertEqualProperties(expected, actual);
- }
+ int listenerCount, int vendorSpecificPropertyCount,
+ boolean checkEqualProperties, boolean excludeName,
+ boolean excludePUName) throws IOException {
+
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), classpaths);
+ Map expected = prepareInitialExpectedMap(testVariantName,
+ listenerCount, vendorSpecificPropertyCount, excludeName, excludePUName);
+ String name = testVariantName == null ? null : (String) expected.get(PROPERTY_NAME);
+ Map actual = JDOHelper.getPropertiesFromJdoconfig(name, loader);
+
+ assertNotNull("No properties found", actual);
+ if (checkEqualProperties) {
+ assertEqualProperties(expected, actual);
+ }
}
public void testPositive00_PMF0_BasicPMFConfigUsingOnlyStandardAttributesAndListeners()
- throws IOException {
- doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
- + "/Positive00" }, "positive00.pmf0", 2, 0, true);
+ throws IOException {
+ doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX + "/Positive00" }, "positive00.pmf0", 2, 0, true);
}
public void testPositive00_PMF1_BasicPMFConfigUsingOnlyPropertyElementsWithStandardJavaxDotJDOProperties()
- throws IOException {
- doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
- + "/Positive00" }, "positive00.pmf1", 2, 0, true);
+ throws IOException {
+ doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX + "/Positive00" }, "positive00.pmf1", 2, 0, true);
}
public void testPositive00_PMF2_NestedPropertyElementsWithOnlyStandardAttributeNames()
- throws IOException {
- doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
- + "/Positive00" }, "positive00.pmf2", 2, 0, true);
+ throws IOException {
+ doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX+ "/Positive00" }, "positive00.pmf2", 2, 0, true);
}
public void testPositive00_PMF3_StandardAttributesPlusNonstandardPropertiesInPropertyElements()
- throws IOException {
- doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
- + "/Positive00" }, "positive00.pmf3", 2, 2, true);
+ throws IOException {
+ doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX + "/Positive00" }, "positive00.pmf3", 2, 2, true);
}
public void testPositive00_PMF4_StandardAttributesPlusNonstandardAttributes()
- throws IOException {
- doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
- + "/Positive00" }, "positive00.pmf4", 0, 2, true);
+ throws IOException {
+ doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX + "/Positive00" }, "positive00.pmf4", 0, 2, true);
}
public void testPositive01_DuplicatePUsInDifferentConfigFilesButNotRequested()
- throws IOException {
-
- String[] classpaths = new String[] {
- JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1a",
- JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1b" };
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), classpaths);
-
- Map actual = JDOHelper.getPropertiesFromJdoconfig(
- ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ throws IOException {
+ String[] classpaths = new String[] {
+ JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1a",
+ JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1b" };
+ URLClassLoader loader = new JDOConfigTestClassLoader(getClass().getClassLoader(), classpaths);
+ Map actual = JDOHelper.getPropertiesFromJdoconfig(
+ ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
}
public void testPositive02_GetAnonymousPMFWithNoProperties()
- throws IOException {
+ throws IOException {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive02/");
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive02/");
- Map properties = JDOHelper.getPropertiesFromJdoconfig(
- ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
- assertNotNull("Anonymous PMF with no properties returned null",
- properties);
- assertTrue("Anonymous PMF with no properties had properties",
- properties.size() == 0);
+ Map properties = JDOHelper.getPropertiesFromJdoconfig(
+ ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ assertNotNull("Anonymous PMF with no properties returned null", properties);
+ assertTrue("Anonymous PMF with no properties had properties", properties.size() == 0);
}
public void testPositive03_PMF0_PMFClassNameViaServicesLookup()
- throws IOException {
-
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive03/");
+ throws IOException {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive03/");
- String expected = "class.positive03.pmf0";
- String actual = getPMFClassNameViaServiceLookup(loader);
+ String expected = "class.positive03.pmf0";
+ String actual = getPMFClassNameViaServiceLookup(loader);
- assertNotNull("No PMF name found via services lookup", actual);
- assertEquals(expected, actual);
+ assertNotNull("No PMF name found via services lookup", actual);
+ assertEquals(expected, actual);
}
public void testPositive04_PMF0_PMFClassNameViaServicesLookup()
- throws IOException {
+ throws IOException {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive04/");
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive04/");
- String expected = "class.positive04.pmf0";
- String actual = getPMFClassNameViaServiceLookup(loader);
+ String expected = "class.positive04.pmf0";
+ String actual = getPMFClassNameViaServiceLookup(loader);
- assertNotNull("No PMF name found via services lookup", actual);
- assertEquals(expected, actual);
+ assertNotNull("No PMF name found via services lookup", actual);
+ assertEquals(expected, actual);
}
public void testPositive05_PMF0_PMFClassNameViaServicesLookup()
- throws IOException {
+ throws IOException {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive05/");
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive05/");
- String expected = "class.positive05.pmf0";
- String actual = getPMFClassNameViaServiceLookup(loader);
+ String expected = "class.positive05.pmf0";
+ String actual = getPMFClassNameViaServiceLookup(loader);
- assertNotNull("No PMF name found via services lookup", actual);
- assertEquals(expected, actual);
+ assertNotNull("No PMF name found via services lookup", actual);
+ assertEquals(expected, actual);
}
public void testPositive06_PMF0_GetAnonymousPMFProperties()
- throws IOException {
+ throws IOException {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive06/");
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive06/");
- Map expected = prepareInitialExpectedMap("positive06.pmf0", 2, 0, true,
- true);
+ Map expected = prepareInitialExpectedMap("positive06.pmf0", 2, 0, true, true);
+ Map actual = JDOHelper.getPropertiesFromJdoconfig(
+ ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
- Map actual = JDOHelper.getPropertiesFromJdoconfig(
- ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
-
- assertNotNull("No properties found", actual);
- assertEqualProperties(expected, actual);
+ assertNotNull("No properties found", actual);
+ assertEqualProperties(expected, actual);
}
public void testPositive07_PMF0_GetAnonymousPMFPropertiesWithPUName()
- throws IOException {
-
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive07/");
+ throws IOException {
- Map expected = prepareInitialExpectedMap("positive07.pmf0", 2, 0, true,
- false);
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive07/");
- Map actual = JDOHelper.getPropertiesFromJdoconfig(
- ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ Map expected = prepareInitialExpectedMap("positive07.pmf0", 2, 0, true, false);
+ Map actual = JDOHelper.getPropertiesFromJdoconfig(
+ ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
- assertNotNull("No properties found", actual);
- assertEqualProperties(expected, actual);
+ assertNotNull("No properties found", actual);
+ assertEqualProperties(expected, actual);
}
public void testNegative00_EmptyJDOConfigXML() throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative0/");
-
- JDOHelper.getPersistenceManagerFactory(loader);
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // sunny day
- }
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative0/");
+ JDOHelper.getPersistenceManagerFactory(loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // sunny day
+ }
}
public void testNegative01_NoPersistenceUnitsDefined() throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative01/");
-
- JDOHelper.getPersistenceManagerFactory(loader);
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // joy, sweet joy
- }
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative01/");
+ JDOHelper.getPersistenceManagerFactory(loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // joy, sweet joy
+ }
}
public void testNegative02_DuplicateAnonymousPersistenceUnitsInSameConfig()
- throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative02/");
-
- JDOHelper.getPersistenceManagerFactory(loader);
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // the cockles of my heart warmeth
- }
+ throws IOException {
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative02/");
+ JDOHelper.getPersistenceManagerFactory(loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // the cockles of my heart warmeth
+ }
}
public void testNegative03_DuplicateNamedPersistenceUnitsInSameConfig()
- throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative03/");
-
- JDOHelper.getPersistenceManagerFactory("name.negative03", loader);
-
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // warm fuzzies
- }
+ throws IOException {
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative03/");
+ JDOHelper.getPersistenceManagerFactory("name.negative03", loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // warm fuzzies
+ }
}
public void testNegative04_DuplicatePUNamePropertyInAttributeAndElement()
- throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative04/");
-
- JDOHelper.getPersistenceManagerFactory("name.negative04.value0",
- loader);
-
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // no cold pricklies
- }
+ throws IOException {
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative04/");
+ JDOHelper.getPersistenceManagerFactory("name.negative04.value0", loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // no cold pricklies
+ }
}
public void testNegative05_DuplicatePropertyInAttributeAndElement()
- throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative05/");
-
- JDOHelper.getPersistenceManagerFactory(loader);
-
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // party!
- }
+ throws IOException {
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative05/");
+ JDOHelper.getPersistenceManagerFactory(loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // party!
+ }
}
public void testNegative06_DuplicatePUInDifferentConfigFiles()
- throws IOException {
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative06/6a/", JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative06/6b/");
-
- JDOHelper.getPersistenceManagerFactory("name.negative06", loader);
-
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // clear blue sky
- }
+ throws IOException {
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative06/6a/",
+ JDOCONFIG_CLASSPATH_PREFIX + "/Negative06/6b/");
+ JDOHelper.getPersistenceManagerFactory("name.negative06", loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // clear blue sky
+ }
}
public void testNegative07_EmptyServicesFile() throws IOException {
- JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
- getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative07/");
- String shouldBeNull = getPMFClassNameViaServiceLookup(testLoader);
- assertNull(shouldBeNull);
+ JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative07/");
+ String shouldBeNull = getPMFClassNameViaServiceLookup(testLoader);
+ assertNull(shouldBeNull);
}
public void testNegative08_NoResourcesFound() {
- String resource = "" + RANDOM.nextLong();
-
- InputStream in = getClass().getClassLoader().getResourceAsStream(
- resource);
- assertNull(in);
-
- // resource pretty much guaranteed not to exist
- try {
- JDOHelper.getPersistenceManagerFactory(resource);
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalUserException x) {
- // happy path
- }
+ String resource = "" + RANDOM.nextLong();
+ InputStream in = getClass().getClassLoader().getResourceAsStream(resource);
+ assertNull(in);
+
+ // resource pretty much guaranteed not to exist
+ try {
+ JDOHelper.getPersistenceManagerFactory(resource);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalUserException x) {
+ // happy path
+ }
}
public void testNegative08_ServicesFileWithOnlyComments()
- throws IOException {
- JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
- getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative08/");
- String shouldBeNull = getPMFClassNameViaServiceLookup(testLoader);
- assertNull(shouldBeNull);
+ throws IOException {
+ JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative08/");
+ String shouldBeNull = getPMFClassNameViaServiceLookup(testLoader);
+ assertNull(shouldBeNull);
}
public void testNegative09_MultipleInvalidClassesInDifferentServicesFiles()
- throws IOException {
+ throws IOException {
- // no class name in Negative09/jdoconfig.xml
- // 9a and 9b include services/javax.jdo.PersistenceManagerFactory
- // with bad implementations
- try {
- URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
- .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative09/9a/", JDOCONFIG_CLASSPATH_PREFIX
- + "/Negative09/9b/", TEST_CLASSPATH, API_CLASSPATH);
-
- JDOHelper.getPersistenceManagerFactory("name.negative09", loader);
-
- fail("JDOHelper failed to throw JDOFatalUserException");
- } catch (JDOFatalException x) {
-
- Throwable[] nestedExceptions = x.getNestedExceptions();
- if (nestedExceptions.length != 2) {
- appendMessage("JDOHelper.getPersistenceManagerFactory wrong number of "
- + "nested exceptions. Expected 2, got "
- + nestedExceptions.length + "\n" + x);
- }
- for (int i = 0; i < nestedExceptions.length; ++i) {
- Throwable exception = nestedExceptions[i];
- if (!(exception instanceof JDOFatalException)) {
- appendMessage("Nested exception "
- + exception.getClass().getName()
- + " is not a JDOFatalException.");
- }
- }
- }
- failOnError();
+ // no class name in Negative09/jdoconfig.xml
+ // 9a and 9b include services/javax.jdo.PersistenceManagerFactory
+ // with bad implementations
+ try {
+ URLClassLoader loader = new JDOConfigTestClassLoader(
+ getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Negative09/9a/",
+ JDOCONFIG_CLASSPATH_PREFIX + "/Negative09/9b/", TEST_CLASSPATH, API_CLASSPATH);
+ JDOHelper.getPersistenceManagerFactory("name.negative09", loader);
+ fail("JDOHelper failed to throw JDOFatalUserException");
+ } catch (JDOFatalException x) {
+ Throwable[] nestedExceptions = x.getNestedExceptions();
+ if (nestedExceptions.length != 2) {
+ appendMessage("JDOHelper.getPersistenceManagerFactory wrong number of "
+ + "nested exceptions. Expected 2, got "
+ + nestedExceptions.length + "\n" + x);
+ }
+ for (int i = 0; i < nestedExceptions.length; ++i) {
+ Throwable exception = nestedExceptions[i];
+ if (!(exception instanceof JDOFatalException)) {
+ appendMessage("Nested exception " + exception.getClass().getName()
+ + " is not a JDOFatalException.");
+ }
+ }
+ }
+ failOnError();
}
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java Tue May 19 18:27:34 2015
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Properties;
import javax.jdo.pc.PCPoint;
-import javax.jdo.spi.JDOImplHelper;
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
@@ -53,27 +52,26 @@ public class JDOHelperTest extends Abstr
* @since 2.1
*/
public void testConstructor() {
- JDOHelper helper = new JDOHelper();
assertNull("getObjectId(null) returned non-null",
- helper.getObjectId(null));
+ JDOHelper.getObjectId(null));
assertNull("getPersistenceManager(null) returned non-null",
- helper.getPersistenceManager(null));
+ JDOHelper.getPersistenceManager(null));
assertNull("getTransactionalObjectId(null) returned non-null",
- helper.getTransactionalObjectId(null));
+ JDOHelper.getTransactionalObjectId(null));
assertNull("getVersion(null) returned non-null",
- helper.getVersion(null));
+ JDOHelper.getVersion(null));
assertFalse("isDeleted(null) returned non-null",
- helper.isDeleted(null));
+ JDOHelper.isDeleted(null));
assertFalse("isDetached(null) returned non-null",
- helper.isDetached(null));
+ JDOHelper.isDetached(null));
assertFalse("isDirty(null) returned non-null",
- helper.isDirty(null));
+ JDOHelper.isDirty(null));
assertFalse("isNew(null) returned non-null",
- helper.isNew(null));
+ JDOHelper.isNew(null));
assertFalse("isPersistent(null) returned non-null",
- helper.isPersistent(null));
+ JDOHelper.isPersistent(null));
assertFalse("isTransactional(null) returned non-null",
- helper.isTransactional(null));
+ JDOHelper.isTransactional(null));
}
/** The purpose of this test is simply to call some of the
@@ -82,27 +80,26 @@ public class JDOHelperTest extends Abstr
* @since 2.1
*/
public void testGetInstance() {
- JDOHelper helper = JDOHelper.getInstance();
assertNull("getObjectId(null) returned non-null",
- helper.getObjectId(null));
+ JDOHelper.getObjectId(null));
assertNull("getPersistenceManager(null) returned non-null",
- helper.getPersistenceManager(null));
+ JDOHelper.getPersistenceManager(null));
assertNull("getTransactionalObjectId(null) returned non-null",
- helper.getTransactionalObjectId(null));
+ JDOHelper.getTransactionalObjectId(null));
assertNull("getVersion(null) returned non-null",
- helper.getVersion(null));
+ JDOHelper.getVersion(null));
assertFalse("isDeleted(null) returned non-null",
- helper.isDeleted(null));
+ JDOHelper.isDeleted(null));
assertFalse("isDetached(null) returned non-null",
- helper.isDetached(null));
+ JDOHelper.isDetached(null));
assertFalse("isDirty(null) returned non-null",
- helper.isDirty(null));
+ JDOHelper.isDirty(null));
assertFalse("isNew(null) returned non-null",
- helper.isNew(null));
+ JDOHelper.isNew(null));
assertFalse("isPersistent(null) returned non-null",
- helper.isPersistent(null));
+ JDOHelper.isPersistent(null));
assertFalse("isTransactional(null) returned non-null",
- helper.isTransactional(null));
+ JDOHelper.isTransactional(null));
}
/** */
@@ -194,9 +191,8 @@ public class JDOHelperTest extends Abstr
/** Test null String resource with no class loader.
*/
public void testGetPMFNullResource() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((String)null);
+ JDOHelper.getPersistenceManagerFactory((String)null);
fail("Null resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -208,9 +204,8 @@ public class JDOHelperTest extends Abstr
/** Test null String resource with good class loader.
*/
public void testGetPMFNullResourceGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((String)null, this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory((String)null, this.getClass().getClassLoader());
fail("Null resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -222,9 +217,8 @@ public class JDOHelperTest extends Abstr
/** Test bad String resource with no class loader.
*/
public void testGetPMFBadResource() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory("Whatever");
+ JDOHelper.getPersistenceManagerFactory("Whatever");
fail("Null resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -236,9 +230,8 @@ public class JDOHelperTest extends Abstr
/** Test null String resource with good class loader.
*/
public void testGetPMFBadResourceGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory("Whatever", this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory("Whatever", this.getClass().getClassLoader());
fail("Null resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -250,9 +243,8 @@ public class JDOHelperTest extends Abstr
/** Test null File resource with no class loader.
*/
public void testGetPMFNullFile() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((File)null);
+ JDOHelper.getPersistenceManagerFactory((File)null);
fail("Null file should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -264,9 +256,8 @@ public class JDOHelperTest extends Abstr
/** Test null File resource with good class loader.
*/
public void testGetPMFNullFileGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((File)null, this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory((File)null, this.getClass().getClassLoader());
fail("Null file should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -278,9 +269,8 @@ public class JDOHelperTest extends Abstr
/** Test bad File resource with no class loader.
*/
public void testGetPMFBadFile() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory(new File("Whatever"));
+ JDOHelper.getPersistenceManagerFactory(new File("Whatever"));
fail("Null file should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -292,9 +282,8 @@ public class JDOHelperTest extends Abstr
/** Test bad File resource with good class loader.
*/
public void testGetPMFBadFileGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory(new File("Whatever"), this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory(new File("Whatever"), this.getClass().getClassLoader());
fail("Null file should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -306,9 +295,8 @@ public class JDOHelperTest extends Abstr
/** Test null JNDI resource name with no class loader.
*/
public void testGetPMFNullJNDI() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((String)null, getInitialContext());
+ JDOHelper.getPersistenceManagerFactory((String)null, getInitialContext());
fail("Null JNDI resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -320,9 +308,8 @@ public class JDOHelperTest extends Abstr
/** Test null JNDI resource name with good class loader.
*/
public void testGetPMFNullJNDIGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((String)null, getInitialContext(), this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory((String)null, getInitialContext(), this.getClass().getClassLoader());
fail("Null JNDI resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -334,9 +321,8 @@ public class JDOHelperTest extends Abstr
/** Test bad JNDI resource name with no class loader.
*/
public void testGetPMFBadJNDI() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory("Whatever", getInitialContext());
+ JDOHelper.getPersistenceManagerFactory("Whatever", getInitialContext());
fail("Bad JNDI resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -348,9 +334,8 @@ public class JDOHelperTest extends Abstr
/** Test bad JNDI resource name with good class loader.
*/
public void testGetPMFBadJNDIGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory("Whatever", getInitialContext(), this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory("Whatever", getInitialContext(), this.getClass().getClassLoader());
fail("Bad JNDI resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -362,9 +347,8 @@ public class JDOHelperTest extends Abstr
/** Test null stream with no class loader.
*/
public void testGetPMFNullStream() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((InputStream)null);
+ JDOHelper.getPersistenceManagerFactory((InputStream)null);
fail("Null JNDI resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -376,9 +360,8 @@ public class JDOHelperTest extends Abstr
/** Test null stream with good class loader.
*/
public void testGetPMFNullStreamGoodClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory((InputStream)null, this.getClass().getClassLoader());
+ JDOHelper.getPersistenceManagerFactory((InputStream)null, this.getClass().getClassLoader());
fail("Null JNDI resource name should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -390,10 +373,8 @@ public class JDOHelperTest extends Abstr
/** Test null ClassLoader.
*/
public void testGetPMFNullClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory
- ("Whatever", (ClassLoader)null);
+ JDOHelper.getPersistenceManagerFactory("Whatever", (ClassLoader)null);
fail("Null ClassLoader should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -405,10 +386,8 @@ public class JDOHelperTest extends Abstr
/** Test both null ClassLoaders.
*/
public void testGetPMFBothNullClassLoader() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory
- ("Whatever", (ClassLoader)null, (ClassLoader)null);
+ JDOHelper.getPersistenceManagerFactory("Whatever", (ClassLoader)null, (ClassLoader)null);
fail("Null ClassLoader should result in JDOFatalUserException");
}
catch (JDOFatalUserException ex) {
@@ -420,9 +399,8 @@ public class JDOHelperTest extends Abstr
/** Test missing property javax.jdo.PersistenceManagerFactoryClass.
*/
public void testGetPMFNoClassNameProperty() {
- PersistenceManagerFactory pmf = null;
try {
- pmf = JDOHelper.getPersistenceManagerFactory(new Properties());
+ JDOHelper.getPersistenceManagerFactory(new Properties());
fail("Missing property PersistenceManagerFactoryClass should result in JDOFatalUserException ");
}
catch (JDOFatalUserException ex) {
@@ -434,12 +412,10 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class does not exist.
*/
public void testBadPMFClassNotFound() {
- PersistenceManagerFactory pmf = null;
Properties props = new Properties();
- props.put("javax.jdo.PersistenceManagerFactoryClass",
- "ThisClassDoesNotExist");
+ props.put("javax.jdo.PersistenceManagerFactoryClass", "ThisClassDoesNotExist");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("Bad PersistenceManagerFactoryClass should result in JDOFatalUserException ");
}
catch (JDOFatalUserException ex) {
@@ -451,12 +427,11 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class no method getPersistenceManagerFactory(Properties).
*/
public void testBadPMFNoGetPMFPropertiesMethod() {
- PersistenceManagerFactory pmf = null;
Properties props = new Properties();
props.put("javax.jdo.PersistenceManagerFactoryClass",
"javax.jdo.JDOHelperTest$BadPMFNoGetPMFMethod");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("Bad PersistenceManagerFactory should result in JDOFatalInternalException ");
}
catch (JDOFatalInternalException ex) {
@@ -475,12 +450,11 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class no method getPersistenceManagerFactory(Map).
*/
public void testBadPMFNoGetPMFMapMethod() {
- PersistenceManagerFactory pmf = null;
Map<String,String> props = new HashMap<String,String>();
props.put("javax.jdo.PersistenceManagerFactoryClass",
"javax.jdo.JDOHelperTest$BadPMFNoGetPMFMethod");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("Bad PersistenceManagerFactory should result in JDOFatalInternalException ");
}
catch (JDOFatalInternalException ex) {
@@ -499,12 +473,11 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class non-static getPMF method.
*/
public void testBadPMFNonStaticGetPMFMethod() {
- PersistenceManagerFactory pmf = null;
Properties props = new Properties();
props.put("javax.jdo.PersistenceManagerFactoryClass",
"javax.jdo.JDOHelperTest$BadPMFNonStaticGetPMFMethod");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("Bad PersistenceManagerFactoryClass should result in JDOFatalInternalException ");
}
catch (JDOFatalInternalException ex) {
@@ -516,12 +489,11 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class doesn't implement PMF.
*/
public void testBadPMFWrongReturnType() {
- PersistenceManagerFactory pmf = null;
Properties props = new Properties();
props.put("javax.jdo.PersistenceManagerFactoryClass",
"javax.jdo.JDOHelperTest$BadPMFWrongReturnType");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("Bad PersistenceManagerFactoryClass should result in JDOFatalInternalException ");
}
catch (JDOFatalInternalException ex) {
@@ -533,12 +505,11 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class getPersistenceManagerFactory throws Exception.
*/
public void testBadPMFGetPMFMethodThrowsJDOException() {
- PersistenceManagerFactory pmf = null;
Properties props = new Properties();
props.put("javax.jdo.PersistenceManagerFactoryClass",
"javax.jdo.JDOHelperTest$BadPMFGetPMFMethodThrowsJDOException");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("BadPMFGetPMFMethodThrowsJDOException.GetPersistenceManagerFactory " +
"should result in JDOUnsupportedOptionException. " +
"No exception was thrown.");
@@ -552,12 +523,11 @@ public class JDOHelperTest extends Abstr
/** Test bad PMF class getPersistenceManagerFactory returns null.
*/
public void testBadPMFGetPMFMethodReturnsNull() {
- PersistenceManagerFactory pmf = null;
Properties props = new Properties();
props.put("javax.jdo.PersistenceManagerFactoryClass",
"javax.jdo.JDOHelperTest$BadPMFGetPMFMethodReturnsNull");
try {
- pmf = JDOHelper.getPersistenceManagerFactory(props);
+ JDOHelper.getPersistenceManagerFactory(props);
fail("BadPMFGetPMFMethodReturnsNull.GetPersistenceManagerFactory " +
"should result in JDOFatalInternalException. " +
"No exception was thrown.");
Modified: db/jdo/trunk/api/test/java/javax/jdo/PMFMapMapTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/PMFMapMapTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/PMFMapMapTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/PMFMapMapTest.java Tue May 19 18:27:34 2015
@@ -19,12 +19,9 @@ package javax.jdo;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.net.MalformedURLException;
-import javax.jdo.util.AbstractTest;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.net.URLClassLoader;
import java.util.Properties;
import junit.framework.TestSuite;
@@ -32,10 +29,8 @@ import junit.framework.TestSuite;
import javax.jdo.util.BatchTestRunner;
/**
- *
* Tests class javax.jdo.JDOHelper for calls to the impl's static method
* getPersistenceManagerFactory(Map overrides, Map props).
- *
*/
public class PMFMapMapTest extends AbstractJDOConfigTest {
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/ByteIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/ByteIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/ByteIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/ByteIdentityTest.java Tue May 19 18:27:34 2015
@@ -74,7 +74,7 @@ public class ByteIdentityTest extends Si
public void testIllegalStringConstructor() {
try {
- ByteIdentity c1 = new ByteIdentity(Object.class, "b");
+ new ByteIdentity(Object.class, "b");
} catch (IllegalArgumentException iae) {
return; // good
}
@@ -111,7 +111,7 @@ public class ByteIdentityTest extends Si
public void testBadConstructorNullByteParam() {
try {
- ByteIdentity c1 = new ByteIdentity(Object.class, (Byte)null);
+ new ByteIdentity(Object.class, (Byte)null);
} catch (JDONullIdentityException ex) {
return;
}
@@ -120,7 +120,7 @@ public class ByteIdentityTest extends Si
public void testBadConstructorNullStringParam() {
try {
- ByteIdentity c1 = new ByteIdentity(Object.class, (String)null);
+ new ByteIdentity(Object.class, (String)null);
} catch (JDONullIdentityException ex) {
return;
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/CharIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/CharIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/CharIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/CharIdentityTest.java Tue May 19 18:27:34 2015
@@ -75,7 +75,7 @@ public class CharIdentityTest extends Si
public void testStringConstructorTooLong() {
try {
- CharIdentity c1 = new CharIdentity(Object.class, "ab");
+ new CharIdentity(Object.class, "ab");
} catch (IllegalArgumentException iae) {
return; // good
}
@@ -84,7 +84,7 @@ public class CharIdentityTest extends Si
public void testStringConstructorTooShort() {
try {
- CharIdentity c1 = new CharIdentity(Object.class, "");
+ new CharIdentity(Object.class, "");
} catch (IllegalArgumentException iae) {
return; // good
}
@@ -120,7 +120,7 @@ public class CharIdentityTest extends Si
public void testBadConstructorNullCharacterParam() {
try {
- CharIdentity c1 = new CharIdentity(Object.class, (Character)null);
+ new CharIdentity(Object.class, (Character)null);
} catch (JDONullIdentityException ex) {
return;
}
@@ -129,7 +129,7 @@ public class CharIdentityTest extends Si
public void testBadConstructorNullStringParam() {
try {
- CharIdentity c1 = new CharIdentity(Object.class, (String)null);
+ new CharIdentity(Object.class, (String)null);
} catch (JDONullIdentityException ex) {
return;
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/IntIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/IntIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/IntIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/IntIdentityTest.java Tue May 19 18:27:34 2015
@@ -74,7 +74,7 @@ public class IntIdentityTest extends Sin
public void testIllegalStringConstructor() {
try {
- IntIdentity c1 = new IntIdentity(Object.class, "b");
+ new IntIdentity(Object.class, "b");
} catch (IllegalArgumentException iae) {
return; // good
}
@@ -110,7 +110,7 @@ public class IntIdentityTest extends Sin
public void testBadConstructorNullIntegerParam() {
try {
- IntIdentity c1 = new IntIdentity(Object.class, (Integer)null);
+ new IntIdentity(Object.class, (Integer)null);
} catch (JDONullIdentityException ex) {
return;
}
@@ -119,7 +119,7 @@ public class IntIdentityTest extends Sin
public void testBadConstructorNullStringParam() {
try {
- IntIdentity c1 = new IntIdentity(Object.class, (String)null);
+ new IntIdentity(Object.class, (String)null);
} catch (JDONullIdentityException ex) {
return;
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/LongIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/LongIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/LongIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/LongIdentityTest.java Tue May 19 18:27:34 2015
@@ -76,7 +76,7 @@ public class LongIdentityTest extends Si
public void testIllegalStringConstructor() {
try {
- LongIdentity c1 = new LongIdentity(Object.class, "b");
+ new LongIdentity(Object.class, "b");
} catch (IllegalArgumentException iae) {
return; // good
}
@@ -113,7 +113,7 @@ public class LongIdentityTest extends Si
public void testBadConstructorNullShortParam() {
try {
- LongIdentity c1 = new LongIdentity(Object.class, (Long)null);
+ new LongIdentity(Object.class, (Long)null);
} catch (JDONullIdentityException ex) {
return;
}
@@ -122,7 +122,7 @@ public class LongIdentityTest extends Si
public void testBadConstructorNullStringParam() {
try {
- LongIdentity c1 = new LongIdentity(Object.class, (String)null);
+ new LongIdentity(Object.class, (String)null);
} catch (JDONullIdentityException ex) {
return;
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/ObjectIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/ObjectIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/ObjectIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/ObjectIdentityTest.java Tue May 19 18:27:34 2015
@@ -19,10 +19,8 @@
* ObjectIdentityTest.java
*
*/
-
package javax.jdo.identity;
-import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.io.Serializable;
@@ -155,7 +153,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorNullClass() {
try {
- ObjectIdentity c1 = new ObjectIdentity(null, "1");
+ new ObjectIdentity(null, "1");
} catch (NullPointerException ex) {
return;
}
@@ -164,7 +162,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorNullParam() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class, null);
+ new ObjectIdentity(Object.class, null);
} catch (JDONullIdentityException ex) {
return;
}
@@ -173,7 +171,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorTooShort() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class, "xx");
+ new ObjectIdentity(Object.class, "xx");
} catch (JDOUserException ex) {
return;
}
@@ -182,7 +180,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorNoDelimiter() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class, "xxxxxxxxx");
+ new ObjectIdentity(Object.class, "xxxxxxxxx");
} catch (JDOUserException ex) {
return;
}
@@ -191,7 +189,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorBadClassName() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class, "xx:yy");
+ new ObjectIdentity(Object.class, "xx:yy");
} catch (JDOUserException ex) {
validateNestedException(ex, ClassNotFoundException.class);
return;
@@ -201,7 +199,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorNoStringConstructor() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class,
+ new ObjectIdentity(Object.class,
"javax.jdo.identity.ObjectIdentityTest$BadIdClassNoStringConstructor:yy");
} catch (JDOUserException ex) {
validateNestedException(ex, NoSuchMethodException.class);
@@ -212,7 +210,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorNoPublicStringConstructor() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class,
+ new ObjectIdentity(Object.class,
"javax.jdo.identity.ObjectIdentityTest$BadIdClassNoPublicStringConstructor:yy");
} catch (JDOUserException ex) {
validateNestedException(ex, NoSuchMethodException.class);
@@ -223,7 +221,7 @@ public class ObjectIdentityTest extends
public void testBadStringConstructorIllegalArgument() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class,
+ new ObjectIdentity(Object.class,
"javax.jdo.identity.ObjectIdentityTest$IdClass:yy");
} catch (JDOUserException ex) {
validateNestedException(ex, InvocationTargetException.class);
@@ -236,22 +234,19 @@ public class ObjectIdentityTest extends
SimpleDateFormat usDateFormat = new SimpleDateFormat
("MMM dd, yyyy hh:mm:ss a", Locale.US);
helper.registerDateFormat(usDateFormat);
- Object c1 = new ObjectIdentity(Object.class,
- "java.util.Date:Jan 01, 1970 00:00:00 AM");
+ new ObjectIdentity(Object.class, "java.util.Date:Jan 01, 1970 00:00:00 AM");
helper.registerDateFormat(DateFormat.getDateTimeInstance());
}
public void testStringDefaultDateConstructor() {
DateFormat dateFormat = DateFormat.getDateTimeInstance();
String rightNow = dateFormat.format(new Date());
- Object c1 = new ObjectIdentity(Object.class,
- "java.util.Date:" + rightNow);
+ new ObjectIdentity(Object.class, "java.util.Date:" + rightNow);
}
public void testBadStringDateConstructor() {
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class,
- "java.util.Date:Jop 1, 1970 00:00:00");
+ new ObjectIdentity(Object.class, "java.util.Date:Jop 1, 1970 00:00:00");
} catch (JDOUserException ex) {
return;
}
@@ -285,15 +280,13 @@ public class ObjectIdentityTest extends
public void testStringCurrencyConstructor() {
if (!isClassLoadable("java.util.Currency")) return;
- SingleFieldIdentity c1 = new ObjectIdentity(Object.class,
- "java.util.Currency:USD");
+ new ObjectIdentity(Object.class, "java.util.Currency:USD");
}
public void testBadStringCurrencyConstructor() {
if (!isClassLoadable("java.util.Currency")) return;
try {
- ObjectIdentity c1 = new ObjectIdentity(Object.class,
- "java.util.Currency:NowhereInTheWorld");
+ new ObjectIdentity(Object.class, "java.util.Currency:NowhereInTheWorld");
} catch (JDOUserException ex) {
validateNestedException(ex, IllegalArgumentException.class);
return;
@@ -413,8 +406,11 @@ public class ObjectIdentityTest extends
}
return;
}
+
public static class IdClass implements Serializable {
- public int value;
+ private static final long serialVersionUID = 5718122068872969580L;
+
+ public int value;
public IdClass() {value = 0;}
public IdClass(int value) {this.value = value;}
public IdClass(String str) {this.value = Integer.parseInt(str);}
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/ShortIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/ShortIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/ShortIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/ShortIdentityTest.java Tue May 19 18:27:34 2015
@@ -74,7 +74,7 @@ public class ShortIdentityTest extends S
public void testIllegalStringConstructor() {
try {
- ShortIdentity c1 = new ShortIdentity(Object.class, "b");
+ new ShortIdentity(Object.class, "b");
} catch (IllegalArgumentException iae) {
return; // good
}
@@ -110,7 +110,7 @@ public class ShortIdentityTest extends S
public void testBadConstructorNullShortParam() {
try {
- ShortIdentity c1 = new ShortIdentity(Object.class, (Short)null);
+ new ShortIdentity(Object.class, (Short)null);
} catch (JDONullIdentityException ex) {
return;
}
@@ -119,7 +119,7 @@ public class ShortIdentityTest extends S
public void testBadConstructorNullStringParam() {
try {
- ShortIdentity c1 = new ShortIdentity(Object.class, (String)null);
+ new ShortIdentity(Object.class, (String)null);
} catch (JDONullIdentityException ex) {
return;
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/SingleFieldIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/SingleFieldIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/SingleFieldIdentityTest.java Tue May 19 18:27:34 2015
@@ -24,11 +24,8 @@ package javax.jdo.identity;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
Modified: db/jdo/trunk/api/test/java/javax/jdo/identity/StringIdentityTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/identity/StringIdentityTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/identity/StringIdentityTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/identity/StringIdentityTest.java Tue May 19 18:27:34 2015
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-import javax.jdo.JDOUserException;
import javax.jdo.util.BatchTestRunner;
@@ -82,7 +81,7 @@ public class StringIdentityTest extends
public void testBadConstructorNullParam() {
try {
- StringIdentity c1 = new StringIdentity(Object.class, null);
+ new StringIdentity(Object.class, null);
} catch (JDONullIdentityException ex) {
return;
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/listener/InstanceLifecycleEventTest.java Tue May 19 18:27:34 2015
@@ -113,7 +113,7 @@ public class InstanceLifecycleEventTest
public void testIllegalConstructorTooSmall() {
try {
- InstanceLifecycleEvent e = new InstanceLifecycleEvent (new Object(), -1);
+ new InstanceLifecycleEvent (new Object(), -1);
} catch (IllegalArgumentException e) {
return; // good catch
}
@@ -122,7 +122,7 @@ public class InstanceLifecycleEventTest
public void testIllegalConstructorTooBig() {
try {
- InstanceLifecycleEvent e = new InstanceLifecycleEvent (new Object(), 8);
+ new InstanceLifecycleEvent (new Object(), 8);
} catch (IllegalArgumentException e) {
return; // good catch
}
Modified: db/jdo/trunk/api/test/java/javax/jdo/pc/PCPoint.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/pc/PCPoint.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/pc/PCPoint.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/pc/PCPoint.java Tue May 19 18:27:34 2015
@@ -17,8 +17,6 @@
package javax.jdo.pc;
-import java.io.*;
-import java.util.*;
import javax.jdo.PersistenceManager;
import javax.jdo.spi.*;
Modified: db/jdo/trunk/api/test/java/javax/jdo/schema/XMLTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/schema/XMLTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/schema/XMLTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/schema/XMLTest.java Tue May 19 18:27:34 2015
@@ -18,22 +18,12 @@
package javax.jdo.schema;
import java.io.File;
-import java.io.IOException;
import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jdo.JDOFatalException;
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
import javax.jdo.util.XMLTestUtil;
-import javax.xml.parsers.*;
-import org.w3c.dom.Document;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
/**
* Tests schema files.
* <p>
Modified: db/jdo/trunk/api/test/java/javax/jdo/spi/JDOImplHelperTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/spi/JDOImplHelperTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/spi/JDOImplHelperTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/spi/JDOImplHelperTest.java Tue May 19 18:27:34 2015
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.Properties;
import javax.jdo.Constants;
-import javax.jdo.JDOHelper;
import javax.jdo.JDOUserException;
import javax.jdo.pc.PCPoint;
import javax.jdo.util.AbstractTest;
@@ -47,7 +46,7 @@ public class JDOImplHelperTest extends A
/** */
public void setUp() {
// make sure PCClass is loaded before any tests are run
- PCPoint p = new PCPoint(1, new Integer(1));
+ new PCPoint(1, new Integer(1));
}
/** */
Modified: db/jdo/trunk/api/test/java/javax/jdo/spi/StateInterrogationTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/spi/StateInterrogationTest.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/spi/StateInterrogationTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/spi/StateInterrogationTest.java Tue May 19 18:27:34 2015
@@ -42,9 +42,7 @@ import javax.jdo.util.BatchTestRunner;
public class StateInterrogationTest extends AbstractTest {
private JDOImplHelper implHelper = JDOImplHelper.getInstance();
-
- private JDOHelper helper = new JDOHelper();
-
+
/** Creates a new instance of StateInterrogationTest */
public StateInterrogationTest() {
}
@@ -57,40 +55,40 @@ public class StateInterrogationTest exte
}
public void testGetObjectIdNull() {
- Object id2 = helper.getObjectId(nbcpc2);
+ Object id2 = JDOHelper.getObjectId(nbcpc2);
assertNull("ObjectId should be null before addStateInterrogations",
id2);
addStateInterrogations();
- Object id = helper.getObjectId(Boolean.TRUE);
+ Object id = JDOHelper.getObjectId(Boolean.TRUE);
assertNull("ObjectId should be null for non-pc instances",
id);
}
public void testGetObjectId() {
addStateInterrogations();
- Object id2 = helper.getObjectId(nbcpc2);
+ Object id2 = JDOHelper.getObjectId(nbcpc2);
assertNotNull("ObjectId should not be null",
id2);
assertEquals("ObjectId should be 2",
2, id2.hashCode());
- Object id20 = helper.getObjectId(nbcpc2);
+ Object id20 = JDOHelper.getObjectId(nbcpc2);
assertEquals("ObjectIds from same object should be equal",
id2, id20);
}
public void testRemoveStateInterrogation() {
addStateInterrogations();
- Object id2 = helper.getObjectId(nbcpc2);
+ Object id2 = JDOHelper.getObjectId(nbcpc2);
assertNotNull("ObjectId should not be null",
id2);
assertEquals("ObjectId should be 2",
2, id2.hashCode());
implHelper.removeStateInterrogation(si2);
implHelper.removeStateInterrogation(si0);
- Object id21 = helper.getObjectId(nbcpc2);
+ Object id21 = JDOHelper.getObjectId(nbcpc2);
assertNull("ObjectId should be null after RemoveStateInterrogation",
id21);
- Object id1 = helper.getObjectId(nbcpc1);
+ Object id1 = JDOHelper.getObjectId(nbcpc1);
assertNotNull("ObjectId should not be null",
id1);
assertEquals("ObjectId should be 1",
@@ -98,119 +96,119 @@ public class StateInterrogationTest exte
}
public void testGetTransactionalObjectIdNull() {
- Object id2 = helper.getTransactionalObjectId(nbcpc2);
+ Object id2 = JDOHelper.getTransactionalObjectId(nbcpc2);
assertNull("TransactionalObjectId should be null before addStateInterrogations",
id2);
addStateInterrogations();
- Object id = helper.getTransactionalObjectId(Boolean.TRUE);
+ Object id = JDOHelper.getTransactionalObjectId(Boolean.TRUE);
assertNull("TransactionalObjectId should be null for non-pc instances",
id);
}
public void testGetTransactionalObjectId() {
addStateInterrogations();
- Object id2 = helper.getTransactionalObjectId(nbcpc2);
+ Object id2 = JDOHelper.getTransactionalObjectId(nbcpc2);
assertNotNull("TransactionalObjectId should not be null",
id2);
assertEquals("TransactionalObjectId should be 2",
2, id2.hashCode());
- Object id20 = helper.getTransactionalObjectId(nbcpc2);
+ Object id20 = JDOHelper.getTransactionalObjectId(nbcpc2);
assertEquals("TransactionalObjectIds from same object should be equal",
id2, id20);
}
public void testGetPersistenceManagerNull() {
- Object pm2 = helper.getPersistenceManager(nbcpc2);
+ Object pm2 = JDOHelper.getPersistenceManager(nbcpc2);
assertNull("PersistenceManager should be null before addStateInterrogations",
pm2);
addStateInterrogations();
- Object pm = helper.getPersistenceManager(Boolean.TRUE);
+ Object pm = JDOHelper.getPersistenceManager(Boolean.TRUE);
assertNull("PersistenceManager should be null for non-pc instances",
pm);
}
public void testGetPersistenceManager() {
addStateInterrogations();
- Object pm2 = helper.getPersistenceManager(nbcpc2);
+ Object pm2 = JDOHelper.getPersistenceManager(nbcpc2);
assertNotNull("PersistenceManager should not be null",
pm2);
assertEquals("PersistenceManager should be 2",
2, pm2.hashCode());
- Object pm20 = helper.getPersistenceManager(nbcpc2);
+ Object pm20 = JDOHelper.getPersistenceManager(nbcpc2);
assertEquals("PersistenceManagers from same object should be equal",
pm2, pm20);
}
public void testGetVersionNull() {
- Object id2 = helper.getVersion(nbcpc2);
+ Object id2 = JDOHelper.getVersion(nbcpc2);
assertNull("Version should be null before addStateInterrogations",
id2);
addStateInterrogations();
- Object id = helper.getVersion(Boolean.TRUE);
+ Object id = JDOHelper.getVersion(Boolean.TRUE);
assertNull("Version should be null for non-pc instances",
id);
}
public void testGetVersion() {
addStateInterrogations();
- Object id2 = helper.getVersion(nbcpc2);
+ Object id2 = JDOHelper.getVersion(nbcpc2);
assertNotNull("Version should not be null",
id2);
assertEquals("Version should be 2",
2, id2.hashCode());
- Object id20 = helper.getVersion(nbcpc2);
+ Object id20 = JDOHelper.getVersion(nbcpc2);
assertEquals("Versions from same object should be equal",
id2, id20);
}
public void testIsDeletedFalse() {
assertFalse("IsDeleted should be false before addStateInterrogations",
- helper.isDeleted(nbcpc2));
+ JDOHelper.isDeleted(nbcpc2));
addStateInterrogations();
assertFalse("IsDeleted should be false for non-pc instances",
- helper.isDeleted(Boolean.TRUE));
+ JDOHelper.isDeleted(Boolean.TRUE));
implHelper.removeStateInterrogation(si2);
assertFalse("IsDeleted should be false after removeStateInterrogations",
- helper.isDeleted(nbcpc2));
+ JDOHelper.isDeleted(nbcpc2));
}
public void testIsDeletedMine() {
addStateInterrogations();
assertTrue("IsDeleted should be true for nbcpc1",
- helper.isDeleted(nbcpc1));
+ JDOHelper.isDeleted(nbcpc1));
assertFalse("IsDeleted should be false for nbcpc2",
- helper.isDeleted(nbcpc2));
+ JDOHelper.isDeleted(nbcpc2));
}
public void testIsDetachedFalse() {
assertFalse("IsDetached should be false before addStateInterrogations",
- helper.isDetached(nbcpc2));
+ JDOHelper.isDetached(nbcpc2));
addStateInterrogations();
assertFalse("IsDetached should be false for non-pc instances",
- helper.isDetached(Boolean.TRUE));
+ JDOHelper.isDetached(Boolean.TRUE));
implHelper.removeStateInterrogation(si2);
assertFalse("IsDetached should be false after removeStateInterrogations",
- helper.isDetached(nbcpc2));
+ JDOHelper.isDetached(nbcpc2));
}
public void testIsDetachedMine() {
addStateInterrogations();
assertTrue("IsDetached should be true for nbcpc1",
- helper.isDetached(nbcpc1));
+ JDOHelper.isDetached(nbcpc1));
assertFalse("IsDetached should be false for nbcpc2",
- helper.isDetached(nbcpc2));
+ JDOHelper.isDetached(nbcpc2));
}
public void testIsDirtyFalse() {
assertFalse("IsDirty should be false before addStateInterrogations",
- helper.isDirty(nbcpc2));
+ JDOHelper.isDirty(nbcpc2));
addStateInterrogations();
assertFalse("IsDirty should be false for non-pc instances",
- helper.isDirty(Boolean.TRUE));
+ JDOHelper.isDirty(Boolean.TRUE));
implHelper.removeStateInterrogation(si2);
nbcpc2.setDirty(true);
assertFalse("IsDirty should be false after removeStateInterrogations",
- helper.isDirty(nbcpc2));
+ JDOHelper.isDirty(nbcpc2));
nbcpc2.setDirty(false);
}
@@ -218,92 +216,91 @@ public class StateInterrogationTest exte
addStateInterrogations();
nbcpc1.setDirty(true);
assertTrue("IsDirty should be true for nbcpc1 after setDirty(true)",
- helper.isDirty(nbcpc1));
+ JDOHelper.isDirty(nbcpc1));
nbcpc1.setDirty(false);
assertFalse("IsDirty should be false for nbcpc1 after setDirty(false)",
- helper.isDirty(nbcpc1));
+ JDOHelper.isDirty(nbcpc1));
assertFalse("IsDirty should be false for nbcpc2",
- helper.isDirty(nbcpc2));
+ JDOHelper.isDirty(nbcpc2));
}
public void testIsNewFalse() {
assertFalse("IsNew should be false before addStateInterrogations",
- helper.isNew(nbcpc2));
+ JDOHelper.isNew(nbcpc2));
addStateInterrogations();
assertFalse("IsNew should be false for non-pc instances",
- helper.isNew(Boolean.TRUE));
+ JDOHelper.isNew(Boolean.TRUE));
implHelper.removeStateInterrogation(si2);
assertFalse("IsNew should be false after removeStateInterrogations",
- helper.isNew(nbcpc2));
+ JDOHelper.isNew(nbcpc2));
}
public void testIsNewMine() {
addStateInterrogations();
assertTrue("IsNew should be true for nbcpc1",
- helper.isNew(nbcpc1));
+ JDOHelper.isNew(nbcpc1));
assertFalse("IsNew should be false for nbcpc2",
- helper.isNew(nbcpc2));
+ JDOHelper.isNew(nbcpc2));
}
public void testIsPersistentFalse() {
assertFalse("IsPersistent should be false before addStateInterrogations",
- helper.isPersistent(nbcpc2));
+ JDOHelper.isPersistent(nbcpc2));
addStateInterrogations();
assertFalse("IsPersistent should be false for non-pc instances",
- helper.isPersistent(Boolean.TRUE));
+ JDOHelper.isPersistent(Boolean.TRUE));
implHelper.removeStateInterrogation(si2);
assertFalse("IsPersistent should be false after removeStateInterrogations",
- helper.isPersistent(nbcpc2));
+ JDOHelper.isPersistent(nbcpc2));
}
public void testIsPersistentMine() {
addStateInterrogations();
assertTrue("IsPersistent should be true for nbcpc1",
- helper.isPersistent(nbcpc1));
+ JDOHelper.isPersistent(nbcpc1));
assertFalse("IsPersistent should be false for nbcpc2",
- helper.isPersistent(nbcpc2));
+ JDOHelper.isPersistent(nbcpc2));
}
public void testIsTransactionalFalse() {
assertFalse("IsTransactional should be false before addStateInterrogations",
- helper.isTransactional(nbcpc2));
+ JDOHelper.isTransactional(nbcpc2));
addStateInterrogations();
assertFalse("IsTransactional should be false for non-pc instances",
- helper.isTransactional(Boolean.TRUE));
+ JDOHelper.isTransactional(Boolean.TRUE));
implHelper.removeStateInterrogation(si2);
assertFalse("IsTransactional should be false after removeStateInterrogations",
- helper.isTransactional(nbcpc2));
+ JDOHelper.isTransactional(nbcpc2));
}
public void testIsTransactionalMine() {
addStateInterrogations();
assertTrue("IsTransactional should be true for nbcpc1",
- helper.isTransactional(nbcpc1));
+ JDOHelper.isTransactional(nbcpc1));
assertFalse("IsTransactional should be false for nbcpc2",
- helper.isTransactional(nbcpc2));
+ JDOHelper.isTransactional(nbcpc2));
}
public void testMakeDirtyFalse() {
- helper.makeDirty(nbcpc2, "");
+ JDOHelper.makeDirty(nbcpc2, "");
nbcpc2.setDirty(true);
assertFalse("IsDirty should be false before addStateInterrogations",
- helper.isDirty(nbcpc2));
+ JDOHelper.isDirty(nbcpc2));
addStateInterrogations();
implHelper.removeStateInterrogation(si2);
nbcpc2.setDirty(false);
- helper.makeDirty(nbcpc2, "");
+ JDOHelper.makeDirty(nbcpc2, "");
assertFalse("IsDirty should be false after removeStateInterrogations",
- helper.isDirty(nbcpc2));
+ JDOHelper.isDirty(nbcpc2));
}
public void testMakeDirtyMine() {
addStateInterrogations();
- helper.makeDirty(nbcpc1, "");
- assertTrue("IsDirty should be true for nbcpc1",
- helper.isDirty(nbcpc1));
+ JDOHelper.makeDirty(nbcpc1, "");
+ assertTrue("IsDirty should be true for nbcpc1", JDOHelper.isDirty(nbcpc1));
nbcpc1.setDirty(false);
assertFalse("IsDirty should be false after setDirty(false)",
- helper.isDirty(nbcpc1));
+ JDOHelper.isDirty(nbcpc1));
}
public void tearDown() {
Modified: db/jdo/trunk/api/test/java/javax/jdo/stub/StubPMF.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/stub/StubPMF.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/stub/StubPMF.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/stub/StubPMF.java Tue May 19 18:27:34 2015
@@ -33,7 +33,9 @@ import javax.jdo.metadata.TypeMetadata;
public class StubPMF implements PersistenceManagerFactory, Constants {
- public static PersistenceManagerFactory getPersistenceManagerFactory(
+ private static final long serialVersionUID = 488698916248368422L;
+
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
Map props) {
StubPMF pmf = new StubPMF();
@@ -346,9 +348,6 @@ public class StubPMF implements Persiste
public void evictAll(Collection oids) {
}
- public void evictAll(Class pcClass, boolean subclasses) {
- }
-
public void evictAll(boolean subclasses, Class pcClass) {
}
@@ -361,9 +360,6 @@ public class StubPMF implements Persiste
public void pinAll(Object... oids) {
}
- public void pinAll(Class pcClass, boolean subclasses) {
- }
-
public void pinAll(boolean subclasses, Class pcClass) {
}
@@ -376,9 +372,6 @@ public class StubPMF implements Persiste
public void unpinAll(Object... oids) {
}
- public void unpinAll(Class pcClass, boolean subclasses) {
- }
-
public void unpinAll(boolean subclasses, Class pcClass) {
}
};
Modified: db/jdo/trunk/api/test/java/javax/jdo/util/XMLTestUtil.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/util/XMLTestUtil.java?rev=1680366&r1=1680365&r2=1680366&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/util/XMLTestUtil.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/util/XMLTestUtil.java Tue May 19 18:27:34 2015
@@ -31,7 +31,6 @@ import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -41,7 +40,6 @@ import javax.jdo.JDOFatalException;
import javax.xml.parsers.*;
import org.w3c.dom.Document;
import org.xml.sax.*;
-import org.xml.sax.helpers.*;
/**
* Tests schema files.