Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'core/test/core')
-rw-r--r--core/test/core/vector/interpolate.xml12
-rw-r--r--core/test/core/vector/table.xml52
2 files changed, 32 insertions, 32 deletions
diff --git a/core/test/core/vector/interpolate.xml b/core/test/core/vector/interpolate.xml
index 91b5b2e..edf3407 100644
--- a/core/test/core/vector/interpolate.xml
+++ b/core/test/core/vector/interpolate.xml
@@ -130,9 +130,9 @@
<rate yields="interpTableMaxFieldValue">
<t:query-first-field table="interp-query-field-test"
field="value">
- <t:when field="key">
+ <t:where-eq field="key">
<c:value-of name="interpTableMaxKeyValue" />
- </t:when>
+ </t:where-eq>
</t:query-first-field>
</rate>
</section>
@@ -170,10 +170,10 @@
key="key"
step="INTERP_TABLE_STEP"
actual="#300">
- <t:when field="pred">
+ <t:where-eq field="pred">
<c:const value="31" type="float"
desc="Test predicate value" />
- </t:when>
+ </t:where-eq>
</t:interpolate-query-field>
</t:given>
@@ -220,10 +220,10 @@
key="key"
step="INTERP_TABLE_STEP"
actual="#350">
- <t:when field="pred">
+ <t:where-eq field="pred">
<c:const value="31" type="float"
desc="Test predicate value" />
- </t:when>
+ </t:where-eq>
</t:interpolate-query-field>
</t:given>
diff --git a/core/test/core/vector/table.xml b/core/test/core/vector/table.xml
index df2b5e3..1491e11 100644
--- a/core/test/core/vector/table.xml
+++ b/core/test/core/vector/table.xml
@@ -122,9 +122,9 @@
<t:it desc="returns first row of multi-row result">
<t:given>
<t:query-first-field table="test-table" field="c">
- <t:when field="a">
+ <t:where-eq field="a">
<c:value-of name="#1" />
- </t:when>
+ </t:where-eq>
</t:query-first-field>
</t:given>
@@ -137,12 +137,12 @@
<t:it desc="returns first row of single-row result">
<t:given>
<t:query-first-field table="test-table" field="c">
- <t:when field="a">
+ <t:where-eq field="a">
<c:value-of name="#1" />
- </t:when>
- <t:when field="b">
+ </t:where-eq>
+ <t:where-eq field="b">
<c:value-of name="#12" />
- </t:when>
+ </t:where-eq>
</t:query-first-field>
</t:given>
@@ -160,9 +160,9 @@
<t:given>
<c:length-of>
<t:query-field table="test-table" field="c">
- <t:when field="a">
+ <t:where-eq field="a">
<c:value-of name="#1" />
- </t:when>
+ </t:where-eq>
</t:query-field>
</c:length-of>
</t:given>
@@ -177,12 +177,12 @@
<t:given>
<c:car>
<t:query-field table="test-table" field="c">
- <t:when field="a">
+ <t:where-eq field="a">
<c:value-of name="#1" />
- </t:when>
- <t:when field="b">
+ </t:where-eq>
+ <t:where-eq field="b">
<c:value-of name="#11" />
- </t:when>
+ </t:where-eq>
</t:query-field>
</c:car>
</t:given>
@@ -218,9 +218,9 @@
<c:values>
<c:value name="results" type="integer" set="vector">
<t:query-field table="test-table-seq" field="a">
- <t:when field="a" op="CMP_OP_LT">
+ <t:where-lt field="a">
<c:value-of name="#5" />
- </t:when>
+ </t:where-lt>
</t:query-field>
</c:value>
</c:values>
@@ -244,9 +244,9 @@
<c:values>
<c:value name="results" type="integer" set="vector">
<t:query-field table="test-table-seq" field="a">
- <t:when field="a" op="CMP_OP_LTE">
+ <t:where-lte field="a">
<c:value-of name="#5" />
- </t:when>
+ </t:where-lte>
</t:query-field>
</c:value>
</c:values>
@@ -270,9 +270,9 @@
<c:values>
<c:value name="results" type="integer" set="vector">
<t:query-field table="test-table-seq" field="a">
- <t:when field="a" op="CMP_OP_GT">
+ <t:where-gt field="a">
<c:value-of name="#5" />
- </t:when>
+ </t:where-gt>
</t:query-field>
</c:value>
</c:values>
@@ -296,9 +296,9 @@
<c:values>
<c:value name="results" type="integer" set="vector">
<t:query-field table="test-table-seq" field="a">
- <t:when field="a" op="CMP_OP_GTE">
+ <t:where-gte field="a">
<c:value-of name="#5" />
- </t:when>
+ </t:where-gte>
</t:query-field>
</c:value>
</c:values>
@@ -323,9 +323,9 @@
<t:given>
<c:length-of>
<t:query-row table="test-table">
- <t:when field="a">
+ <t:where-eq field="a">
<c:value-of name="#1" />
- </t:when>
+ </t:where-eq>
</t:query-row>
</c:length-of>
</t:given>
@@ -343,12 +343,12 @@
<c:value name="first_row" type="integer" set="vector">
<c:car>
<t:query-row table="test-table">
- <t:when field="a">
+ <t:where-eq field="a">
<c:value-of name="#1" />
- </t:when>
- <t:when field="b">
+ </t:where-eq>
+ <t:where-eq field="b">
<c:value-of name="#11" />
- </t:when>
+ </t:where-eq>
</t:query-row>
</c:car>
</c:value>