[gentoo-portage-dev] [PATCH 1/3] xml-text/valid: add a second description to downstream maintainer

[gentoo-portage-dev] [PATCH 1/3] xml-text/valid: add a second description to downstream maintainer

[Göktürk Yüksek]

Increase coverage and prevent future regressions by adding a second
description for a downstream maintainer element. See also:
https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=6070512ca

Signed-off-by: Göktürk Yüksek <gokturk@binghamton.edu>
---
 xml-test/valid/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xml-test/valid/metadata.xml b/xml-test/valid/metadata.xml
index c33f7ac..c9d92a3 100644
--- a/xml-test/valid/metadata.xml
+++ b/xml-test/valid/metadata.xml
@@ -14,6 +14,7 @@
     <email>upstream@example.com</email>
     <name>Upstream Developer</name>
     <description>Upstream developer, wishing to be CC-ed on bugs</description>
+    <description lang="tr">Ana geliştirici, hata raporlarında CC'ye ekle</description>
   </maintainer>
   <longdescription>
     First paragraph of extensive description.
-- 
2.7.3

[gentoo-portage-dev] [PATCH 2/3] xml-test/singularity: tests for at-most-one element violations

[Göktürk Yüksek]

Signed-off-by: Göktürk Yüksek <gokturk@binghamton.edu>
---
 xml-test/singularity/metadata.xml           | 43 +++++++++++++++++++++++++++++
 xml-test/singularity/singularity-0.1.ebuild | 11 ++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 xml-test/singularity/metadata.xml
 create mode 100644 xml-test/singularity/singularity-0.1.ebuild

diff --git a/xml-test/singularity/metadata.xml b/xml-test/singularity/metadata.xml
new file mode 100644
index 0000000..640acf6
--- /dev/null
+++ b/xml-test/singularity/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    Tests for elements with at most one occurrence.
+
+    Singularity doesn't check for uniqueness. We are only interested
+    in elements that can't appear more than once.
+
+    The tests are conservative: if we check &lt;email&gt; element
+    singularity in downstream maintainer, we do not check it again
+    in upstream maintainer.
+  </longdescription>
+  <maintainer type='person'>
+    <email>gen-b0rk@gentoo.org</email>
+    <!-- multiple <email> elements are not allowed -->
+    <email>at-most-one-violation@gentoo.org</email>
+  </maintainer>
+  <slots>
+    <subslots>Match SONAME of libsingularity.so</subslots>
+    <!-- multiple <subslots> elements are not allowed -->
+    <subslots>at-most-one violation</subslots>
+  </slots>
+  <upstream>
+    <maintainer>
+      <name>Gen B0rk</name>
+      <!-- multiple <name> elements are not allowed -->
+      <name>at-most-one violation</name>
+    </maintainer>
+    <changelog>https://gitweb.gentoo.org/repo/proj/gen-b0rk.git/</changelog>
+    <!-- multiple <changelog> elements are not allowed -->
+    <changelog>https://gentoo.org/at-most-one-violation.html</changelog>
+    <bugs-to>http://www.example.com/issues.html</bugs-to>
+    <!-- multiple <bugs-to> elements are not allowed -->
+    <bugs-to>https://gentoo.org/at-most-one-violation</bugs-to>
+  </upstream>
+  <!-- multiple <upstream> elements are not allowed -->
+  <upstream>
+    <maintainer>
+      <name>Gen B0rk</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/xml-test/singularity/singularity-0.1.ebuild b/xml-test/singularity/singularity-0.1.ebuild
new file mode 100644
index 0000000..6683aad
--- /dev/null
+++ b/xml-test/singularity/singularity-0.1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Tests for element singularity"
+HOMEPAGE="https://wiki.gentoo.org/wiki/GLEP:68"
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64"
-- 
2.7.3

[gentoo-portage-dev] [PATCH 3/3] xml-test/uniqueness: tests for unique (element,attribute,value) combinations

[Göktürk Yüksek]

Signed-off-by: Göktürk Yüksek <gokturk@binghamton.edu>
---
 xml-test/uniqueness/metadata.xml          | 33 +++++++++++++++++++++++++++++++
 xml-test/uniqueness/uniqueness-0.1.ebuild | 12 +++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 xml-test/uniqueness/metadata.xml
 create mode 100644 xml-test/uniqueness/uniqueness-0.1.ebuild

diff --git a/xml-test/uniqueness/metadata.xml b/xml-test/uniqueness/metadata.xml
new file mode 100644
index 0000000..84b3a1b
--- /dev/null
+++ b/xml-test/uniqueness/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    Tests for the uniqueness of elements.
+
+    Uniqueness focuses on element, attribute, value combinations
+    which must not repeat.
+
+    The tests are conservative: i.e. if we check the
+    (longdescription, lang, restrict) combination, we do not check
+    (slots,lang, restrict).
+  </longdescription>
+  <!-- non-unique (longdescription, lang, restrict) combination -->
+  <longdescription lang='en'>uniqueness violation</longdescription>
+  <maintainer type='person'>
+    <email>gen-b0rk@gentoo.org</email>
+  </maintainer>
+  <maintainer type='project'>
+    <!-- non-unique (maintainer, email, restrict) combination -->
+    <email>gen-b0rk@gentoo.org</email>
+  </maintainer>
+  <slots>
+    <slot name="0">Match the SONAME of libuniqueness.so</slot>
+    <!-- non-unique (slot, name, restrict) combination -->
+    <slot name="0">uniqueness violation</slot>
+  </slots>
+  <use>
+    <flag name="foo">Enable feature foo</flag>
+    <!-- non-unique (flag, name, restrict) combination -->
+    <flag name="foo">uniqueness violation</flag>
+  </use>
+</pkgmetadata>
diff --git a/xml-test/uniqueness/uniqueness-0.1.ebuild b/xml-test/uniqueness/uniqueness-0.1.ebuild
new file mode 100644
index 0000000..03c3fa7
--- /dev/null
+++ b/xml-test/uniqueness/uniqueness-0.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Tests for (element, attribute, value) uniqueness"
+HOMEPAGE="https://wiki.gentoo.org/wiki/GLEP:68"
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="foo"
-- 
2.7.3