[Joafip-svn] SF.net SVN: joafip:[2972] trunk
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[2972] trunk
|
From: <luc...@us...> - 2011-11-19 06:19:08
|
Revision: 2972
http://joafip.svn.sourceforge.net/joafip/?rev=2972&view=rev
Author: luc_peuvrier
Date: 2011-11-19 06:19:01 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
xml export namespace is now http://joafip.sourceforge.net
Modified Paths:
--------------
trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/IImporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/joafip.xsd
trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/AbstractTestImport222.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestImport300.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel310/AbstractTestImport301.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/Importer.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -1749,7 +1749,7 @@
}
@Override
- public void xmlImport(final String directoryName)
+ public void xmlImport(final String directoryName, final boolean validating)
throws FilePersistenceException,
FilePersistenceClassNotFoundException,
FilePersistenceInvalidClassException,
@@ -1760,7 +1760,7 @@
assertSessionClosed();
newAccessSessionAndReadOrCreateRootObject(false);
assertNoObjectStored();
- store.xmlImport(directoryName);
+ store.xmlImport(directoryName, validating);
} catch (final StoreException exception) {
throw new FilePersistenceException(exception);
} catch (final StoreClassNotFoundException exception) {
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -1027,13 +1027,15 @@
*
* @param directoryName
* directory name where are stored exported data to import
+ * @param validating
* @throws FilePersistenceException
* @throws FilePersistenceClassNotFoundException
* @throws FilePersistenceInvalidClassException
* @throws FilePersistenceDataCorruptedException
* @throws FilePersistenceNotSerializableException
*/
- void xmlImport(String directoryName) throws FilePersistenceException,
+ void xmlImport(String directoryName, boolean validating)
+ throws FilePersistenceException,
FilePersistenceClassNotFoundException,
FilePersistenceInvalidClassException,
FilePersistenceDataCorruptedException,
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -491,11 +491,12 @@
}
@Override
- public void xmlImport(final String directoryName) throws StoreException,
- StoreClassNotFoundException, StoreInvalidClassException,
- StoreDataCorruptedException, StoreNotSerializableException {
+ public void xmlImport(final String directoryName, final boolean validating)
+ throws StoreException, StoreClassNotFoundException,
+ StoreInvalidClassException, StoreDataCorruptedException,
+ StoreNotSerializableException {
try {
- xmlImporter.doImport(directoryName);
+ xmlImporter.doImport(directoryName, validating);
} catch (final ImportException exception) {
throw new StoreException(exception);
} catch (final ImportClassNotFoundException exception) {
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -663,15 +663,17 @@
*
* @param directoryName
* directory name where are stored exported data to import
+ * @param validating
* @throws StoreException
* @throws StoreNotSerializableException
* @throws StoreDataCorruptedException
* @throws StoreInvalidClassException
* @throws StoreClassNotFoundException
*/
- void xmlImport(String directoryName) throws StoreException,
- StoreClassNotFoundException, StoreInvalidClassException,
- StoreDataCorruptedException, StoreNotSerializableException;
+ void xmlImport(String directoryName, boolean validating)
+ throws StoreException, StoreClassNotFoundException,
+ StoreInvalidClassException, StoreDataCorruptedException,
+ StoreNotSerializableException;
void setImportListener(IImportListener listener);
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -158,9 +158,10 @@
}
@Override
- public void doImport(final String directoryName) throws ImportException,
- ImportClassNotFoundException, ImportDataCorruptedException,
- ImportInvalidClassException, ImportNotSerializableException {
+ public void doImport(final String directoryName, final boolean validating)
+ throws ImportException, ImportClassNotFoundException,
+ ImportDataCorruptedException, ImportInvalidClassException,
+ ImportNotSerializableException {
numberOfImported = 0;
final File directory = new File(directoryName);
if (directory.exists()) {
@@ -173,7 +174,7 @@
synchronized (storeMutex) {
objectMap = new TreeMap<Integer, Object>();
dummyObjectSet = new HashSet<ObjectAndPersistInfo>();
- importImpl(directory);
+ importImpl(directory, validating);
try {
storeSaver.saveModification();
} catch (final StoreException exception) {
@@ -190,16 +191,18 @@
*
* @param directoryName
* directory name where are stored exported data to import
+ * @param validating
+ * true if validating according to joafip.xsd
* @throws ImportException
* @throws ImportClassNotFoundException
* @throws ImportDataCorruptedException
* @throws ImportInvalidClassException
* @throws ImportNotSerializableException
*/
- protected abstract void importImpl(final File directory)
- throws ImportException, ImportClassNotFoundException,
- ImportDataCorruptedException, ImportInvalidClassException,
- ImportNotSerializableException;
+ protected abstract void importImpl(final File directory,
+ final boolean validating) throws ImportException,
+ ImportClassNotFoundException, ImportDataCorruptedException,
+ ImportInvalidClassException, ImportNotSerializableException;
protected void setReleaseAndDataModelIdentifier(
final String previousReleaseName,
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/IImporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/IImporter.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/IImporter.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -36,6 +36,7 @@
*
* @param directoryName
* directory name where are stored exported data to import
+ * @param validating
* @throws StoreException
* @throws StoreNotSerializableException
* @throws StoreDataCorruptedException
@@ -47,10 +48,10 @@
* @throws ImportDataCorruptedException
* @throws ImportClassNotFoundException
*/
- void doImport(String directoryName) throws StoreException,
- StoreClassNotFoundException, StoreInvalidClassException,
- StoreDataCorruptedException, StoreNotSerializableException,
- ImportException, ImportClassNotFoundException,
- ImportDataCorruptedException, ImportInvalidClassException,
- ImportNotSerializableException;
+ void doImport(String directoryName, boolean validating)
+ throws StoreException, StoreClassNotFoundException,
+ StoreInvalidClassException, StoreDataCorruptedException,
+ StoreNotSerializableException, ImportException,
+ ImportClassNotFoundException, ImportDataCorruptedException,
+ ImportInvalidClassException, ImportNotSerializableException;
}
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -18,16 +18,14 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Deque;
import java.util.LinkedList;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.SchemaFactory;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.store.service.IStore;
@@ -48,6 +46,12 @@
@NotStorableClass
public class XmlImporter extends AbstractImporter implements ContentHandler {// NOPMD
+ private static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+
+ private static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+
+ private static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
+
private Locator locator;
private Deque<ICurrentHandler> handlerStack;
@@ -60,32 +64,33 @@
}
@Override
- protected void importImpl(final File directory) throws ImportException,
- ImportClassNotFoundException, ImportDataCorruptedException,
- ImportInvalidClassException, ImportNotSerializableException {
+ protected void importImpl(final File directory, final boolean validating)
+ throws ImportException, ImportClassNotFoundException,
+ ImportDataCorruptedException, ImportInvalidClassException,
+ ImportNotSerializableException {
exportFile = new File(directory, "export.xml");
if (!exportFile.exists()) {
throw new ImportException(exportFile + " does not exists");
}
final SAXParserFactory factory = SAXParserFactory.newInstance();
- // FIXMELUC ?____why not validating ?
- factory.setValidating(false);
+ factory.setValidating(validating);
factory.setNamespaceAware(true);
- final SchemaFactory schemaFactory = SchemaFactory
- .newInstance("http://www.w3.org/2001/XMLSchema");
try {
- final InputStream inputStream = classLoaderProvider
- .getClassLoader()
- .getResourceAsStream(
- "net/sf/joafip/store/service/export_import/joafip.xsd");
- factory.setSchema(schemaFactory
- .newSchema(new Source[] { new StreamSource(inputStream) }));
+ final SAXParser saxParser = factory.newSAXParser();
+ if (validating) {
+ saxParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
- final SAXParser parser = factory.newSAXParser();
- final XMLReader reader = parser.getXMLReader();
+ final URI schemaSourceUri = ClassLoader.getSystemResource(
+ "net/sf/joafip/store/service/export_import/joafip.xsd")
+ .toURI();
+ saxParser.setProperty(JAXP_SCHEMA_SOURCE, new File(
+ schemaSourceUri));
+ }
+ final XMLReader reader = saxParser.getXMLReader();
reader.setErrorHandler(new XmlReaderErrorHandler(this));
reader.setContentHandler(this);
- reader.parse(new InputSource(exportFile.toURI().toString()));
+ final String sourcePath = exportFile.toURI().toString();
+ reader.parse(new InputSource(sourcePath));
} catch (SAXException exception) {
final String message = exception.getMessage();
final Exception embeddedException = exception.getException();
@@ -108,6 +113,8 @@
throw new ImportException(exception);
} catch (IllegalArgumentException exception) {
throw new ImportException(exception);
+ } catch (URISyntaxException exception) {
+ throw new ImportException(exception);
}
}
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/joafip.xsd
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/joafip.xsd 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/joafip.xsd 2011-11-19 06:19:01 UTC (rev 2972)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://joafip.sourceforge.net/schema" xmlns="http://joafip.sourceforge.net/schema"
+ targetNamespace="http://joafip.sourceforge.net" xmlns="http://joafip.sourceforge.net"
elementFormDefault="qualified">
<xs:annotation>
@@ -55,7 +55,7 @@
<!-- field -->
<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
<xs:complexType mixed="false">
- <xs:group ref="fieldElt" />
+ <xs:group ref="fieldElt" minOccurs="1" maxOccurs="1" />
<xs:attribute name="class" type="xs:string" use="required" />
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="declClass" type="xs:string"
@@ -85,7 +85,7 @@
<!-- field -->
<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
<xs:complexType mixed="false">
- <xs:group ref="fieldElt" />
+ <xs:group ref="fieldElt" minOccurs="1" maxOccurs="1" />
<xs:attribute name="class" type="xs:string" use="required" />
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="declClass" type="xs:string"
@@ -114,13 +114,13 @@
<xs:choice>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:choice>
- <xs:group ref="reference" />
- <xs:group ref="object" />
+ <xs:group ref="reference" minOccurs="1" maxOccurs="1" />
+ <xs:group ref="object" minOccurs="1" maxOccurs="1" />
</xs:choice>
</xs:sequence>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:group ref="value" />
+ <xs:group ref="value" minOccurs="1" maxOccurs="1" />
</xs:sequence>
</xs:choice>
@@ -225,7 +225,7 @@
</xs:sequence>
- <!-- static field -->
+ <!-- static field -->
<xs:sequence minOccurs="0" maxOccurs="1">
<xs:element name="staticField" minOccurs="1"
maxOccurs="1">
@@ -262,13 +262,10 @@
</xs:complexType>
- <!--
- <xs:key name="object_id"> <xs:selector xpath=" ./ object | ./ string
- | ./ enum | ./ array" /> <xs:field xpath="@id"/> </xs:key> <xs:keyref
- name="ref_object_id" refer="object_id"> <xs:selector
- xpath="./object/field/reference" /> <xs:field xpath="@id"/>
- </xs:keyref>
- -->
+ <!-- <xs:key name="object_id"> <xs:selector xpath=" ./ object | ./ string
+ | ./ enum | ./ array" /> <xs:field xpath="@id"/> </xs:key> <xs:keyref name="ref_object_id"
+ refer="object_id"> <xs:selector xpath="./object/field/reference" /> <xs:field
+ xpath="@id"/> </xs:keyref> -->
<!-- objects -->
</xs:element>
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -144,7 +144,7 @@
* Forbidden import
*/
try {
- filePersistence.xmlImport(RUNTIME);
+ filePersistence.xmlImport(RUNTIME, true);
fail("must fail");// NOPMD
} catch (final FilePersistenceException exception) {// NOPMD
// expected
@@ -176,7 +176,7 @@
/* import */
- filePersistence.xmlImport(RUNTIME);
+ filePersistence.xmlImport(RUNTIME, true);
assertEquals("", 'a', bobForExport.getCharValue());
@@ -279,7 +279,7 @@
builder.setCrashSafeMode(false);
filePersistence = builder.build();
- filePersistence.xmlImport(RUNTIME);
+ filePersistence.xmlImport(RUNTIME, true);
dataAccessSession = filePersistence.createDataAccessSession();
dataAccessSession.open();
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -1,8 +1,11 @@
package net.sf.joafip.service;
+import java.lang.reflect.Method;
+
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
+import net.sf.joafip.store.service.objectfortest.Bob1;
@NotStorableClass
@StorableAccess
@@ -29,6 +32,11 @@
builder.setGarbageManagement(false);
builder.setCrashSafeMode(false);
filePersistence = (FilePersistence) builder.build();
+ // FIXMELUC ______________________NoPersistenceConstraintCheck
+ // annotation
+ final Method method = Bob1.class.getDeclaredMethod(
+ "doSomethingOnOtherBob1Private", new Class<?>[] { Bob1.class });
+ filePersistence.addToNotCheckMethod(method);
}
@Override
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel300/AbstractTestImport222.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel300/AbstractTestImport222.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel300/AbstractTestImport222.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -49,7 +49,7 @@
FilePersistenceTooBigForSerializationException {
Container.skipBug222 = true;
HelperReflect.getInstance().setAlwaysAcceptNullField(true);
- filePersistence.xmlImport("../joafip/export222");
+ filePersistence.xmlImport("../joafip/export222", false);
final IDataAccessSession dataAccessSession = filePersistence
.createDataAccessSession();
dataAccessSession.open();
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestImport300.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestImport300.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestImport300.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -88,7 +88,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
try {
filePersistence.close();
} catch (final Throwable throwable) {// NOPMD
@@ -105,7 +105,7 @@
FilePersistenceDataCorruptedException,
FilePersistenceNotSerializableException, ProxyException,
FilePersistenceTooBigForSerializationException {
- filePersistence.xmlImport("../joafip/export300");
+ filePersistence.xmlImport("../joafip/export300", false);
final IDataAccessSession dataAccessSession = filePersistence
.createDataAccessSession();
dataAccessSession.open();
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel310/AbstractTestImport301.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel310/AbstractTestImport301.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel310/AbstractTestImport301.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -58,7 +58,7 @@
FilePersistenceNotSerializableException, ProxyException,
FilePersistenceTooBigForSerializationException {
- filePersistence.xmlImport("../joafip/export301b");
+ filePersistence.xmlImport("../joafip/export301b", false);
checkObjectState();
}
}
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -965,10 +965,11 @@
exportPersistedClassByteCode);
}
- public void xmlImport(final String directoryName) throws StoreException,
- StoreClassNotFoundException, StoreInvalidClassException,
- StoreDataCorruptedException, StoreNotSerializableException {
- store.xmlImport(directoryName);
+ public void xmlImport(final String directoryName, final boolean validating)
+ throws StoreException, StoreClassNotFoundException,
+ StoreInvalidClassException, StoreDataCorruptedException,
+ StoreNotSerializableException {
+ store.xmlImport(directoryName, validating);
}
public ObjectAndPersistInfo getObjectAndPersistInfoOfObjectFromQueue(
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/Importer.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/Importer.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/Importer.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -78,7 +78,7 @@
filePersistence.setImportListener(this);
startTime = System.currentTimeMillis();
- filePersistence.xmlImport("runtime_perf/export");
+ filePersistence.xmlImport("runtime_perf/export", true);
System.out.println(numberOfImported + " imported, duration "// NOPMD
+ (System.currentTimeMillis() - startTime));
filePersistence.close();
Modified: trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
===================================================================
--- trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java 2011-11-18 04:46:52 UTC (rev 2971)
+++ trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java 2011-11-19 06:19:01 UTC (rev 2972)
@@ -24,10 +24,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import net.sf.joafip.service.TestExportImport;
+import net.sf.joafip.service.TestExportObject;
import net.sf.joafip.service.rel300.TestImport222;
import net.sf.joafip.service.rel300.TestImport222NotLazy;
-import net.sf.joafip.service.rel300.TestUseRuntime222;
-import net.sf.joafip.service.rel300.TestUseRuntime222NotLazy;
+import net.sf.joafip.service.rel301.TestImport300;
+import net.sf.joafip.service.rel310.TestImport301ConversionA;
+import net.sf.joafip.service.rel310.TestImport301ConversionB;
/**
*
@@ -44,10 +47,13 @@
public static Test suite() {
final TestSuite suite = new TestSuite("in error Tests");
// $JUnit-BEGIN$
- suite.addTestSuite(TestUseRuntime222.class);
- suite.addTestSuite(TestUseRuntime222NotLazy.class);
+ suite.addTestSuite(TestExportImport.class);
+ suite.addTestSuite(TestExportObject.class);
suite.addTestSuite(TestImport222.class);
suite.addTestSuite(TestImport222NotLazy.class);
+ suite.addTestSuite(TestImport300.class);
+ suite.addTestSuite(TestImport301ConversionA.class);
+ suite.addTestSuite(TestImport301ConversionB.class);
// suite.addTest(xxxx.suite());
// $JUnit-END$
return suite;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
