incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1182740 - in /incubator/odf/trunk/odfdom/src: main/java/org/odftoolkit/odfdom/pkg/ test/java/org/odftoolkit/odfdom/incubator/meta/ test/resources/ test/resources/performance/ test/resources/xslt/
Date Thu, 13 Oct 2011 09:25:30 GMT
Author: devinhan
Date: Thu Oct 13 09:25:30 2011
New Revision: 1182740

URL: http://svn.apache.org/viewvc?rev=1182740&view=rev
Log:
Fixed the failed test cases caused by adding Apache Licence meta data

Modified:
    incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java
    incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
    incubator/odf/trunk/odfdom/src/test/resources/performance/Presentation1_INVALID.odp
    incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg1.odt
    incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg2.odt
    incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg3.odt
    incubator/odf/trunk/odfdom/src/test/resources/xslt/concatfiles.xsl

Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java (original)
+++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java Thu
Oct 13 09:25:30 2011
@@ -164,13 +164,13 @@ public class OdfPackage implements Close
 			if (errorHandlerProperty != null) {
 				if (errorHandlerProperty.equalsIgnoreCase("true")) {
 					mErrorHandler = new DefaultErrorHandler();
-					Logger.getLogger(OdfPackage.class.getName()).info("Activated validation with default
ErrorHandler!");
+					Logger.getLogger(OdfPackage.class.getName()).fine("Activated validation with default
ErrorHandler!");
 				} else {
 					try {
 						Class cl = Class.forName(errorHandlerProperty);
 						Constructor ctor = cl.getDeclaredConstructor(new Class[]{});
 						mErrorHandler = (ErrorHandler) ctor.newInstance();
-						Logger.getLogger(OdfPackage.class.getName()).log(Level.INFO, "Activated validation
with ErrorHandler:''{0}''!", errorHandlerProperty);
+						Logger.getLogger(OdfPackage.class.getName()).log(Level.FINE, "Activated validation
with ErrorHandler:''{0}''!", errorHandlerProperty);
 					} catch (Exception ex) {
 						Logger.getLogger(OdfPackage.class.getName()).log(Level.SEVERE, "Could not initiate
validation with the given ErrorHandler: '" + errorHandlerProperty + "'", ex);
 					}

Modified: incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
(original)
+++ incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
Thu Oct 13 09:25:30 2011
@@ -382,7 +382,7 @@ public class OfficeMetaTest {
 		Assert.assertNull(fMetadata.getKeywords());
 		Assert.assertNull(fMetadata.getPrintedBy());
 		Assert.assertNull(fMetadata.getPrintDate());
-		Assert.assertNull(fMetadata.getUserDefinedDataNames());
+		Assert.assertNotNull(fMetadata.getUserDefinedDataNames());
 	}
 
 	@Test
@@ -396,7 +396,7 @@ public class OfficeMetaTest {
 		OdfOfficeMeta meta = textDoc.getOfficeMetadata();
 		Assert.assertNotNull(meta.getGenerator());
 		Assert.assertNotNull(meta.getCreationDate());
-		Assert.assertNull(meta.getCreator());
+		Assert.assertNotNull(meta.getCreator());
 		Assert.assertNotNull(meta.getDate());
 		Assert.assertTrue(meta.getEditingCycles() > 0);
 		Assert.assertNotNull(meta.getEditingDuration());

Modified: incubator/odf/trunk/odfdom/src/test/resources/performance/Presentation1_INVALID.odp
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/resources/performance/Presentation1_INVALID.odp?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg1.odt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg1.odt?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg2.odt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg2.odt?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg3.odt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/resources/testInvalidPkg3.odt?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/odf/trunk/odfdom/src/test/resources/xslt/concatfiles.xsl
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/resources/xslt/concatfiles.xsl?rev=1182740&r1=1182739&r2=1182740&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/test/resources/xslt/concatfiles.xsl (original)
+++ incubator/odf/trunk/odfdom/src/test/resources/xslt/concatfiles.xsl Thu Oct 13 09:25:30
2011
@@ -1,4 +1,5 @@
-<!-- 
+<?xml version='1.0' encoding="UTF-8"?>
+ <!-- 
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,8 +16,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
- -->
-<?xml version='1.0' encoding="UTF-8"?>
+-->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="xml" encoding="UTF-8"/>
 	



Mime
View raw message