From odf-commits-return-770-apmail-incubator-odf-commits-archive=incubator.apache.org@incubator.apache.org Sun Aug 19 15:01:59 2012 Return-Path: X-Original-To: apmail-incubator-odf-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-odf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99B42DE5C for ; Sun, 19 Aug 2012 15:01:59 +0000 (UTC) Received: (qmail 10874 invoked by uid 500); 19 Aug 2012 15:01:59 -0000 Delivered-To: apmail-incubator-odf-commits-archive@incubator.apache.org Received: (qmail 10843 invoked by uid 500); 19 Aug 2012 15:01:59 -0000 Mailing-List: contact odf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: odf-dev@incubator.apache.org Delivered-To: mailing list odf-commits@incubator.apache.org Received: (qmail 10836 invoked by uid 99); 19 Aug 2012 15:01:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Aug 2012 15:01:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Aug 2012 15:01:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2C7482388A5B; Sun, 19 Aug 2012 15:01:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374762 [4/4] - in /incubator/odf/trunk: odfdom/ odfdom/src/main/java/org/odftoolkit/odfdom/pkg/ odfdom/src/main/java/org/odftoolkit/odfdom/pkg/manifest/ odfdom/src/test/java/org/odftoolkit/odfdom/doc/ odfdom/src/test/java/org/odftoolkit/o... Date: Sun, 19 Aug 2012 15:01:10 -0000 To: odf-commits@incubator.apache.org From: robweir@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120819150112.2C7482388A5B@eris.apache.org> Modified: incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/SpreadsheetDocumentTest.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/SpreadsheetDocumentTest.java?rev=1374762&r1=1374761&r2=1374762&view=diff ============================================================================== --- incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/SpreadsheetDocumentTest.java (original) +++ incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/SpreadsheetDocumentTest.java Sun Aug 19 15:01:09 2012 @@ -132,13 +132,13 @@ public class SpreadsheetDocumentTest { Assert.assertNotNull(spChart); spChart.setChartType(ChartType.AREA); //save - spDocument.save(ResourceUtilities.getTestOutput("Chart_"+TEST_FILE)); + spDocument.save(ResourceUtilities.getAbsolutePath(TEST_FILE)); Assert.assertEquals(dataset, spChart.getChartData()); Assert.assertEquals("XXXTitle", spChart.getChartTitle()); Assert.assertEquals(ChartType.AREA, spChart.getChartType()); - LOG.log(Level.INFO,"spChart--> " + spChart); + System.out.println("spChart--> " + spChart); } catch (Exception e) { LOG.log(Level.SEVERE, e.getMessage(), e); @@ -226,7 +226,7 @@ public class SpreadsheetDocumentTest { Table tablem = spDocument.getSheetByIndex(0); Assert.assertNotSame(tablea, tablem); - spDocument.save(ResourceUtilities.getAbsolutePath(TEST_FILE)); + //spDocument.save(ResourceUtilities.getAbsolutePath(TEST_FILE)); } @Test Modified: incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/FooterTest.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/FooterTest.java?rev=1374762&r1=1374761&r2=1374762&view=diff ============================================================================== --- incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/FooterTest.java (original) +++ incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/FooterTest.java Sun Aug 19 15:01:09 2012 @@ -26,7 +26,6 @@ import java.util.logging.Logger; import junit.framework.Assert; import org.junit.Test; -import org.junit.Ignore; import org.odftoolkit.odfdom.dom.element.style.StyleFooterElement; import org.odftoolkit.odfdom.dom.element.table.TableTableElement; import org.odftoolkit.odfdom.pkg.OdfElement; @@ -88,7 +87,6 @@ public class FooterTest { } @Test - @Ignore public void testFooterHidden() { try { TextDocument doc = TextDocument.loadDocument(ResourceUtilities.getTestResourceAsStream("headerFooterHidden.odt")); Modified: incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/list/ListItemTest.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/list/ListItemTest.java?rev=1374762&r1=1374761&r2=1374762&view=diff ============================================================================== --- incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/list/ListItemTest.java (original) +++ incubator/odf/trunk/simple/src/test/java/org/odftoolkit/simple/text/list/ListItemTest.java Sun Aug 19 15:01:09 2012 @@ -32,7 +32,6 @@ import org.odftoolkit.simple.utils.Resou public class ListItemTest { private final static String SAMPLE_LIST_DOCUMENT = "testList.odt"; - private static final String SAMPLE_LIST_DOCUMENT_2 = "testList2.odt"; private String[] subItemContents = { "sub list item 1", "sub list item 2", "sub list item 3" }; @Test @@ -194,27 +193,4 @@ public class ListItemTest { Assert.fail(e.getMessage()); } } - - @Test - public void testListIterator() { - try { - // load test list container, which contains 2 lists. - TextDocument odtdoc = TextDocument.loadDocument(ResourceUtilities - .getTestResourceAsStream(SAMPLE_LIST_DOCUMENT_2)); - Iterator listIterator = odtdoc.getListIterator(); - - final List bodyList = listIterator.next(); - Assert.assertEquals("body list should have 2 items", 2, bodyList.size()); - - Assert.assertTrue("iterator should have 1 more list (in the Section)", listIterator.hasNext()); - - final List sectionList = listIterator.next(); - Assert.assertEquals("section list should have 3 items", 3, sectionList.size()); - - Assert.assertFalse("iterator should have no more lists", listIterator.hasNext()); - } catch (Exception e) { - Logger.getLogger(ListItemTest.class.getName()).log(Level.SEVERE, null, e); - Assert.fail(e.getMessage()); -} - } } Modified: incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFFileValidator.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFFileValidator.java?rev=1374762&r1=1374761&r2=1374762&view=diff ============================================================================== --- incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFFileValidator.java (original) +++ incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFFileValidator.java Sun Aug 19 15:01:09 2012 @@ -57,7 +57,7 @@ public class ODFFileValidator extends OD protected OdfPackage getPackage(ErrorHandler handler) throws Exception { - return OdfPackage.loadPackage(m_aFile, null, handler); + return OdfPackage.loadPackage(m_aFile, handler); } } Modified: incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java?rev=1374762&r1=1374761&r2=1374762&view=diff ============================================================================== --- incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java (original) +++ incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java Sun Aug 19 15:01:09 2012 @@ -33,7 +33,7 @@ import javax.xml.transform.sax.SAXSource import javax.xml.validation.Validator; import org.odftoolkit.odfdom.doc.OdfDocument; import org.odftoolkit.odfdom.pkg.OdfPackage; -import org.odftoolkit.odfdom.pkg.manifest.EncryptionDataElement; +import org.odftoolkit.odfdom.pkg.manifest.EncryptionData; import org.odftoolkit.odfdom.pkg.manifest.OdfFileEntry; import org.xml.sax.InputSource; import org.xml.sax.XMLFilter; @@ -361,7 +361,7 @@ abstract class ODFPackageValidator { private boolean isEncrypted(String aEntryName, Logger aLogger) { OdfFileEntry aFileEntry = getPackage(aLogger).getFileEntry(aEntryName); if (aFileEntry != null) { - EncryptionDataElement aEncData = aFileEntry.getEncryptionData(); + EncryptionData aEncData = aFileEntry.getEncryptionData(); if (aEncData != null) { aLogger.logFatalError("stream content is encrypted. Validataion of encrypted content is not supported."); return true; Modified: incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java?rev=1374762&r1=1374761&r2=1374762&view=diff ============================================================================== --- incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java (original) +++ incubator/odf/trunk/validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java Sun Aug 19 15:01:09 2012 @@ -23,7 +23,6 @@ package org.odftoolkit.odfvalidator; import junit.framework.Assert; import org.junit.Test; -import org.junit.Ignore; /** Test some invalid packages. */ @@ -96,7 +95,6 @@ public class InvalidPackageTest extends } @Test - @Ignore public void validatePackage3() { String output = ""; try {