From 7d04e061b809e040d2851f9ec77ee610234def9c Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Wed, 05 Oct 2011 12:40:37 +0000
Subject: [PATCH] Prepare functional tests for upgrade to stax351 based on jython 2.5.2

---
 opendj-sdk/opends/tests/staf-tests/shared/python/common.py |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/common.py b/opendj-sdk/opends/tests/staf-tests/shared/python/common.py
index e1c6251..59785a6 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/common.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/common.py
@@ -55,7 +55,8 @@
             "list_matches" ,
             "count_attr" ,
             "host_is_localhost" ,
-            "md5_hash"]
+            "md5_hash"
+            ]
 
 class format_testcase:
   'Format the Test name objects'
@@ -175,8 +176,8 @@
     self.file2    = file2
     self.diffFile = diffFile
 
-  def genDiff(self):
-    from org.tmatesoft.svn.core.wc import *
+  def genDiff(self):    
+    from org.tmatesoft.svn.core.wc import DefaultSVNDiffGenerator
     from java.io import File
     from java.io import FileOutputStream
 
@@ -663,7 +664,7 @@
       from javax.xml.transform.dom import DOMSource
       tranFactory = TransformerFactory.newInstance();
       aTransformer = tranFactory.newTransformer();
-      aTransformer.setOutputProperty(OutputKeys.ENCODING, "ISO-8859-1")
+      aTransformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8")
       aTransformer.setOutputProperty(OutputKeys.INDENT, "yes")
 
       src = DOMSource(doc);
@@ -686,7 +687,7 @@
 
         tranFactory = TransformerFactory.newInstance();
         aTransformer = tranFactory.newTransformer();
-        aTransformer.setOutputProperty(OutputKeys.ENCODING, "ISO-8859-1")
+        aTransformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8")
         aTransformer.setOutputProperty(OutputKeys.INDENT, "yes");
         aTransformer.transform(xmlInput, xmlOutput);
 
@@ -845,3 +846,5 @@
     import md5
     m = md5.new()
   return m
+
+        
\ No newline at end of file

--
Gitblit v1.10.0