Changeset 1913

Timestamp:

26/09/03 10:11:46 (5 years ago)

Author:

mnw21

Message:

Moved main testmodel to Flymine XML, and wrote test for zargo -> flymine XML

Files:

• trunk/flymine/build.xml (modified) (4 diffs)
• trunk/intermine/build.xml (modified) (4 diffs)
• trunk/intermine/model/testmodel/testmodel.zargo (deleted)
• trunk/intermine/model/testmodel/xmitest.xmi (added)
• trunk/intermine/model/testmodel/xmitest.xml (added)
• trunk/intermine/model/testmodel/xmitest.zargo (added)
• trunk/intermine/model/xmitest (added)
• trunk/intermine/model/xmitest/testmodel_model.xml (added)
• trunk/intermine/src/test/org/intermine/modelproduction/uml (added)
• trunk/intermine/src/test/org/intermine/modelproduction/uml/XmiParserFunctionalTest.java (added)

trunk/flymine/build.xml

@@ -180 +180 @@
-    <pathelement location="${build.model}/testmodel"/>
-    <pathelement location="${build.model}/acedbtest"/>
+    <pathelement location="${build.model}/xmitest"/>
-  </path>
-
@@ -313 +314 @@
-
-  <!-- Testmodel -->
-
-zargo
+, copy-model-testmodel
+xml
-      <property name="model.name" value="testmodel"/>
-uml
+flymine
-      <reference torefid="class.path" refid="test.class.path"/>
-    </ant>
@@ -357 +358 @@
-  <target name="copy-model-acedbtest" depends="build-acedbtest">
-    <copy todir="${build.model}/acedbtest" file="${model}/acedb/acedbtest.wrm"/>
+  </target>
+
+  <!-- copy original flymine model file to model directory for testmodel -->
+  <target name="copy-model-testmodel">
+    <copy todir="${build.model}/testmodel" file="${model}/flymine/testmodel_model.xml"/>
+  </target>
+
+  <!-- copy original .xmi file to model directory for XmiParserFunctionalTest -->
+  <target name="copy-model-xmitest">
+    <copy todir="${build.model}/xmitest" file="${model}/uml/xmitest.xmi"/>
+    <copy todir="${build.model}/xmitest" file="${model}/uml/xmitest.xml"/>
-  </target>
-
@@ -468 +480 @@
-
-  <!-- run the tests -->
-
+, copy-model-xmitest
-          description="perform JUnit tests on main source code" >
-

trunk/intermine/build.xml

@@ -180 +180 @@
-    <pathelement location="${build.model}/testmodel"/>
-    <pathelement location="${build.model}/acedbtest"/>
+    <pathelement location="${build.model}/xmitest"/>
-  </path>
-
@@ -313 +314 @@
-
-  <!-- Testmodel -->
-
-zargo
+, copy-model-testmodel
+xml
-      <property name="model.name" value="testmodel"/>
-uml
+flymine
-      <reference torefid="class.path" refid="test.class.path"/>
-    </ant>
@@ -357 +358 @@
-  <target name="copy-model-acedbtest" depends="build-acedbtest">
-    <copy todir="${build.model}/acedbtest" file="${model}/acedb/acedbtest.wrm"/>
+  </target>
+
+  <!-- copy original flymine model file to model directory for testmodel -->
+  <target name="copy-model-testmodel">
+    <copy todir="${build.model}/testmodel" file="${model}/flymine/testmodel_model.xml"/>
+  </target>
+
+  <!-- copy original .xmi file to model directory for XmiParserFunctionalTest -->
+  <target name="copy-model-xmitest">
+    <copy todir="${build.model}/xmitest" file="${model}/uml/xmitest.xmi"/>
+    <copy todir="${build.model}/xmitest" file="${model}/uml/xmitest.xml"/>
-  </target>
-
@@ -468 +480 @@
-
-  <!-- run the tests -->
-
+, copy-model-xmitest
-          description="perform JUnit tests on main source code" >
-