From 93ee3e3ff17931777c03ee891a4121daacc109a2 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 11 Aug 2008 15:57:39 +0800
Subject: [PATCH] update for EOFM-141, EOFM-142
---
xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml | 116 +++++++++++++++++++++++++++++++++++---
xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java | 8 +-
2 files changed, 109 insertions(+), 15 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java b/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java
index 7b21d8a..185f770 100644
--- a/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java
+++ b/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java
@@ -50,11 +50,11 @@
filter = ed.getRules().get(1);
Assert.assertTrue(filter instanceof TypeCompIdDispatchableFilter);
TypeCompIdDispatchableFilter tcFilter = (TypeCompIdDispatchableFilter) filter;
- Assert.assertEquals(tcFilter.getName(), "DemoFeature2");
- Assert.assertEquals(tcFilter.getTid(), 107);
- Assert.assertEquals(tcFilter.getCid(), 11);
+ Assert.assertEquals(tcFilter.getName(), "FSC-106.C-1");
+ Assert.assertEquals(tcFilter.getTid(), 106);
+ Assert.assertEquals(tcFilter.getCid(), 1);
Assert.assertNotNull(tcFilter.getCreateStrategy());
- Assert.assertTrue(tcFilter.getCreateStrategy() instanceof CreateLineTextStrategy);
+ // Assert.assertTrue(tcFilter.getCreateStrategy() instanceof CreateLineTextStrategy);
/*
filter = ed.getRules().get(2);
Assert.assertTrue(filter instanceof TypeCompLevelIdDispatchableFilter);
diff --git a/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml b/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml
index a187f52..3909d4b 100644
--- a/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml
+++ b/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml
@@ -255,6 +255,7 @@
<description>�q��-1/600���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -281,9 +282,10 @@
<cid>9</cid>
<description>�q�������u</description>
<elementCriterion>
+ <elementType>4</elementType>
<elementType>17</elementType>
</elementCriterion>
- <SymbolCreateStrategy/>
+ <LineTextCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-407.C-10">
<tid>407</tid>
@@ -514,6 +516,7 @@
<description>���������O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -531,6 +534,7 @@
<cid>3</cid>
<description>���O�t����������O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -540,6 +544,7 @@
<cid>4</cid>
<description>�C���t�������</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<SymbolCreateStrategy/>
@@ -550,6 +555,7 @@
<description>�C���t����������O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -558,6 +564,7 @@
<cid>6</cid>
<description>�C���t�ι�-�t�q�Ǯy�е��O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -567,6 +574,7 @@
<cid>7</cid>
<description>�C���t�ι�-�t�q�Ǯy�е��O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -577,6 +585,7 @@
<description>�[��������(�a�U�C����)���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -631,6 +640,7 @@
<description>�ɽu���O(�u���ϥ�)</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -648,6 +658,7 @@
<cid>4</cid>
<description>�X�u�N�����O(�u���ϥ�)</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -688,6 +699,7 @@
<description>����u���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -697,6 +709,7 @@
<description>����u�����O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -734,6 +747,7 @@
<description>���O�d�������I���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -761,6 +775,7 @@
<description>�C���ɽu���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -782,6 +797,26 @@
</elementCriterion>
<SymbolCreateStrategy/>
</TypeCompFilter>
+ <TypeCompFilter name="FSC-206.C-1">
+ <tid>206</tid>
+ <cid>1</cid>
+ <description>�C�������c���O</description>
+ <elementCriterion>
+ <elementType>7</elementType>
+ <elementType>17</elementType>
+ </elementCriterion>
+ <TextCreateStrategy/>
+ </TypeCompFilter>
+ <TypeCompFilter name="FSC-206.C-2">
+ <tid>206</tid>
+ <cid>2</cid>
+ <description>�C�������c���P���O</description>
+ <elementCriterion>
+ <elementType>7</elementType>
+ <elementType>17</elementType>
+ </elementCriterion>
+ <TextCreateStrategy/>
+ </TypeCompFilter>
<TypeCompFilter name="FSC-207.C-0">
<tid>207</tid>
<cid>0</cid>
@@ -790,6 +825,26 @@
<elementType>17</elementType>
</elementCriterion>
<SymbolCreateStrategy/>
+ </TypeCompFilter>
+ <TypeCompFilter name="FSC-207.C-1">
+ <tid>207</tid>
+ <cid>1</cid>
+ <description>�C��ĵ�������O</description>
+ <elementCriterion>
+ <elementType>7</elementType>
+ <elementType>17</elementType>
+ </elementCriterion>
+ <TextCreateStrategy/>
+ </TypeCompFilter>
+ <TypeCompFilter name="FSC-207.C-2">
+ <tid>207</tid>
+ <cid>2</cid>
+ <description>�C��ĵ�������P���O</description>
+ <elementCriterion>
+ <elementType>7</elementType>
+ <elementType>17</elementType>
+ </elementCriterion>
+ <TextCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-208.C-0">
<tid>208</tid>
@@ -808,6 +863,16 @@
<elementType>17</elementType>
</elementCriterion>
<SymbolCreateStrategy/>
+ </TypeCompFilter>
+ <TypeCompFilter name="FSC-209.C-1">
+ <tid>209</tid>
+ <cid>1</cid>
+ <description>�C����q���x���O</description>
+ <elementCriterion>
+ <elementType>7</elementType>
+ <elementType>17</elementType>
+ </elementCriterion>
+ <TextCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-210.C-0">
<tid>210</tid>
@@ -841,7 +906,10 @@
<tid>210</tid>
<cid>3</cid>
<description>�C���a�U�ɽu�Ÿ�</description>
- <elmtype>4</elmtype>
+ <elementCriterion>
+ <elementType>4</elementType>
+ <elementType>12</elementType>
+ </elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-210.C-4">
@@ -849,6 +917,7 @@
<cid>4</cid>
<description>�C���a�U�ɽu���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -859,23 +928,26 @@
<description>�C���[�ű���u</description>
<elementCriterion>
<elementType>4</elementType>
+ <elementType>12</elementType>
</elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-211.C-1">
<tid>211</tid>
<cid>1</cid>
- <description>�C���[�ű���u</description>
+ <description>�C���[�ű���u���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
- <LineCreateStrategy/>
+ <TextCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-211.C-2">
<tid>211</tid>
<cid>2</cid>
<description>�C���[�ű���u�����O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -886,6 +958,7 @@
<description>�C���[�ųs������u</description>
<elementCriterion>
<elementType>4</elementType>
+ <elementType>12</elementType>
</elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
@@ -894,6 +967,7 @@
<cid>1</cid>
<description>�C���[�ųs������u���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -903,6 +977,7 @@
<cid>2</cid>
<description>�C���[�ųs������u�����O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -913,6 +988,7 @@
<description>�C���a�U�s������u</description>
<elementCriterion>
<elementType>4</elementType>
+ <elementType>12</elementType>
</elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
@@ -921,6 +997,7 @@
<cid>1</cid>
<description>�C���a�U�s������u���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -930,6 +1007,7 @@
<cid>2</cid>
<description>�C���a�U�s������u�����O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -957,6 +1035,7 @@
<cid>1</cid>
<description>�C���ʵ������O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -966,6 +1045,7 @@
<cid>2</cid>
<description>�C���ʵ������P���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -995,6 +1075,7 @@
<cid>1</cid>
<description>���ֹq�l����(����)���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1004,6 +1085,7 @@
<cid>2</cid>
<description>���ֹq�l��r�������O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1014,6 +1096,7 @@
<description>���ֹq�l�u�Ÿ�</description>
<elementCriterion>
<elementType>4</elementType>
+ <elementType>12</elementType>
</elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
@@ -1050,6 +1133,7 @@
<cid>3</cid>
<description>���O����u���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1059,7 +1143,7 @@
<cid>0</cid>
<description>���O</description>
<elementCriterion>
- <elementType>4</elementType>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1087,6 +1171,7 @@
<cid>1</cid>
<description>���C���H��ծy�е��O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1098,7 +1183,7 @@
<elementCriterion>
<elementType>17</elementType>
</elementCriterion>
- <EllipseShapeCreateStrategy/>
+ <SymbolCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-403.C-4">
<tid>403</tid>
@@ -1107,13 +1192,14 @@
<elementCriterion>
<elementType>17</elementType>
</elementCriterion>
- <EllipseShapeCreateStrategy/>
+ <SymbolCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-403.C-5">
<tid>403</tid>
<cid>5</cid>
<description>���O�ծy�е��O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1125,13 +1211,14 @@
<elementCriterion>
<elementType>17</elementType>
</elementCriterion>
- <EllipseShapeCreateStrategy/>
+ <SymbolCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-403.C-7">
<tid>403</tid>
<cid>7</cid>
<description>���l�ծy�е��O(���l�ϥ�)</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1142,6 +1229,7 @@
<description>��</description>
<elementCriterion>
<elementType>12</elementType>
+ <elementType>16</elementType>
</elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
@@ -1169,6 +1257,7 @@
<description>����r�������O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -1186,7 +1275,7 @@
<cid>0</cid>
<description>���O�t���u</description>
<elementCriterion>
- <elementType>17</elementType>
+ <elementType>12</elementType>
</elementCriterion>
<LineCreateStrategy/>
</TypeCompFilter>
@@ -1222,6 +1311,7 @@
<cid>3</cid>
<description>���O�ާ@�u���O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1277,6 +1367,7 @@
<description>���O�x�b�ϸ�(�e�q.����)���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
@@ -1310,11 +1401,12 @@
<TypeCompFilter name="FSC-315.C-1">
<tid>315</tid>
<cid>1</cid>
- <description>�[�Ÿ��O����u</description>
+ <description>�[�Ÿ��O����u���O</description>
<elementCriterion>
<elementType>7</elementType>
+ <elementType>17</elementType>
</elementCriterion>
- <LineCreateStrategy/>
+ <TextCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-316.C-0">
<tid>316</tid>
@@ -1339,6 +1431,7 @@
<cid>1</cid>
<description>���O����}�����O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
@@ -1393,6 +1486,7 @@
<cid>1</cid>
<description>�۰ʤƻ��������O</description>
<elementCriterion>
+ <elementType>7</elementType>
<elementType>17</elementType>
</elementCriterion>
<TextCreateStrategy/>
--
Gitblit v0.0.0-SNAPSHOT