From cba0a5c065e5aaf8fbe80ab17157e5e2f8736c0e Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 9 Aug 2011 13:56:37 +0400
Subject: [PATCH] even more diag

---
 .../com/intellij/testFramework/ParsingTestCase.java |  1 +
 .../intellij/plugins/relaxNG/RncParsingTest.java    | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java b/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java
index de04ee2e8a54..5c8485879625 100644
--- a/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java
@@ -211,6 +211,7 @@ public abstract class ParsingTestCase extends PlatformLiteFixture {
 
   protected PsiFile createFile(String name, String text) {
     LightVirtualFile virtualFile = new LightVirtualFile(name, myLanguage, text);
+    virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
     return myFileFactory.trySetupPsiForFile(virtualFile, myLanguage, true, false);
   }
 
diff --git a/plugins/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java b/plugins/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java
index 871fa238e346..ce47e38c8136 100644
--- a/plugins/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java
+++ b/plugins/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java
@@ -18,6 +18,7 @@ package org.intellij.plugins.relaxNG;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.VirtualFile;
 
 import java.io.File;
 import java.io.IOException;
@@ -57,7 +58,13 @@ public class RncParsingTest extends AbstractParsingTest {
     printFile(name + "." + myFileExt);
     printFile(name + ".txt");
 
-    doTest(true);
+    try {
+      doTest(true);
+    }
+    finally {
+      VirtualFile virtualFile = myFile.getVirtualFile();
+      System.out.println("virtualFile = " + virtualFile+"; charset = " + virtualFile.getCharset());
+    }
   }
 
   private void printFile(String fileName) throws IOException {
@@ -82,12 +89,12 @@ public class RncParsingTest extends AbstractParsingTest {
       hex.append(hexChar.charAt((b[i] >> 4) & 0x0f));
       hex.append(hexChar.charAt(b[i] & 0x0f));
       hex.append(" ");
-      if (i % 5 == 0) hex.append("   ");
+      if ((i-start+1) % 5 == 0) hex.append("   ");
 
       //ch.append(utf8.charAt(i));
       ch.append((char)b[i]);
       ch.append("  ");
-      if (i % 5 == 0) ch.append("   ");
+      if ((i-start+1) % 5 == 0) ch.append("   ");
     }
     return hex + "\n" + ch;
   }