diff options
Diffstat (limited to 'org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization')
10 files changed, 52 insertions, 77 deletions
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java index acabe5d7..3a40a30a 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java @@ -26,7 +26,6 @@ import junit.framework.Assert; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature.Setting; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.AttributeDefinition; import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean; import org.eclipse.rmf.reqif10.AttributeDefinitionDate; @@ -49,6 +48,7 @@ import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger; import org.eclipse.rmf.reqif10.DatatypeDefinitionReal; import org.eclipse.rmf.reqif10.DatatypeDefinitionString; import org.eclipse.rmf.reqif10.ReqIF; +import org.eclipse.rmf.reqif10.ReqIF10Package; import org.eclipse.rmf.reqif10.ReqIFContent; import org.eclipse.rmf.reqif10.SpecObject; import org.eclipse.rmf.reqif10.SpecObjectType; @@ -72,7 +72,7 @@ public class TC0001001FullModelTests extends AbstractTestCase { saveReqIFFile(originalReqIF, REFERENCE_DATA_FILENAME); loadedReqIF = loadReqIFFile(REFERENCE_DATA_FILENAME); } - + @Test public void testSchemaCompliance() throws Exception { validateAgainstSchema(REFERENCE_DATA_FILENAME); @@ -124,8 +124,7 @@ public class TC0001001FullModelTests extends AbstractTestCase { assertTrue(loadedReqIF.getTheHeader().isSetTitle()); assertEquals(originalReqIF.getTheHeader().getComment(), loadedReqIF.getTheHeader().getComment()); - assertEquals(originalReqIF.getTheHeader().getCreationTime().toGregorianCalendar(), loadedReqIF.getTheHeader().getCreationTime() - .toGregorianCalendar()); + assertEquals(originalReqIF.getTheHeader().getCreationTime(), loadedReqIF.getTheHeader().getCreationTime()); assertEquals(originalReqIF.getTheHeader().getIdentifier(), loadedReqIF.getTheHeader().getIdentifier()); assertEquals(originalReqIF.getTheHeader().getRepositoryId(), loadedReqIF.getTheHeader().getRepositoryId()); assertEquals(originalReqIF.getTheHeader().getReqIFToolId(), loadedReqIF.getTheHeader().getReqIFToolId()); @@ -282,7 +281,7 @@ public class TC0001001FullModelTests extends AbstractTestCase { assertTrue(attributeValue instanceof AttributeValueDate); AttributeValueDate attributeValueDate = (AttributeValueDate) attributeValue; assertTrue(attributeValueDate.isSetTheValue()); - assertEquals(EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), "2002-05-30T09:30:10+06:00"), + assertEquals(EcoreUtil.createFromString(ReqIF10Package.eINSTANCE.getDateTime(), "2002-05-30T09:30:10+06:00"), attributeValueDate.getTheValue()); } diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java index 6106244a..325dcb69 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java @@ -12,8 +12,7 @@ package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1000; import java.math.BigInteger; - -import javax.xml.datatype.XMLGregorianCalendar; +import java.util.GregorianCalendar; import org.eclipse.emf.common.util.EList; import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean; @@ -79,8 +78,7 @@ public class TC1000SimpleContentModelBuilder extends SimpleModelBuilder { SpecObject specObject; /** - * @throws Exception - * + * @throws Exception */ public TC1000SimpleContentModelBuilder() throws Exception { super("ID_TC1000_ReqIfHeader", "TC 1000 'Simple Content'"); @@ -325,8 +323,8 @@ public class TC1000SimpleContentModelBuilder extends SimpleModelBuilder { } - public SpecObject createTC1000SpecObject(String identifier, XMLGregorianCalendar lastChangeDate, boolean tc1000t, boolean tc1000f, - BigInteger tc1000_integer, String tc1000_text, Double tc1000_real, XMLGregorianCalendar tc1000_lastChangeDate, EnumValue tc1000_enumvalue) { + public SpecObject createTC1000SpecObject(String identifier, GregorianCalendar lastChangeDate, boolean tc1000t, boolean tc1000f, + BigInteger tc1000_integer, String tc1000_text, Double tc1000_real, GregorianCalendar tc1000_lastChangeDate, EnumValue tc1000_enumvalue) { SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject(); specObject.setIdentifier(identifier); specObject.setLastChange(tc1000_lastChangeDate); diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java index 5d45c0ae..e14c2e77 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java @@ -26,7 +26,6 @@ import junit.framework.Assert; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature.Setting; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.AttributeValue; import org.eclipse.rmf.reqif10.AttributeValueBoolean; import org.eclipse.rmf.reqif10.AttributeValueDate; @@ -35,6 +34,7 @@ import org.eclipse.rmf.reqif10.AttributeValueInteger; import org.eclipse.rmf.reqif10.AttributeValueReal; import org.eclipse.rmf.reqif10.AttributeValueString; import org.eclipse.rmf.reqif10.ReqIF; +import org.eclipse.rmf.reqif10.ReqIF10Package; import org.eclipse.rmf.reqif10.ReqIFContent; import org.eclipse.rmf.reqif10.SpecObject; import org.eclipse.rmf.reqif10.SpecObjectType; @@ -104,8 +104,7 @@ public class TC1000SimpleContentTests extends AbstractTestCase { assertTrue(loadedReqIF.getTheHeader().isSetSourceToolId()); assertTrue(loadedReqIF.getTheHeader().isSetTitle()); - assertEquals(originalReqIF.getTheHeader().getCreationTime().toGregorianCalendar(), loadedReqIF.getTheHeader().getCreationTime() - .toGregorianCalendar()); + assertEquals(originalReqIF.getTheHeader().getCreationTime().getTime(), loadedReqIF.getTheHeader().getCreationTime().getTime()); assertEquals(originalReqIF.getTheHeader().getIdentifier(), loadedReqIF.getTheHeader().getIdentifier()); assertEquals(originalReqIF.getTheHeader().getReqIFToolId(), loadedReqIF.getTheHeader().getReqIFToolId()); assertEquals(originalReqIF.getTheHeader().getReqIFVersion(), loadedReqIF.getTheHeader().getReqIFVersion()); @@ -236,7 +235,7 @@ public class TC1000SimpleContentTests extends AbstractTestCase { assertTrue(attributeValue instanceof AttributeValueDate); AttributeValueDate attributeValueDate = (AttributeValueDate) attributeValue; assertTrue(attributeValueDate.isSetTheValue()); - assertEquals(EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), "2002-05-30T09:30:10+06:00"), + assertEquals(EcoreUtil.createFromString(ReqIF10Package.eINSTANCE.getDateTime(), "2002-05-30T09:30:10+06:00"), attributeValueDate.getTheValue()); } diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java index e86c5dfc..3a7563ea 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java @@ -12,8 +12,7 @@ package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc4000; import java.math.BigInteger; - -import javax.xml.datatype.XMLGregorianCalendar; +import java.util.GregorianCalendar; import org.eclipse.emf.common.util.EList; import org.eclipse.rmf.reqif10.AlternativeID; @@ -70,8 +69,7 @@ public class TC4000ModelBuilder extends SimpleModelBuilder { SpecObject specObject; /** - * @throws Exception - * + * @throws Exception */ public TC4000ModelBuilder(int specHierarchiesCount) throws Exception { super("ID_TC4000_ReqIfHeader", "TC 4000 'Big Model'"); @@ -267,11 +265,11 @@ public class TC4000ModelBuilder extends SimpleModelBuilder { } - public SpecObject createTC4000SpecObject(String identifier, XMLGregorianCalendar lastChangeDate, boolean tc4000_boolean, - BigInteger tc4000_integer, String tc4000_text, Double tc4000_real, XMLGregorianCalendar tc4000_lastChangeDate) throws Exception { + public SpecObject createTC4000SpecObject(String identifier, GregorianCalendar gregorianCalendar, boolean tc4000_boolean, + BigInteger tc4000_integer, String tc4000_text, Double tc4000_real, GregorianCalendar gregorianCalendar2) throws Exception { SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject(); specObject.setIdentifier(identifier); - specObject.setLastChange(tc4000_lastChangeDate); + specObject.setLastChange(gregorianCalendar2); specObject.setType(specObjectType); AttributeValueBoolean attributeValueBooleanTc4000t = ReqIF10Factory.eINSTANCE.createAttributeValueBoolean(); @@ -292,7 +290,7 @@ public class TC4000ModelBuilder extends SimpleModelBuilder { AttributeValueDate attributeValueDate = ReqIF10Factory.eINSTANCE.createAttributeValueDate(); attributeValueDate.setDefinition(attributeDefinitionDate); - attributeValueDate.setTheValue(tc4000_lastChangeDate); + attributeValueDate.setTheValue(gregorianCalendar2); specObject.getValues().add(attributeValueBooleanTc4000t); specObject.getValues().add(attributeValueInteger); diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java index 546e01c7..eebbef92 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java @@ -1,10 +1,10 @@ package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx; +import java.util.GregorianCalendar; + import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.XMLGregorianCalendar; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration; import org.eclipse.rmf.reqif10.AttributeDefinitionString; import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML; @@ -13,9 +13,11 @@ import org.eclipse.rmf.reqif10.AttributeValueString; import org.eclipse.rmf.reqif10.AttributeValueXHTML; import org.eclipse.rmf.reqif10.ReqIF; import org.eclipse.rmf.reqif10.ReqIF10Factory; +import org.eclipse.rmf.reqif10.ReqIF10Package; import org.eclipse.rmf.reqif10.SpecHierarchy; import org.eclipse.rmf.reqif10.SpecObject; import org.eclipse.rmf.reqif10.SpecObjectType; +import org.eclipse.rmf.tests.reqif10.serialization.util.SimpleModelBuilder; @SuppressWarnings("nls") public class TC1801HISExchangeProcessModelBuilder { @@ -60,7 +62,7 @@ public class TC1801HISExchangeProcessModelBuilder { attributeValueXhtml = ReqIF10Factory.eINSTANCE.createAttributeValueXHTML(); attributeValueXhtml.setDefinition((AttributeDefinitionXHTML) specObjectType.getSpecAttributes().get(0)); - attributeValueXhtml.setTheValue(TC1800HISExchangeProcessModelBuilder.createXhtmlValue("Obj-04")); + attributeValueXhtml.setTheValue(SimpleModelBuilder.createXhtmlValue("Obj-04")); specObject.getValues().add(attributeValueXhtml); attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString(); @@ -113,9 +115,9 @@ public class TC1801HISExchangeProcessModelBuilder { return reqIF; } - public XMLGregorianCalendar toDate(String date) throws DatatypeConfigurationException { - XMLGregorianCalendar xmlGregoriaCalendar = (XMLGregorianCalendar) EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), date); - return xmlGregoriaCalendar; + public GregorianCalendar toDate(String date) throws DatatypeConfigurationException { + GregorianCalendar gregorianCalendar = (GregorianCalendar) EcoreUtil.createFromString(ReqIF10Package.eINSTANCE.getDateTime(), date); + return gregorianCalendar; } } diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java index 0826aff8..b744d648 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java @@ -1,14 +1,15 @@ package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx; +import java.util.GregorianCalendar; + import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.XMLGregorianCalendar; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration; import org.eclipse.rmf.reqif10.AttributeValueEnumeration; import org.eclipse.rmf.reqif10.AttributeValueString; import org.eclipse.rmf.reqif10.ReqIF; +import org.eclipse.rmf.reqif10.ReqIF10Package; import org.eclipse.rmf.reqif10.SpecObject; @SuppressWarnings("nls") @@ -49,9 +50,9 @@ public class TC1802HISExchangeProcessModelBuilder { return reqIF; } - public static XMLGregorianCalendar toDate(String date) throws DatatypeConfigurationException { - XMLGregorianCalendar xmlGregoriaCalendar = (XMLGregorianCalendar) EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), date); - return xmlGregoriaCalendar; + public GregorianCalendar toDate(String date) throws DatatypeConfigurationException { + GregorianCalendar gregorianCalendar = (GregorianCalendar) EcoreUtil.createFromString(ReqIF10Package.eINSTANCE.getDateTime(), date); + return gregorianCalendar; } } diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java index b198b014..c839cb04 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java @@ -1,10 +1,10 @@ package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx; +import java.util.GregorianCalendar; + import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.XMLGregorianCalendar; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration; import org.eclipse.rmf.reqif10.AttributeDefinitionString; import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML; @@ -13,9 +13,11 @@ import org.eclipse.rmf.reqif10.AttributeValueString; import org.eclipse.rmf.reqif10.AttributeValueXHTML; import org.eclipse.rmf.reqif10.ReqIF; import org.eclipse.rmf.reqif10.ReqIF10Factory; +import org.eclipse.rmf.reqif10.ReqIF10Package; import org.eclipse.rmf.reqif10.SpecHierarchy; import org.eclipse.rmf.reqif10.SpecObject; import org.eclipse.rmf.reqif10.SpecObjectType; +import org.eclipse.rmf.tests.reqif10.serialization.util.SimpleModelBuilder; @SuppressWarnings("nls") public class TC1803HISExchangeProcessModelBuilder { @@ -60,7 +62,7 @@ public class TC1803HISExchangeProcessModelBuilder { attributeValueXhtml = ReqIF10Factory.eINSTANCE.createAttributeValueXHTML(); attributeValueXhtml.setDefinition((AttributeDefinitionXHTML) specObjectType.getSpecAttributes().get(0)); - attributeValueXhtml.setTheValue(TC1800HISExchangeProcessModelBuilder.createXhtmlValue("Obj-05")); + attributeValueXhtml.setTheValue(SimpleModelBuilder.createXhtmlValue("Obj-05")); specObject.getValues().add(attributeValueXhtml); attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString(); @@ -113,9 +115,9 @@ public class TC1803HISExchangeProcessModelBuilder { return reqIF; } - public XMLGregorianCalendar toDate(String date) throws DatatypeConfigurationException { - XMLGregorianCalendar xmlGregoriaCalendar = (XMLGregorianCalendar) EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), date); - return xmlGregoriaCalendar; + public GregorianCalendar toDate(String date) throws DatatypeConfigurationException { + GregorianCalendar gregorianCalendar = (GregorianCalendar) EcoreUtil.createFromString(ReqIF10Package.eINSTANCE.getDateTime(), date); + return gregorianCalendar; } } diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java index 94235e30..655c5cfe 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java @@ -157,9 +157,9 @@ public class TC18xxHISExchangeProcessTests extends AbstractTestCase implements C public void testObj03() throws Exception { SpecObject[] so = getObjectsByName("Obj-03"); - assertTrue(so[0].getLastChange().toGregorianCalendar().getTimeInMillis() < so[1].getLastChange().toGregorianCalendar().getTimeInMillis()); - assertTrue(so[1].getLastChange().toGregorianCalendar().getTimeInMillis() < so[2].getLastChange().toGregorianCalendar().getTimeInMillis()); - assertTrue(so[2].getLastChange().toGregorianCalendar().getTimeInMillis() < so[3].getLastChange().toGregorianCalendar().getTimeInMillis()); + assertTrue(so[0].getLastChange().getTimeInMillis() < so[1].getLastChange().getTimeInMillis()); + assertTrue(so[1].getLastChange().getTimeInMillis() < so[2].getLastChange().getTimeInMillis()); + assertTrue(so[2].getLastChange().getTimeInMillis() < so[3].getLastChange().getTimeInMillis()); // Check values assertEquals("O3.A1 initial", ReqIFUtil.getTheValue(ReqIFUtil.getAttributeValueForLabel(so[0], "A1"))); @@ -239,7 +239,7 @@ public class TC18xxHISExchangeProcessTests extends AbstractTestCase implements C assertNull(findInSpec("Spec1", so[i])); SpecHierarchy shx = findInSpec("Spec2", so[i]); assertNotNull(shx); - assertTrue(sh0.getLastChange().toGregorianCalendar().getTimeInMillis() < shx.getLastChange().toGregorianCalendar().getTimeInMillis()); + assertTrue(sh0.getLastChange().getTimeInMillis() < shx.getLastChange().getTimeInMillis()); } } diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java index eecaea33..abdc2233 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java @@ -15,13 +15,11 @@ import java.util.Date; import java.util.GregorianCalendar; import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.ReqIF; import org.eclipse.rmf.reqif10.ReqIF10Factory; +import org.eclipse.rmf.reqif10.ReqIF10Package; public class MinimalModelBuilder { private ReqIF reqIF; @@ -58,16 +56,15 @@ public class MinimalModelBuilder { public void postProcessing() throws Exception { } - public XMLGregorianCalendar getCurrentDate() throws DatatypeConfigurationException { + public GregorianCalendar getCurrentDate() throws DatatypeConfigurationException { GregorianCalendar calendar = new GregorianCalendar(); calendar.setTime(new Date()); - XMLGregorianCalendar xmlGregoriaCalendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar); - return xmlGregoriaCalendar; + return calendar; } - public XMLGregorianCalendar toDate(String date) throws DatatypeConfigurationException { - XMLGregorianCalendar xmlGregoriaCalendar = (XMLGregorianCalendar) EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), date); - return xmlGregoriaCalendar; + public GregorianCalendar toDate(String date) throws DatatypeConfigurationException { + GregorianCalendar gregorianCalendar = (GregorianCalendar) EcoreUtil.createFromString(ReqIF10Package.eINSTANCE.getDateTime(), date); + return gregorianCalendar; } public ReqIF getReqIF() throws Exception { diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java index ccb836ba..3453a2c2 100644 --- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java +++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java @@ -11,16 +11,9 @@ */ package org.eclipse.rmf.tests.reqif10.serialization.util; -import java.util.Date; import java.util.GregorianCalendar; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; - -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.FeatureMapUtil; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.rmf.reqif10.ReqIF10Factory; import org.eclipse.rmf.reqif10.ReqIFHeader; import org.eclipse.rmf.reqif10.XhtmlContent; @@ -30,7 +23,7 @@ import org.eclipse.rmf.reqif10.xhtml.XhtmlPType; @SuppressWarnings("nls") public class SimpleModelBuilder extends ReqIFContentModelBuilder { private final String comment; - private final XMLGregorianCalendar creationTime; + private final GregorianCalendar creationTime; private final String identifier; private final String repositoryId; private final String reqIfToolId; @@ -55,7 +48,7 @@ public class SimpleModelBuilder extends ReqIFContentModelBuilder { * @param reqIfToolId * @param sourceToolId * @param title - * @throws Exception + * @throws Exception */ public SimpleModelBuilder(String creationTimeString, String identifier, String reqIfToolId, String sourceToolId, String title) throws Exception { this(null, creationTimeString, identifier, null, reqIfToolId, sourceToolId, title); @@ -71,7 +64,7 @@ public class SimpleModelBuilder extends ReqIFContentModelBuilder { * @param reqIfToolId * @param sourceToolId * @param title - * @throws Exception + * @throws Exception */ public SimpleModelBuilder(String comment, String creationTimeString, String identifier, String repositoryId, String reqIfToolId, String sourceToolId, String title) throws Exception { @@ -164,20 +157,6 @@ public class SimpleModelBuilder extends ReqIFContentModelBuilder { public void createToolExtensions() throws Exception { } - @Override - public XMLGregorianCalendar getCurrentDate() throws DatatypeConfigurationException { - GregorianCalendar calendar = new GregorianCalendar(); - calendar.setTime(new Date()); - XMLGregorianCalendar xmlGregoriaCalendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar); - return xmlGregoriaCalendar; - } - - @Override - public XMLGregorianCalendar toDate(String date) throws DatatypeConfigurationException { - XMLGregorianCalendar xmlGregoriaCalendar = (XMLGregorianCalendar) EcoreUtil.createFromString(XMLTypePackage.eINSTANCE.getDateTime(), date); - return xmlGregoriaCalendar; - } - public static XhtmlContent createXhtmlValue(String value) { XhtmlContent xhtmlContent = ReqIF10Factory.eINSTANCE.createXhtmlContent(); XhtmlPType p = XhtmlFactory.eINSTANCE.createXhtmlPType(); |