From 43ddf3768525fdd28a0a36712434aff05fbf2a1d Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 20 Jun 2012 20:23:17 +0400
Subject: [PATCH] Fixed CliTest.

---
 .../readJavaBinaryClass/ClassWithTypePExtendsIterableP.java | 4 ++++
 .../ClassWithTypePExtendsIterableP.java.pen                 | 4 ----
 .../readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt   | 2 +-
 .../readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt  | 6 +++---
 compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java       | 3 ++-
 .../jet/lang/resolve/lazy/AbstractLazyResolveTest.java      | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java
 delete mode 100644 compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen

diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java
new file mode 100644
index 00000000000..f95b69b54c5
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java
@@ -0,0 +1,4 @@
+package test;
+
+public abstract class ClassWithTypePExtendsIterableP<P> implements java.lang.Iterable<P> {
+}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
deleted file mode 100644
index 8996b9583d3..00000000000
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
+++ /dev/null
@@ -1,4 +0,0 @@
-package test;
-
-public abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
-}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
index 46d39265bf0..a5d3f9cb3d2 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
@@ -1,4 +1,4 @@
 package test
 
-public abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
+public abstract class ClassWithTypePExtendsIterableP<P>() : java.lang.Iterable<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
index b08ca86de8e..1aee85160f5 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract class test.ClassTypeTypePRefSuper</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
-    public abstract override /*1*/ fun iterator(): java.util.Iterator<P>
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassTypeTypePRefSuper<P>
+public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
+    public abstract override /*1*/ fun iterator(): java.util.Iterator<P>?
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
 }
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
index f75236817c6..83c5724fa99 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
@@ -64,7 +64,8 @@ public class CliTest {
     private void executeCompilerCompareOutput(@NotNull String[] args) {
         try {
             String actual = normalize(executeCompilerGrabOutput(args))
-                    .replace(new File("compiler/testData/cli/").getAbsolutePath(), "$TESTDATA_DIR$");
+                    .replace(new File("compiler/testData/cli/").getAbsolutePath(), "$TESTDATA_DIR$")
+                    .replace("\\", "/");
 
             String expected = normalize(FileUtil.loadFile(new File("compiler/testData/cli/" + testName.getMethodName() + ".out")));
 
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
index e5808c00175..eba90eb7c73 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
@@ -40,7 +40,7 @@ import java.util.Collections;
 /**
  * @author abreslav
  */
-public class AbstractLazyResolveTest {
+public abstract class AbstractLazyResolveTest {
     private final Disposable rootDisposable = new Disposable() {
         @Override
         public void dispose() {
@@ -48,7 +48,7 @@ public class AbstractLazyResolveTest {
     };
 
     protected final CompilerDependencies
-              compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true);
+              compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.JDK_HEADERS, true);
     protected final JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(rootDisposable, compilerDependencies);
     protected final Project project = jetCoreEnvironment.getProject();