forked from geodmms/xdgnjobs
parent: 002df836 | patch | commit | ignore whitespace
?? ?
2008-08-11 93ee3e3ff17931777c03ee891a4121daacc109a2 
update for EOFM-141, EOFM-142
2 files modified
124 ■■■■■ changed files
xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java 8 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml 116 ●●●●● patch | view | raw | blame | history 
 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);




 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/>