xkbdesc/tests listCI2.xsl, 1.2, 1.3 listCIs.xsl, 1.1, 1.2 testLayouts.pl, 1.7, 1.8 testModels.pl, 1.6, 1.7 testOptions.pl, 1.3, 1.4
"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xlibs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: svu
Update of /cvs/xlibs/xkbdesc/tests
In directory kemper:/tmp/cvs-serv21325/tests
Modified Files:
listCI2.xsl listCIs.xsl testLayouts.pl testModels.pl
testOptions.pl
Log Message:
a bit of cleanup in tests
Index: listCI2.xsl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/tests/listCI2.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- listCI2.xsl 6 May 2004 01:00:44 -0000 1.2
+++ listCI2.xsl 9 Oct 2006 20:41:33 -0000 1.3
@@ -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>
Index: listCIs.xsl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/tests/listCIs.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- listCIs.xsl 25 Apr 2004 19:26:03 -0000 1.1
+++ listCIs.xsl 9 Oct 2006 20:41:33 -0000 1.2
@@ -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>
Index: testLayouts.pl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/tests/testLayouts.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- testLayouts.pl 1 Dec 2005 00:23:39 -0000 1.7
+++ testLayouts.pl 9 Oct 2006 20:41:33 -0000 1.8
@@ -5,7 +5,7 @@
use xkbTestFunc;
xkbTestFunc::backupXkbSettings();
-
+
xkbTestFunc::dumpXkbSettingsBackup();
xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1, 0 );
@@ -13,3 +13,5 @@
sleep 2;
xkbTestFunc::restoreXkbSettings();
+
+print "Done!\n";
Index: testModels.pl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/tests/testModels.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- testModels.pl 1 Dec 2005 00:23:39 -0000 1.6
+++ testModels.pl 9 Oct 2006 20:41:33 -0000 1.7
@@ -5,9 +5,11 @@
use xkbTestFunc;
xkbTestFunc::backupXkbSettings();
-
+
xkbTestFunc::dumpXkbSettingsBackup();
-
+
xkbTestFunc::testLevel1( "model", 1 );
xkbTestFunc::restoreXkbSettings();
+
+print "Done!\n";
Index: testOptions.pl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/tests/testOptions.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- testOptions.pl 1 Dec 2005 00:23:39 -0000 1.3
+++ testOptions.pl 9 Oct 2006 20:41:33 -0000 1.4
@@ -5,9 +5,11 @@
use xkbTestFunc;
xkbTestFunc::backupXkbSettings();
-
+
xkbTestFunc::dumpXkbSettingsBackup();
xkbTestFunc::testLevel2( "group", "option", 4, ":", "", 0, 0, 1 );
xkbTestFunc::restoreXkbSettings();
+
+print "Done!\n";