Author: DartPeng
Date: 2009-01-04 03:32:25 -0500 (Sun, 04 Jan 2009)
New Revision: 12873
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/.settings/
trunk/smooks/tests/org.jboss.tools.smooks.test/.settings/org.eclipse.jdt.core.prefs
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java/
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java/JavaModelLoaderTest.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJava2JavaModelTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/NormalJ2JConfigFileAnalyzerTester.java
Removed:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Order.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/ModelTest.java
Log:
JBIDE-3479
Add/Modify :
1.java model building factory test case
2.java2java simple config file test case
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/.settings/org.eclipse.jdt.core.prefs
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/.settings/org.eclipse.jdt.core.prefs 2009-01-04
08:32:25 UTC (rev 12873)
@@ -0,0 +1,12 @@
+#Wed Nov 19 18:27:41 HKT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -0,0 +1,114 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test;
+
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.ecore.EPackage.Registry;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.jboss.tools.smooks.analyzer.IMappingAnalyzer;
+import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
+import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.graphical.GraphicalPackage;
+import org.jboss.tools.smooks.model.SmooksPackage;
+import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory;
+import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl;
+
+/**
+ * @author Dart
+ *
+ */
+public abstract class AbstractModelTestCase extends TestCase {
+
+ protected ISourceModelAnalyzer sourceModelAnalyzer = newSourceModelAnalyzer();
+ protected ITargetModelAnalyzer targetModelAnalyzer = newTargetModelAnalyzer();
+ protected IMappingAnalyzer connectionsAnalyzer = newConnectionModelAnalyzer();
+
+ protected GraphInformations graph;
+
+ public GraphInformations getGraph() {
+ return graph;
+ }
+
+ protected abstract IMappingAnalyzer newConnectionModelAnalyzer();
+
+ protected abstract ITargetModelAnalyzer newTargetModelAnalyzer();
+
+ protected abstract ISourceModelAnalyzer newSourceModelAnalyzer();
+
+ public void setGraph(GraphInformations graph) {
+ this.graph = graph;
+ }
+
+ public ComposedAdapterFactory getAdapterFactory() {
+ return adapterFactory;
+ }
+
+ public void setAdapterFactory(ComposedAdapterFactory adapterFactory) {
+ this.adapterFactory = adapterFactory;
+ }
+
+ public AdapterFactoryEditingDomain getEditingDomain() {
+ return editingDomain;
+ }
+
+ public void setEditingDomain(AdapterFactoryEditingDomain editingDomain) {
+ this.editingDomain = editingDomain;
+ }
+
+ public Resource getSmooksResource() {
+ return smooksResource;
+ }
+
+ public void setSmooksResource(Resource smooksResource) {
+ this.smooksResource = smooksResource;
+ }
+
+ protected ComposedAdapterFactory adapterFactory;
+ protected AdapterFactoryEditingDomain editingDomain;
+ protected Resource smooksResource;
+ protected Resource graphResource;
+
+ public Resource getGraphResource() {
+ return graphResource;
+ }
+
+ public void setGraphResource(Resource graphResource) {
+ this.graphResource = graphResource;
+ }
+
+ public AbstractModelTestCase() {
+ adapterFactory = new ComposedAdapterFactory(
+ ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ adapterFactory
+ .addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory
+ .addAdapterFactory(new SmooksItemProviderAdapterFactory());
+ editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
+ createCommandStack(), new HashMap<Resource, Boolean>());
+ Registry.INSTANCE.put(GraphicalPackage.eNS_URI,
+ GraphicalPackage.eINSTANCE);
+ Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
+
+ smooksResource = new SmooksResourceFactoryImpl().createResource(null);
+ graphResource = new XMLResourceFactoryImpl().createResource(null);
+
+ loadResources();
+ }
+
+ public abstract void loadResources() throws RuntimeException;
+
+ protected CommandStack createCommandStack() {
+ return new BasicCommandStack();
+ }
+}
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java/JavaModelLoaderTest.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java/JavaModelLoaderTest.java
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java/JavaModelLoaderTest.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -0,0 +1,112 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.java;
+
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
+import org.jboss.tools.smooks.javabean.model.JavaBeanModelFactory;
+import org.jboss.tools.smooks.test.java2java.Header;
+import org.jboss.tools.smooks.test.java2java.Order;
+import org.jboss.tools.smooks.test.java2java.OrderItem;
+
+/**
+ * @author Dart
+ *
+ */
+public class JavaModelLoaderTest extends TestCase {
+ public void testJavaBeanModelFactory(){
+ JavaBeanModel model = JavaBeanModelFactory.getJavaBeanModel(Order.class);
+ List properties = model.getProperties();
+
+ // there are 14 properties , 9 properties come from the parent class.
+ Assert.assertEquals(14, properties.size());
+ Assert.assertTrue(model.isRootClassModel());
+ for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
+ JavaBeanModel property = (JavaBeanModel) iterator.next();
+ // check header property
+ if(property.getName().equals("header")){
+ Assert.assertTrue(property.getBeanClass() == Header.class);
+ }
+ // check the collection property
+ if(property.getName().equals("orderItems")){
+ Assert.assertTrue(property.hasGenericType());
+ Assert.assertTrue(property.isList());
+ Assert.assertTrue(property.getGenericType() == OrderItem.class);
+ // have only one model
+ Assert.assertEquals(1, property.getProperties().size());
+ }
+ // check the array property
+ if(property.getName().equals("headerArray")){
+ Assert.assertTrue(property.hasGenericType());
+ Assert.assertTrue(property.isArray());
+ Assert.assertTrue(property.getGenericType() == Header.class);
+ // have only one model
+ Assert.assertEquals(1, property.getProperties().size());
+ }
+ if(property.getName().equals("orderCounts")){
+ Assert.assertTrue(property.hasGenericType());
+ Assert.assertTrue(property.isArray());
+ Assert.assertTrue(property.getGenericType() == int.class);
+ // have only one model
+ Assert.assertEquals(1, property.getProperties().size());
+ }
+ if(property.getName().equals("ages")){
+ Assert.assertTrue(property.hasGenericType());
+ Assert.assertTrue(property.isArray());
+ Assert.assertTrue(property.getGenericType() == int.class);
+ // have only one model
+ Assert.assertEquals(1, property.getProperties().size());
+ }
+ // check the parent's primitive properties
+ if(property.getName().equals("stringProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == String.class);
+ // have no children model
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("longProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == Long.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("doubleProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == Double.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("dateProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == Date.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("BooleanProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == Boolean.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("integerProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == Integer.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("floatProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == Float.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ if(property.getName().equals("bigIntegerProperty")){
+ Assert.assertTrue(property.isPrimitive());
+ Assert.assertTrue(property.getBeanClass() == BigInteger.class);
+ Assert.assertEquals(0, property.getProperties().size());
+ }
+ }
+ }
+}
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java/JavaModelLoaderTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJava2JavaModelTestCase.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJava2JavaModelTestCase.java
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJava2JavaModelTestCase.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -0,0 +1,28 @@
+package org.jboss.tools.smooks.test.java2java;
+
+import org.jboss.tools.smooks.analyzer.IMappingAnalyzer;
+import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
+import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
+import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
+import org.jboss.tools.smooks.test.AbstractModelTestCase;
+
+public abstract class AbstractJava2JavaModelTestCase extends AbstractModelTestCase {
+
+ public AbstractJava2JavaModelTestCase() {
+ super();
+
+ }
+
+ public ISourceModelAnalyzer newSourceModelAnalyzer() {
+ return new JavaBeanAnalyzer();
+ }
+
+ public ITargetModelAnalyzer newTargetModelAnalyzer() {
+ return new JavaBeanAnalyzer();
+ }
+
+ public IMappingAnalyzer newConnectionModelAnalyzer() {
+ return new JavaBeanAnalyzer();
+ }
+
+}
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJava2JavaModelTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -0,0 +1,78 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.java2java;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * @author Dart
+ *
+ */
+public class AbstractJavaBeanModel {
+ private String stringProperty;
+ private Date dateProperty;
+ private Boolean booleanProperty;
+ private Integer integerProperty;
+ private Long longProperty;
+ private Double doubleProperty;
+ private Float floatProperty;
+ private BigDecimal bigDecimalProperty;
+ private BigInteger bigIntegerProperty;
+ public String getStringProperty() {
+ return stringProperty;
+ }
+ public void setStringProperty(String stringProperty) {
+ this.stringProperty = stringProperty;
+ }
+ public Date getDateProperty() {
+ return dateProperty;
+ }
+ public void setDateProperty(Date dateProperty) {
+ this.dateProperty = dateProperty;
+ }
+ public Boolean getBooleanProperty() {
+ return booleanProperty;
+ }
+ public void setBooleanProperty(Boolean booleanProperty) {
+ this.booleanProperty = booleanProperty;
+ }
+ public Integer getIntegerProperty() {
+ return integerProperty;
+ }
+ public void setIntegerProperty(Integer integerProperty) {
+ this.integerProperty = integerProperty;
+ }
+ public Long getLongProperty() {
+ return longProperty;
+ }
+ public void setLongProperty(Long longProperty) {
+ this.longProperty = longProperty;
+ }
+ public Double getDoubleProperty() {
+ return doubleProperty;
+ }
+ public void setDoubleProperty(Double doubleProperty) {
+ this.doubleProperty = doubleProperty;
+ }
+ public Float getFloatProperty() {
+ return floatProperty;
+ }
+ public void setFloatProperty(Float floatProperty) {
+ this.floatProperty = floatProperty;
+ }
+ public BigDecimal getBigDecimalProperty() {
+ return bigDecimalProperty;
+ }
+ public void setBigDecimalProperty(BigDecimal bigDecimalProperty) {
+ this.bigDecimalProperty = bigDecimalProperty;
+ }
+ public BigInteger getBigIntegerProperty() {
+ return bigIntegerProperty;
+ }
+ public void setBigIntegerProperty(BigInteger bigIntegerProperty) {
+ this.bigIntegerProperty = bigIntegerProperty;
+ }
+}
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/NormalJ2JConfigFileAnalyzerTester.java
(from rev 11562,
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java)
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/NormalJ2JConfigFileAnalyzerTester.java
(rev 0)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/NormalJ2JConfigFileAnalyzerTester.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.test.java2java;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.smooks.analyzer.MappingModel;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
+import org.jboss.tools.smooks.analyzer.ResourceConfigEraser;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
+import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
+import org.jboss.tools.smooks.model.DocumentRoot;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+
+/**
+ * @author Dart Peng Date : 2008-9-1
+ */
+public class NormalJ2JConfigFileAnalyzerTester extends
+ AbstractJava2JavaModelTestCase {
+
+ public MappingResourceConfigList analyzeGraphical() throws IOException,
+ InvocationTargetException {
+ ClassLoader classLoader = NormalJ2JConfigFileAnalyzerTester.class
+ .getClassLoader();
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ ((JavaBeanAnalyzer) sourceModelAnalyzer)
+ .setCurrentClassLoader(classLoader);
+ ((JavaBeanAnalyzer) targetModelAnalyzer)
+ .setCurrentClassLoader(classLoader);
+ Object source = sourceModelAnalyzer.buildSourceInputObjects(graph,
+ listType, null, null);
+ Object target = targetModelAnalyzer.buildTargetInputObjects(graph,
+ listType, null, null);
+ MappingResourceConfigList configList = connectionsAnalyzer
+ .analyzeMappingSmooksModel(listType, source, target);
+ List connections = configList.getMappingModelList();
+ List relationgConnection = configList
+ .getGraphRenderResourceConfigList();
+ // there are 8 connection lines model
+ Assert.assertTrue(connections.size() == 8);
+
+ // those 8 connection lines were analyzed by 3 ResourceConfig element
+ Assert.assertTrue(relationgConnection.size() == 3);
+
+ // check the connection properties
+ for (Iterator iterator = connections.iterator(); iterator.hasNext();) {
+ MappingModel connectionModels = (MappingModel) iterator.next();
+ Assert.assertNotNull(connectionModels.getSource());
+ Assert.assertNotNull(connectionModels.getTarget());
+ JavaBeanModel sourceModel = (JavaBeanModel)connectionModels.getSource();
+ JavaBeanModel targetModel = (JavaBeanModel)connectionModels.getSource();
+ if(targetModel.isPrimitive()){
+ // check the connection model properties
+ if(targetModel.getName().equals("productCode")){
+ Assert.assertTrue(connectionModels.getProperties().size() > 0);
+ }
+ if(targetModel.getName().equals("unitPrice")){
+ Assert.assertTrue(connectionModels.getProperties().size() > 0);
+ }
+ if(targetModel.getName().equals("unitQuantity")){
+ Assert.assertTrue(connectionModels.getProperties().size() > 0);
+ }
+ }
+ }
+
+ return configList;
+ }
+
+ public void eraserMappingResourceConfig() throws IOException,
+ InvocationTargetException {
+ ResourceConfigEraser eraser = new ResourceConfigEraser();
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ int oldCount = listType.getAbstractResourceConfig().size();
+ MappingResourceConfigList configList = analyzeGraphical();
+ eraser.cleanMappingResourceConfig(listType, configList, null);
+ int newCount = listType.getAbstractResourceConfig().size();
+ Assert.assertTrue(oldCount >= newCount);
+ }
+
+ public void testEraser() throws IOException, InvocationTargetException {
+ eraserMappingResourceConfig();
+ }
+
+ public void testAnalyzer() throws IOException, InvocationTargetException {
+ MappingResourceConfigList configList = analyzeGraphical();
+ }
+
+ public void generateNormalInforPackage() {
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ NormalSmooksModelPackage modePackage = NormalSmooksModelBuilder
+ .getInstance().buildNormalSmooksModelPackage(listType);
+
+ }
+
+ public void testGenerateNormalInforPackage() throws IOException,
+ InvocationTargetException {
+ eraserMappingResourceConfig();
+ generateNormalInforPackage();
+ }
+
+ @Override
+ public void loadResources() throws RuntimeException {
+ ClassLoader classLoader = NormalJ2JConfigFileAnalyzerTester.class
+ .getClassLoader();
+ InputStream stream1 = classLoader
+ .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml");
+ InputStream stream2 = classLoader
+ .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.smooks.graph");
+ try {
+ graphResource.load(stream2, Collections.EMPTY_MAP);
+
+ graph = (GraphInformations) graphResource.getContents().get(0);
+
+ smooksResource.load(stream1, Collections.EMPTY_MAP);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public IFile getSmooksConfigFile() {
+ return null;
+ }
+}
Property changes on:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/NormalJ2JConfigFileAnalyzerTester.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Order.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Order.java 2009-01-04
08:27:31 UTC (rev 12872)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Order.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -1,19 +1,34 @@
package org.jboss.tools.smooks.test.java2java;
-
import java.util.ArrayList;
import java.util.List;
-import java.util.Arrays;
/**
* @author <a
href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
*/
-public class Order {
- private Header header;
- private List<OrderItem> modifyOrderItems;
+public class Order extends AbstractJavaBeanModel {
+ private Header header;
+ private List<OrderItem> modifyOrderItems;
+ private int[] orderCounts = new int[] {};
+ private Header[] headerArray = new Header[] { header };
+ private int[] ages;
- private int[] ages;
- public int[] getAges() {
+ public Order() {
+ header = new Header();
+ modifyOrderItems = new ArrayList<OrderItem>();
+ modifyOrderItems.add(new OrderItem());
+ modifyOrderItems.add(new OrderItem());
+
+ modifyOrderItems.get(0).setProductId(111);
+ modifyOrderItems.get(0).setQuantity(2);
+ modifyOrderItems.get(0).setPrice(10.99);
+
+ modifyOrderItems.get(1).setProductId(222);
+ modifyOrderItems.get(1).setQuantity(4);
+ modifyOrderItems.get(1).setPrice(25.50);
+ }
+
+ public int[] getAges() {
return ages;
}
@@ -21,44 +36,45 @@
this.ages = ages;
}
- public Order() {
- header = new Header();
- modifyOrderItems = new ArrayList<OrderItem>();
- modifyOrderItems.add(new OrderItem());
- modifyOrderItems.add(new OrderItem());
+ public Header[] getHeaderArray() {
+ return headerArray;
+ }
- modifyOrderItems.get(0).setProductId(111);
- modifyOrderItems.get(0).setQuantity(2);
- modifyOrderItems.get(0).setPrice(10.99);
+ public void setHeaderArray(Header[] headerArray) {
+ this.headerArray = headerArray;
+ }
- modifyOrderItems.get(1).setProductId(222);
- modifyOrderItems.get(1).setQuantity(4);
- modifyOrderItems.get(1).setPrice(25.50);
- }
+ public int[] getOrderCounts() {
+ return orderCounts;
+ }
- public Header getHeader() {
- return header;
- }
+ public void setOrderCounts(int[] orderCounts) {
+ this.orderCounts = orderCounts;
+ }
- public void setHeader(Header header) {
- this.header = header;
- }
+ public Header getHeader() {
+ return header;
+ }
- public List<OrderItem> getOrderItems() {
- return modifyOrderItems;
- }
+ public void setHeader(Header header) {
+ this.header = header;
+ }
- public void setOrderItems(List<OrderItem> orderItems) {
- this.modifyOrderItems = orderItems;
- }
+ public List<OrderItem> getOrderItems() {
+ return modifyOrderItems;
+ }
- public String toString() {
- StringBuilder stringBuilder = new StringBuilder();
+ public void setOrderItems(List<OrderItem> orderItems) {
+ this.modifyOrderItems = orderItems;
+ }
- stringBuilder.append("Class: " + getClass().getName() +
"\n");
- stringBuilder.append("\theader: " + header + "\n");
- stringBuilder.append("\torderItems: " + modifyOrderItems);
+ public String toString() {
+ StringBuilder stringBuilder = new StringBuilder();
- return stringBuilder.toString();
- }
+ stringBuilder.append("Class: " + getClass().getName() + "\n");
+ stringBuilder.append("\theader: " + header + "\n");
+ stringBuilder.append("\torderItems: " + modifyOrderItems);
+
+ return stringBuilder.toString();
+ }
}
\ No newline at end of file
Deleted:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2009-01-04
08:27:31 UTC (rev 12872)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.smooks.test.java2java;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
-import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder;
-import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
-import org.jboss.tools.smooks.analyzer.ResourceConfigEraser;
-import org.jboss.tools.smooks.graphical.GraphInformations;
-import org.jboss.tools.smooks.graphical.GraphicalPackage;
-import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
-import org.jboss.tools.smooks.model.DocumentRoot;
-import org.jboss.tools.smooks.model.SmooksPackage;
-import org.jboss.tools.smooks.model.SmooksResourceListType;
-import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl;
-
-/**
- * @author Dart Peng Date : 2008-9-1
- */
-public class SmooksAnalyzerTester extends TestCase {
-
- private GraphInformations graph;
- private Resource resource;
- private ComposedAdapterFactory adapterFactory;
- private AdapterFactoryEditingDomain editingDomain;
- private Resource smooksResource;
- protected CommandStack createCommandStack() {
- return new BasicCommandStack();
- }
- public SmooksAnalyzerTester() throws IOException {
-// super();
- adapterFactory = new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
- adapterFactory
- .addAdapterFactory(new ResourceItemProviderAdapterFactory());
- adapterFactory
- .addAdapterFactory(new SmooksItemProviderAdapterFactory());
- editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
- createCommandStack(), new HashMap<Resource, Boolean>());
-
-
- ClassLoader classLoader = SmooksAnalyzerTester.class.getClassLoader();
- Registry.INSTANCE.put(GraphicalPackage.eNS_URI,
- GraphicalPackage.eINSTANCE);
- Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
-
- resource = new SmooksResourceFactoryImpl().createResource(null);
- Resource gr = new XMLResourceFactoryImpl().createResource(null);
- InputStream stream1 = classLoader
- .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml");
- InputStream stream2 = classLoader
- .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.smooks.graph");
- gr.load(stream2, Collections.EMPTY_MAP);
- graph = (GraphInformations) gr.getContents().get(0);
-
- resource.load(stream1, Collections.EMPTY_MAP);
- }
-
- public MappingResourceConfigList analyzeGraphical() {
- try {
- ClassLoader classLoader = SmooksAnalyzerTester.class
- .getClassLoader();
- JavaBeanAnalyzer sourceModelAnalyzer = new JavaBeanAnalyzer();
- JavaBeanAnalyzer targetModelAnalyzer = new JavaBeanAnalyzer();
- JavaBeanAnalyzer connectionsAnalyzer = new JavaBeanAnalyzer();
- SmooksResourceListType listType = ((DocumentRoot) resource
- .getContents().get(0)).getSmooksResourceList();
- Object source = sourceModelAnalyzer.buildSourceInputObjects(graph,
- listType, null, classLoader);
- Object target = targetModelAnalyzer.buildTargetInputObjects(graph,
- listType, null, classLoader);
- MappingResourceConfigList configList = connectionsAnalyzer
- .analyzeMappingSmooksModel(listType, source, target);
- List connections = configList.getMappingModelList();
- List relationgConnection = configList
- .getRelationgResourceConfigList();
- Assert.assertTrue(!connections.isEmpty());
- Assert.assertTrue(!relationgConnection.isEmpty());
- System.out.println(connections);
- return configList;
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public void eraserMappingResourceConfig() {
- ResourceConfigEraser eraser = new ResourceConfigEraser();
- SmooksResourceListType listType = ((DocumentRoot) resource
- .getContents().get(0)).getSmooksResourceList();
- int oldCount = listType.getAbstractResourceConfig().size();
- MappingResourceConfigList configList = analyzeGraphical();
- eraser.cleanMappingResourceConfig(listType, configList, null);
- int newCount = listType.getAbstractResourceConfig().size();
- Assert.assertTrue(oldCount >= newCount);
- }
-
- public void testEraser() {
- eraserMappingResourceConfig();
- }
-
- public void testAnalyzer() {
- MappingResourceConfigList configList = analyzeGraphical();
- }
-
- public void generateNormalInforPackage() {
- SmooksResourceListType listType = ((DocumentRoot) resource
- .getContents().get(0)).getSmooksResourceList();
- NormalSmooksModelPackage modePackage = NormalSmooksModelBuilder
- .getInstance().buildNormalSmooksModelPackage(listType);
-
- }
-
- public void testGenerateNormalInforPackage(){
- eraserMappingResourceConfig();
- generateNormalInforPackage();
- }
-}
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml 2009-01-04
08:27:31 UTC (rev 12872)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml 2009-01-04
08:32:25 UTC (rev 12873)
@@ -5,11 +5,10 @@
<param name="stream.filter.type">SAX</param>
</resource-config>
-
- <resource-config selector="srcmodel.Order">
+ <resource-config
selector="org.jboss.tools.smooks.test.java2java.Order">
<resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">LineOrder</param>
- <param name="beanClass">targetmodel.LineOrder</param>
+ <param
name="beanClass">org.jboss.tools.smooks.test.java2java.LineOrder</param>
<param name="bindings">
<binding property="customerId"
selector="header customerNumber" />
@@ -21,47 +20,25 @@
<resource-config selector="orderItems">
<resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">lineItems</param>
- <param name="beanClass">targetmodel.LineItem[]</param>
+ <param
name="beanClass">org.jboss.tools.smooks.test.java2java.LineItem[]</param>
<param name="bindings">
<binding property="LineItem" selector="${LineItem}" />
</param>
</resource-config>
- <resource-config selector="srcmodel.OrderItem">
+ <resource-config
selector="org.jboss.tools.smooks.test.java2java.OrderItem">
<resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">LineItem</param>
- <param name="beanClass">targetmodel.LineItem</param>
+ <param
name="beanClass">org.jboss.tools.smooks.test.java2java.LineItem</param>
<param name="bindings">
<binding property="productCode"
- selector="srcmodel.OrderItem productId" />
+ selector="org.jboss.tools.smooks.test.java2java.OrderItem productId"
type="Integer" />
<binding property="unitPrice"
- selector="srcmodel.OrderItem price" />
- <binding property="unitPrice"
- selector="srcmodel.OrderItem Ate" />
+ selector="org.jboss.tools.smooks.test.java2java.OrderItem price"
type="BigInteger"/>
<binding property="unitQuantity"
- selector="srcmodel.OrderItem quantity" />
+ selector="org.jboss.tools.smooks.test.java2java.OrderItem quantity"
type="Double" />
</param>
</resource-config>
- <resource-config selector="addtioninfo">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">no</param>
- </resource-config>
-
- <resource-config selector="addtioninfo1">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">no1</param>
- </resource-config>
-
- <resource-config selector="addtioninfo2">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">no2</param>
- </resource-config>
-
- <resource-config selector="addtioninfo3">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">no3</param>
- </resource-config>
-
<resource-config selector="decoder:OrderDateLong">
<resource>org.milyn.javabean.decoders.DateDecoder</resource>
<param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/ModelTest.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/ModelTest.java 2009-01-04
08:27:31 UTC (rev 12872)
+++
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/ModelTest.java 2009-01-04
08:32:25 UTC (rev 12873)
@@ -51,6 +51,6 @@
XMLObjectAnalyzer an = new XMLObjectAnalyzer();
InputStream aa = ModelTest.class.getClassLoader().getResourceAsStream(
"org/jboss/tools/smooks/test/xml/pom.xml");
- System.out.println(an.analyze(aa).toString());
+ System.out.println(an.analyze(aa , null).toString());
}
}