[javapackages] [test] renamed duplicate functions
by Michael Šimáček
commit a6b005c19d427b796dc5940ebeac9af2990b7dd4
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed Nov 6 17:06:30 2013 +0100
[test] renamed duplicate functions
test/pom_macros_test.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py
index cd02f97..784079c 100644
--- a/test/pom_macros_test.py
+++ b/test/pom_macros_test.py
@@ -124,7 +124,7 @@ class PomMacrosTest(unittest.TestCase):
self.assertEqual(res, True)
@exec_macro("pom_remove_plugin not:there", "pom_remove_plugin_ret1.xml")
- def test_remove_plugin_nons(self, stdin, stderr, returncode, pom_path):
+ def test_remove_plugin_ret1(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1)
got, want, res = self.check_result(pom_path)
@@ -335,7 +335,7 @@ class PomMacrosTest(unittest.TestCase):
@exec_macro("pom_xpath_inject pom:parent '<version>1.2</version>'",
"pom_xpath_inject_whitespace1.xml")
- def test_xpath_inject_whitespace(self, stdin, stderr, returncode, pom_path):
+ def test_xpath_inject_whitespace1(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
got, want = self.get_result_literally(pom_path)
10 years, 6 months
[javapackages] [tests] pom macros are tested in rpmbuild
by Michael Šimáček
commit cba8b7b282ce6bfe531f25573936c749dba1567f
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed Nov 6 17:05:28 2013 +0100
[tests] pom macros are tested in rpmbuild
test/pom_macros_test.py | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py
index 0500df2..cd02f97 100644
--- a/test/pom_macros_test.py
+++ b/test/pom_macros_test.py
@@ -1,12 +1,13 @@
import unittest
-import subprocess
import os
-from shutil import copyfile
+
from shutil import copytree
from shutil import rmtree
from lxml import etree
from formencode import doctest_xml_compare
+from test_rpmbuild import Package
+
ns = dict(a='http://maven.apache.org/POM/4.0.0')
dirpath = os.path.dirname(os.path.realpath(__file__))
@@ -21,14 +22,15 @@ workdir = os.path.join(datadir, "..", 'pom_macros_workdir')
def exec_macro(command = "", pom = "pom.xml"):
def test_decorator(fn):
def test_decorated(self, *args, **kwargs):
- bash = subprocess.Popen(['bash'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- stdin=subprocess.PIPE)
pompath = os.path.join(workdir, pom)
- stdin, stderr = bash.communicate("%s %s %s" % (pe, command,
- pompath))
-
- fn(self, stdin, stderr, bash.returncode, pompath)
+ pomname = os.path.basename(pom)
+ package = Package(fn.__name__)
+ pomsourcepath = package.add_source(pompath)
+ package.append_to_prep('%{command} {pom}'.format(command=command,
+ pom=pomname))
+ stdin, stderr, return_value = package.run_prep()
+
+ fn(self, stdin, stderr, return_value, pomsourcepath)
return test_decorated
return test_decorator
@@ -40,41 +42,37 @@ class PomMacrosTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.tearDownClass()
- try:
- cls.olddir = os.getcwd()
- copytree(datadir, workdir)
- os.chdir(workdir)
- except OSError:
- pass
+ cls.olddir = os.getcwd()
+ copytree(datadir, workdir)
+ os.chdir(workdir)
@classmethod
def tearDownClass(cls):
try:
rmtree(workdir)
- os.chdir(cls.olddir)
except OSError:
pass
+ os.chdir(cls.olddir)
def xml_compare_reporter(self, report):
print report
- def check_result(self, pom_path, want_suffix = "-want"):
+ def check_result(self, pom_path):
got = etree.parse(pom_path).getroot()
- want = etree.parse(pom_path + want_suffix).getroot()
+ wantpath = '{pom}-want'.format(pom=os.path.basename(pom_path))
+ want = etree.parse(wantpath).getroot()
res = doctest_xml_compare.xml_compare(got, want, self.xml_compare_reporter)
return got, want, res
- def get_result_literally(self, pom_path, want_suffix = "-want"):
+ def get_result_literally(self, pom_path):
with open(pom_path, 'r') as gotfile:
got = gotfile.read().split('\n')
- with open(pom_path + want_suffix, 'r') as wantfile:
+
+ wantpath = '{pom}-want'.format(pom=os.path.basename(pom_path))
+ with open(wantpath, 'r') as wantfile:
want = wantfile.read().split('\n')
return got, want
- @exec_macro("ls", "pom_remove_dep.xml")
- def test_sanity(self, stdin, stderr, returncode, pom_path):
- self.assertEqual(returncode, 0, stderr)
-
@exec_macro("pom_remove_dep :commons-io", "pom_remove_dep.xml")
def test_remove_dep(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
10 years, 6 months
[javapackages] [tests] add support for running macros in rpmbuild environment
by Michael Šimáček
commit 1a2914140c84fc21e5bc3e3bed39cb2e7e3ea5ef
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed Nov 6 16:37:54 2013 +0100
[tests] add support for running macros in rpmbuild environment
test/test_rpmbuild.py | 159 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 0 deletions(-)
---
diff --git a/test/test_rpmbuild.py b/test/test_rpmbuild.py
new file mode 100644
index 0000000..f2405d1
--- /dev/null
+++ b/test/test_rpmbuild.py
@@ -0,0 +1,159 @@
+import os
+import re
+import subprocess
+import shutil
+
+from textwrap import dedent
+
+from test_common import DIRPATH
+
+class Package(object):
+ """Represents single RPM package that should be built.
+
+ It creates a temporary specfile that is used to build the package using
+ rpmbuild. Every output goes to directory 'rpmbuild' (will be created) in
+ current working directory. RPM macros in javapackages/etc are processed to
+ override default lookup for our srcipts in order to test the current
+ version and not the system-wide javapackages-tools
+
+ """
+ def __init__(self, name):
+ self.__name = name
+ self.__sources = {}
+ self.__prep = ''
+ self.__build = ''
+
+ def add_source(self, sourcepath, newname=None):
+ """Add source file to a package
+
+ File will be copied into 'rpmbuild/SOURCES' and 'rpmbuild/BUILD' by
+ default. Path can be absolute or relative to test directory.
+
+ Keyword arguments:
+ newname -- name for source file. If None, sourcepath's basename will be
+ used.
+
+ """
+ if not os.path.isabs(sourcepath):
+ sourcepath = os.path.join(DIRPATH, sourcepath)
+ if not newname:
+ newname = os.path.basename(sourcepath)
+ self.__sources[sourcepath] = newname
+ return os.path.join('rpmbuild', 'BUILD', self.__name + '-1', newname)
+
+ def append_to_prep(self, to_append):
+ """Appends given string to %prep section of spec."""
+ self.__prep += to_append + '\n'
+
+ def append_to_build(self, to_append):
+ """Appends given string to %build section of spec."""
+ self.__build += to_append + '\n'
+
+ def run_prep(self):
+ """Runs rpmbuild -bp (doing only prep phase) with current settings."""
+ self.__prepare_all()
+ return self.__invoke_rpmbuild(['-bp'])
+
+ def run_build(self):
+ """Runs rpmbuild -bb (stop after build phase) with current settings."""
+ self.__prepare_all()
+ return self.__invoke_rpmbuild(['-bb'])
+
+ def __invoke_rpmbuild(self, args):
+ env = dict(os.environ)
+ env['HOME'] = os.getcwd()
+ outfile = open("tmpout", 'w')
+ errfile = open("tmperr", 'w')
+ topdir = '--define=_topdir {cwd}/rpmbuild'.format(cwd=os.getcwd())
+ proc = subprocess.Popen(['rpmbuild', topdir,
+ os.path.join('rpmbuild', 'SPECS',
+ self.__name + '.spec')]
+ + args, shell=False, env=env,
+ stdout=outfile, stderr=errfile)
+ ret = proc.wait()
+ outfile = open("tmpout", 'r+')
+ errfile = open("tmperr", 'r+')
+ out = outfile.read()
+ err = errfile.read()
+ os.remove('tmpout')
+ os.remove('tmperr')
+ return (out, err, ret)
+
+ def __prepare_all(self):
+ try:
+ os.mkdir('rpmbuild')
+ os.mkdir('rpmbuild/SOURCES')
+ os.mkdir('rpmbuild/SPECS')
+ os.mkdir('rpmbuild/RPMS')
+ os.mkdir('rpmbuild/SRPMS')
+ os.mkdir('rpmbuild/BUILD')
+ os.mkdir('rpmbuild/BUILDROOT')
+ except OSError:
+ pass
+ _prepare_macros()
+ self.__prepare_spec()
+ try:
+ self.__prepare_sources()
+ except IOError:
+ pass
+
+ def __prepare_spec(self):
+ header = dedent("""\
+ Name: {name}
+ Version: 1
+ Release: 1%{{?dist}}
+ Summary: test
+ License: GPL
+ URL: www.example.com
+ """.format(name=self.__name))
+ for index, filename in enumerate(self.__sources.values() or []):
+ header += 'Source{index}: {filename}\n'.format(filename=filename,
+ index=index)
+
+ header += dedent("""\
+ %description
+ This is just a test.
+ """)
+
+ prep_section = dedent("""\
+ %prep
+ mkdir %{name}-%{version}
+ cd %{name}-%{version}
+ """)
+ for i in range(len(self.__sources)):
+ prep_section += 'cp -p %SOURCE{index} .\n'.format(index=i)
+ prep_section += self.__prep
+
+ build_section = dedent("""\
+ %build
+
+ """)
+
+ specpath = os.path.join('rpmbuild', 'SPECS', self.__name + '.spec')
+ with open(specpath, 'w') as specfile:
+ specfile.write(header)
+ specfile.write(prep_section)
+ specfile.write(build_section)
+
+ def __prepare_sources(self):
+ destpath = os.path.join('rpmbuild', 'SOURCES')
+ for sourcepath, targetname in self.__sources.iteritems():
+ shutil.copy(sourcepath, os.path.join(destpath, targetname))
+
+def _prepare_macros():
+ etcpath = os.path.join(DIRPATH, '..', 'etc')
+ java_utils = os.path.abspath(os.path.join(DIRPATH, '..', 'java-utils'))
+
+ with open('.rpmmacros', 'w') as rpmmacros:
+ for filepath in os.listdir(etcpath):
+ if filepath.startswith('macros'):
+ with open(os.path.join(etcpath, filepath), 'r') as macrofile:
+ for line in macrofile:
+ if '/usr/share/java-utils' in line:
+ rpmmacros.write(re.sub(r'/usr/share/java-utils',
+ java_utils, line))
+ elif '%{javadir}-utils' in line:
+ rpmmacros.write(re.sub(r'%\{javadir\}-utils',
+ java_utils, line))
+ else:
+ rpmmacros.write(line)
10 years, 6 months
[Bug 1017271] New: javapackages-tools: Compat POM provides are missing SCL prefix
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1017271
Bug ID: 1017271
Summary: javapackages-tools: Compat POM provides are missing
SCL prefix
Product: Fedora
Version: rawhide
Component: javapackages-tools
Assignee: sochotni(a)redhat.com
Reporter: mizdebsk(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msrb(a)redhat.com,
sochotni(a)redhat.com
Description of problem:
Compat provides (the ones with fake "jar" extension) for POM artifacts are
missing SCL prefix (aka namespace). ALl other provides are correct.
Version-Release number of selected component (if applicable):
3.3.1-1
Steps to Reproduce:
1. Build a SCL package
2. rpm -qp rpm --provides
Actual results:
Provides for POM artifacts are missing SCL prefix
(all provides are correct except last two):
maven31-maven = 3.1.1-1.fc21
maven31-mvn(org.apache.maven:apache-maven:pom:) = 3.1.1
maven31-mvn(org.apache.maven:maven-aether-provider) = 3.1.1
maven31-mvn(org.apache.maven:maven-artifact) = 3.1.1
maven31-mvn(org.apache.maven:maven-compat) = 3.1.1
maven31-mvn(org.apache.maven:maven-core) = 3.1.1
maven31-mvn(org.apache.maven:maven-embedder) = 3.1.1
maven31-mvn(org.apache.maven:maven-model) = 3.1.1
maven31-mvn(org.apache.maven:maven-model-builder) = 3.1.1
maven31-mvn(org.apache.maven:maven-plugin-api) = 3.1.1
maven31-mvn(org.apache.maven:maven-repository-metadata) = 3.1.1
maven31-mvn(org.apache.maven:maven-settings) = 3.1.1
maven31-mvn(org.apache.maven:maven-settings-builder) = 3.1.1
maven31-mvn(org.apache.maven:maven:pom:) = 3.1.1
mvn(org.apache.maven:apache-maven) = 3.1.1
mvn(org.apache.maven:maven) = 3.1.1
Expected results:
All provides are prefixed with "maven31-"
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=k5gsPCPCnC&a=cc_unsubscribe
10 years, 6 months
[maven-doxia] Enable tests
by Mikolaj Izdebski
commit 7c65552b8ee120bd87066e2f44d638a55af91a84
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 6 13:34:44 2013 +0100
Enable tests
0001-Update-to-Plexus-Container-1.5.5.patch | 102 +++++++++++++
0004-Fix-itext-dependency.patch | 204 ++++++++++++++++++++++++---
maven-doxia.spec | 19 +++-
3 files changed, 306 insertions(+), 19 deletions(-)
---
diff --git a/0001-Update-to-Plexus-Container-1.5.5.patch b/0001-Update-to-Plexus-Container-1.5.5.patch
new file mode 100644
index 0000000..2929da5
--- /dev/null
+++ b/0001-Update-to-Plexus-Container-1.5.5.patch
@@ -0,0 +1,102 @@
+From 7da9425b8fc0cb20500f4e5aa8a8adc67d107969 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Wed, 6 Nov 2013 12:46:26 +0100
+Subject: [PATCH] Update to Plexus Container 1.5.5
+
+---
+ .../java/org/apache/maven/doxia/module/AbstractIdentityTest.java | 3 ++-
+ .../test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java | 3 ++-
+ .../test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java | 3 ++-
+ pom.xml | 7 +------
+ 4 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
+index 100add3..8c78956 100644
+--- a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
++++ b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
+@@ -33,6 +33,7 @@ import org.apache.maven.doxia.parser.Parser;
+ import org.apache.maven.doxia.sink.Sink;
+ import org.apache.maven.doxia.sink.SinkTestDocument;
+ import org.apache.maven.doxia.sink.TextSink;
++import org.codehaus.plexus.DefaultPlexusContainer;
+ import org.codehaus.plexus.util.IOUtil;
+
+ /**
+@@ -107,7 +108,7 @@ public abstract class AbstractIdentityTest
+ writer = new StringWriter();
+ sink = new TextSink( writer );
+ Parser parser = createParser();
+- parser.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
++ parser.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
+ parser.parse( reader, sink );
+ String actual = writer.toString();
+
+diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
+index ebba69c..1aac4fc 100644
+--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
++++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
+@@ -25,6 +25,7 @@ import java.io.Writer;
+
+ import org.apache.maven.doxia.AbstractModuleTest;
+ import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
++import org.codehaus.plexus.DefaultPlexusContainer;
+ import org.codehaus.plexus.util.IOUtil;
+
+ /**
+@@ -54,7 +55,7 @@ public abstract class AbstractSinkTest
+
+ testWriter.reset();
+ sink = createSink( testWriter );
+- sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
++ sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
+ }
+
+ // ---------------------------------------------------------------------
+diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+index 5f9108e..88db2b4 100644
+--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
++++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedError;
+
+ import org.apache.maven.doxia.parser.Parser;
+
++import org.codehaus.plexus.DefaultPlexusContainer;
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.logging.Logger;
+
+@@ -96,7 +97,7 @@ public abstract class AbstractXmlValidator
+ public void testValidateFiles()
+ throws Exception
+ {
+- final Logger logger = getContainer().getLoggerManager().getLoggerForComponent( Parser.ROLE );
++ final Logger logger = ( ( DefaultPlexusContainer )getContainer() ).getLoggerManager().getLoggerForComponent( Parser.ROLE );
+
+ for ( Iterator<Map.Entry<String, String>> it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
+ {
+diff --git a/pom.xml b/pom.xml
+index 754f65d..82b36c3 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -287,18 +287,13 @@ under the License.
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+- <version>1.0-alpha-30</version>
++ <version>1.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.10</version>
+ </dependency>
+- <dependency><!-- remove when upgrading parent to version 22 -->
+- <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-component-annotations</artifactId>
+- <version>1.5.5</version>
+- </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+--
+1.8.1.4
+
diff --git a/0004-Fix-itext-dependency.patch b/0004-Fix-itext-dependency.patch
index a07bd57..83bfb39 100644
--- a/0004-Fix-itext-dependency.patch
+++ b/0004-Fix-itext-dependency.patch
@@ -1,24 +1,69 @@
-From 11ee2edcb1e391a94e37b85d2667a2a4648d847a Mon Sep 17 00:00:00 2001
+From b1f8c2fca4c068487acb93479eb6bfb875322bc8 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon, 29 Apr 2013 11:37:12 +0200
-Subject: [PATCH 4/4] Fix itext dependency
+Subject: [PATCH] Fix itext dependency
---
- .../main/java/org/apache/maven/doxia/module/itext/ITextFont.java | 6 +++---
- .../main/java/org/apache/maven/doxia/module/itext/ITextSink.java | 6 +++---
- .../main/java/org/apache/maven/doxia/module/itext/ITextUtil.java | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
+ doxia-modules/doxia-module-itext/pom.xml | 2 +-
+ .../apache/maven/doxia/module/itext/ITextFont.java | 16 ++---
+ .../apache/maven/doxia/module/itext/ITextSink.java | 6 +-
+ .../apache/maven/doxia/module/itext/ITextUtil.java | 69 +---------------------
+ .../doxia/module/itext/ITextSinkTestCase.java | 22 -------
+ 5 files changed, 13 insertions(+), 102 deletions(-)
+diff --git a/doxia-modules/doxia-module-itext/pom.xml b/doxia-modules/doxia-module-itext/pom.xml
+index ea35ee2..55a4f61 100644
+--- a/doxia-modules/doxia-module-itext/pom.xml
++++ b/doxia-modules/doxia-module-itext/pom.xml
+@@ -58,7 +58,7 @@ under the License.
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+- <version>1.4</version>
++ <version>2.1.7</version>
+ </dependency>
+ </dependencies>
+
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
-index 2cc8ef1..b6980fb 100644
+index 2cc8ef1..5dfc882 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+@@ -24,7 +24,7 @@ import java.awt.Color;
+ import com.lowagie.text.ExceptionConverter;
+ import com.lowagie.text.Font;
+ import com.lowagie.text.FontFactory;
+-import com.lowagie.text.markup.MarkupTags;
++import com.lowagie.text.html.Markup;
+ import com.lowagie.text.pdf.BaseFont;
+
+ /**
+@@ -38,16 +38,16 @@ import com.lowagie.text.pdf.BaseFont;
+ public class ITextFont
+ {
+ /** A normal font style */
+- public static final String NORMAL = MarkupTags.CSS_VALUE_NORMAL;
++ public static final String NORMAL = Markup.CSS_VALUE_NORMAL;
+
+ /** A bold font style */
+- public static final String BOLD = MarkupTags.CSS_VALUE_BOLD;
++ public static final String BOLD = Markup.CSS_VALUE_BOLD;
+
+ /** A italic font style */
+- public static final String ITALIC = MarkupTags.CSS_VALUE_ITALIC;
++ public static final String ITALIC = Markup.CSS_VALUE_ITALIC;
+
+ /** An underline font style */
+- public static final String UNDERLINE = MarkupTags.CSS_VALUE_UNDERLINE;
++ public static final String UNDERLINE = Markup.CSS_VALUE_UNDERLINE;
+
+ /** A default font name */
+ public static final String DEFAULT_FONT_NAME = FontFactory.HELVETICA;
@@ -262,7 +262,7 @@ public class ITextFont
{
Font font = getCurrentFont();
- return String.valueOf( font.color().getBlue() );
-+ return String.valueOf( font.getColor().getBlue() );
++ return String.valueOf( font.getColor().getBlue() );
}
/**
@@ -27,7 +72,7 @@ index 2cc8ef1..b6980fb 100644
Font font = getCurrentFont();
- return String.valueOf( font.color().getGreen() );
-+ return String.valueOf( font.getColor().getGreen() );
++ return String.valueOf( font.getColor().getGreen() );
}
/**
@@ -36,12 +81,12 @@ index 2cc8ef1..b6980fb 100644
Font font = getCurrentFont();
- return String.valueOf( font.color().getRed() );
-+ return String.valueOf( font.getColor().getRed() );
++ return String.valueOf( font.getColor().getRed() );
}
/**
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
-index 7c1da55..49acc5a 100644
+index 7c1da55..9561f8e 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
@@ -1231,9 +1231,9 @@ public class ITextSink
@@ -51,25 +96,150 @@ index 7c1da55..49acc5a 100644
- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
- width = image.plainWidth();
- height = image.plainHeight();
-+ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
-+ width = image.getPlainWidth();
-+ height = image.getPlainHeight();
++ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
++ width = image.getPlainWidth();
++ height = image.getPlainHeight();
}
catch ( BadElementException e )
{
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
-index 4363413..65bab32 100644
+index 4363413..141646c 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
-@@ -77,7 +77,7 @@ public class ITextUtil
+@@ -22,9 +22,6 @@ package org.apache.maven.doxia.module.itext;
+ import com.lowagie.text.DocumentException;
+ import com.lowagie.text.PageSize;
+ import com.lowagie.text.Rectangle;
+-import com.lowagie.text.xml.XmlToHtml;
+-import com.lowagie.text.xml.XmlToPdf;
+-import com.lowagie.text.xml.XmlToRtf;
+
+ import java.io.InputStream;
+ import java.io.OutputStream;
+@@ -77,7 +74,7 @@ public class ITextUtil
if ( currentField.getType().equals( Rectangle.class ) )
{
Rectangle fPageSize = (Rectangle) currentField.get( null );
- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
-+ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
++ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
{
return currentField.getName();
}
+@@ -114,68 +111,4 @@ public class ITextUtil
+
+ return false;
+ }
+-
+- /**
+- * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an Pdf document
+- * specified <CODE>OutputStream</CODE>.
+- *
+- * @param is the <CODE>InputStream</CODE> from which the XML is read.
+- * @param os the <CODE>OutputStream</CODE> to which the result as Pdf is written.
+- * @see com.lowagie.text.xml.XmlToPdf
+- */
+- public static void writePdf( InputStream is, OutputStream os )
+- {
+- try
+- {
+- XmlToPdf x = new XmlToPdf();
+-
+- x.parse( is, os );
+- }
+- catch ( DocumentException e )
+- {
+- throw new RuntimeException( "DocumentException : " + e.getMessage(), e );
+- }
+- }
+-
+- /**
+- * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an rtf document
+- * specified <CODE>OutputStream</CODE>.
+- *
+- * @param is the <CODE>InputStream</CODE> from which the XML is read.
+- * @param os the <CODE>OutputStream</CODE> to which the result as RTF is written.
+- * @see com.lowagie.text.xml.XmlToRtf
+- */
+- public static void writeRtf( InputStream is, OutputStream os )
+- {
+- try
+- {
+- XmlToRtf x = new XmlToRtf();
+- x.parse( is, os );
+- }
+- catch ( DocumentException e )
+- {
+- throw new RuntimeException( "DocumentException : " + e.getMessage(), e );
+- }
+- }
+-
+- /**
+- * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an html document
+- * specified <CODE>OutputStream</CODE>.
+- *
+- * @param is the <CODE>InputStream</CODE> from which the XML is read.
+- * @param os the <CODE>OutputStream</CODE> to which the result as Html is written.
+- * @see com.lowagie.text.xml.XmlToHtml
+- */
+- public static void writeHtml( InputStream is, OutputStream os )
+- {
+- try
+- {
+- XmlToHtml x = new XmlToHtml();
+- x.parse( is, os );
+- }
+- catch ( DocumentException e )
+- {
+- throw new RuntimeException( "DocumentException : " + e.getMessage(), e );
+- }
+- }
+ }
+diff --git a/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java b/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
+index 3e24d07..50d0d70 100644
+--- a/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
++++ b/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
+@@ -81,20 +81,6 @@ public class ITextSinkTestCase
+ }
+
+ /**
+- * Test PDF generation
+- *
+- * @throws Exception
+- */
+- public void testGeneratingPDFFromITextXml()
+- throws Exception
+- {
+- File f = new File( getBasedir(), "src/test/resources/itext/itext.xml" );
+-
+- ITextUtil.writePdf( new FileInputStream( f ),
+- new FileOutputStream( getGeneratedFile( "test_itext", "pdf" ) ) );
+- }
+-
+- /**
+ * Generate a pdf and a rtf from the standart test model.
+ *
+ * @throws Exception if any
+@@ -107,11 +93,6 @@ public class ITextSinkTestCase
+ SinkTestDocument.generate( sink );
+
+ sink.close();
+-
+- ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "test_model", "xml" ) ),
+- new FileOutputStream( getGeneratedFile( "test_model", "pdf" ) ) );
+- ITextUtil.writeRtf( new FileInputStream( getGeneratedFile( "test_model", "xml" ) ),
+- new FileOutputStream( getGeneratedFile( "test_model", "rtf" ) ) );
+ }
+
+ /**
+@@ -148,8 +129,5 @@ public class ITextSinkTestCase
+
+ sink.flush();
+ sink.close();
+-
+- ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "empty_anchor", "xml" ) ),
+- new FileOutputStream( getGeneratedFile( "empty_anchor", "pdf" ) ) );
+ }
+ }
--
1.8.1.4
diff --git a/maven-doxia.spec b/maven-doxia.spec
index be4314a..da438ae 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -35,7 +35,7 @@
Name: maven-doxia
Version: 1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
@@ -54,6 +54,8 @@ Patch1: 0001-doxia-core-remove-plexus-component-annotation.patch
# http://jira.codehaus.org/browse/DOXIA-53
Patch2: 0004-Fix-itext-dependency.patch
+Patch3: 0001-Update-to-Plexus-Container-1.5.5.patch
+
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
@@ -218,6 +220,12 @@ Summary: Sink-api module for %{name}
%description sink-api
This package provides %{summary}.
+%package tests
+Summary: Tests for %{name}
+
+%description tests
+This package provides %{summary}.
+
%package test-docs
Summary: Test-docs module for %{name}
@@ -236,6 +244,7 @@ API documentation for %{name}.
%setup -q -n doxia-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# we don't have clirr-maven-plugin
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@@ -245,6 +254,8 @@ API documentation for %{name}.
"/pom:executions/pom:execution/pom:configuration" \
"<useJava5>true</useJava5>" doxia-modules/doxia-module-fml/pom.xml
+%mvn_package :::tests: tests
+
%if %{without itext}
%pom_disable_module doxia-module-itext doxia-modules
%endif
@@ -255,7 +266,7 @@ API documentation for %{name}.
%build
# tests disabled because some use old plexus-container and don't work
# with new
-%mvn_build -f -s
+%mvn_build -s
%install
%mvn_install
@@ -285,12 +296,16 @@ API documentation for %{name}.
%files module-xhtml -f .mfiles-doxia-module-xhtml
%files sink-api -f .mfiles-doxia-sink-api
%files test-docs -f .mfiles-doxia-test-docs
+%files tests -f .mfiles-tests
%doc LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Wed Nov 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.4-3
+- Enable tests
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 6 months
[javapackages-tools/f20] (5 commits) ...Update to upstream bugfix release 3.4.1
by Stanislav Ochotnicky
Summary of changes:
08d90c7... Update to upstream version 3.4.0 (*)
f0ee4e2... Require exact version of python-javapackages (*)
7ca24ac... Fix XMvn configuration for native JNI repos (*)
c8df4d2... Move patching sources to %prep where it belongs (*)
7865f43... Update to upstream bugfix release 3.4.1 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months
