summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2006-10-09 20:41:33 +0000
committersvu <svu>2006-10-09 20:41:33 +0000
commitbedcf4e1511639c314800fbd87486d7eb1bd4149 (patch)
treea29442b45613389dbfb02f0174d58f4bbd27a330
parent21cf640fe5f2269439d2c140dff2df691922570d (diff)
a bit of cleanup in tests
-rw-r--r--tests/listCI2.xsl11
-rw-r--r--tests/listCIs.xsl13
-rwxr-xr-xtests/testLayouts.pl4
-rw-r--r--tests/testModels.pl6
-rwxr-xr-xtests/testOptions.pl4
5 files changed, 27 insertions, 11 deletions
diff --git a/tests/listCI2.xsl b/tests/listCI2.xsl
index 3dd48d7..484d9dd 100644
--- a/tests/listCI2.xsl
+++ b/tests/listCI2.xsl
@@ -7,10 +7,15 @@
<xsl:param name="type"/>
<xsl:param name="parentId"/>
+ <xsl:template match="xkbConfigRegistry">
+ <xsl:apply-templates select=".//configItem[(name(..) = $type) and (../../../configItem/name = $parentId or ../../configItem/name = $parentId )]">
+ <xsl:sort select="name"/>
+ </xsl:apply-templates>
+ </xsl:template>
+
<xsl:template match="configItem">
- <xsl:if test="name(..) = $type and ( ../../../configItem/name = $parentId or ../../configItem/name = $parentId )">
- <xsl:value-of select="./name"/>
- </xsl:if>
+ <xsl:value-of select="./name"/><xsl:text>
+</xsl:text>
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/listCIs.xsl b/tests/listCIs.xsl
index 0d2cd97..09cf4d9 100644
--- a/tests/listCIs.xsl
+++ b/tests/listCIs.xsl
@@ -5,11 +5,16 @@
<xsl:output method="text"/>
<xsl:param name="type"/>
-
+
+ <xsl:template match="xkbConfigRegistry">
+ <xsl:apply-templates select=".//configItem[name(..) = $type]">
+ <xsl:sort select="name"/>
+ </xsl:apply-templates>
+ </xsl:template>
+
<xsl:template match="configItem">
- <xsl:if test="name(..) = $type">
- <xsl:value-of select="./name"/>
- </xsl:if>
+ <xsl:value-of select="./name"/><xsl:text>
+</xsl:text>
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/testLayouts.pl b/tests/testLayouts.pl
index 38ccb3a..8013db4 100755
--- a/tests/testLayouts.pl
+++ b/tests/testLayouts.pl
@@ -5,7 +5,7 @@ use warnings;
use xkbTestFunc;
xkbTestFunc::backupXkbSettings();
-
+
xkbTestFunc::dumpXkbSettingsBackup();
xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1, 0 );
@@ -13,3 +13,5 @@ xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1, 0 );
sleep 2;
xkbTestFunc::restoreXkbSettings();
+
+print "Done!\n";
diff --git a/tests/testModels.pl b/tests/testModels.pl
index c66a449..a7a51c1 100644
--- a/tests/testModels.pl
+++ b/tests/testModels.pl
@@ -5,9 +5,11 @@ use warnings;
use xkbTestFunc;
xkbTestFunc::backupXkbSettings();
-
+
xkbTestFunc::dumpXkbSettingsBackup();
-
+
xkbTestFunc::testLevel1( "model", 1 );
xkbTestFunc::restoreXkbSettings();
+
+print "Done!\n";
diff --git a/tests/testOptions.pl b/tests/testOptions.pl
index a485325..8a0cb0f 100755
--- a/tests/testOptions.pl
+++ b/tests/testOptions.pl
@@ -5,9 +5,11 @@ use warnings;
use xkbTestFunc;
xkbTestFunc::backupXkbSettings();
-
+
xkbTestFunc::dumpXkbSettingsBackup();
xkbTestFunc::testLevel2( "group", "option", 4, ":", "", 0, 0, 1 );
xkbTestFunc::restoreXkbSettings();
+
+print "Done!\n";