repack to restore scrambling

java/java-runtime/java-runtime.iml

@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="JUnit3" level="project" />
+    <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" name="Ant" level="project" />
   </component>
 </module>

java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonDetailsExtractor.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright 2000-2009 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.rt.execution.junit;
+
+import com.intellij.rt.execution.junit.segments.OutputObjectRegistry;
+import com.intellij.rt.execution.junit.segments.Packet;
+import com.intellij.rt.execution.junit.states.PoolOfTestStates;
+import junit.framework.ComparisonFailure;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @noinspection HardCodedStringLiteral
+ */
+public class ComparisonDetailsExtractor extends ExceptionPacketFactory {
+  private static Map EXPECTED = new HashMap();
+  private static Map ACTUAL = new HashMap();
+  protected String myActual = "";
+  protected String myExpected = "";
+
+  static {
+    try {
+      init(ComparisonFailure.class);
+      init(org.junit.ComparisonFailure.class);
+    } catch (Throwable e) {}
+  }
+
+  private static void init(Class exceptionClass) throws NoSuchFieldException {
+    final Field expectedField = exceptionClass.getDeclaredField("fExpected");
+    expectedField.setAccessible(true);
+    EXPECTED.put(exceptionClass, expectedField);
+
+    final Field actualField = exceptionClass.getDeclaredField("fActual");
+    actualField.setAccessible(true);
+    ACTUAL.put(exceptionClass, actualField);
+  }
+
+  public ComparisonDetailsExtractor(Throwable assertion, String expected, String actual) {
+    super(PoolOfTestStates.COMPARISON_FAILURE, assertion);
+    myActual = actual;
+    myExpected = expected;
+  }
+
+  public static ExceptionPacketFactory create(Throwable assertion) {
+    try {
+      return create(assertion, getExpected(assertion), getActual(assertion));
+    }
+    catch (Throwable e) {
+      return new ExceptionPacketFactory(PoolOfTestStates.FAILED_INDEX, assertion);
+    }
+  }
+
+  public static String getActual(Throwable assertion) throws IllegalAccessException, NoSuchFieldException {
+    return get(assertion, ACTUAL, "fActual");
+  }
+
+  public static String getExpected(Throwable assertion) throws IllegalAccessException, NoSuchFieldException {
+    return get(assertion, EXPECTED, "fExpected");
+  }
+
+  private static String get(final Throwable assertion, final Map staticMap, final String fieldName) throws IllegalAccessException, NoSuchFieldException {
+    String actual;
+    if (assertion instanceof ComparisonFailure) {
+      actual = (String)((Field)staticMap.get(ComparisonFailure.class)).get(assertion);
+    }
+    else if (assertion instanceof org.junit.ComparisonFailure) {
+      actual = (String)((Field)staticMap.get(org.junit.ComparisonFailure.class)).get(assertion);
+    }
+    else {
+      Field field = assertion.getClass().getDeclaredField(fieldName);
+      field.setAccessible(true);
+      actual = (String)field.get(assertion);
+    }
+    return actual;
+  }
+
+  public static ExceptionPacketFactory create(Throwable assertion, final String expected, String actual) {
+    return new ComparisonDetailsExtractor(assertion, expected, actual);
+  }
+
+  public Packet createPacket(OutputObjectRegistry registry, Object test) {
+    Packet packet = super.createPacket(registry, test);
+    packet.
+        addLimitedString(myExpected).
+        addLimitedString(myActual);
+    return packet;
+  }
+}

java/java-runtime/src/com/intellij/rt/execution/junit/FileComparisonFailure.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2009 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.rt.execution.junit;
+
+import com.intellij.rt.execution.junit.segments.OutputObjectRegistry;
+import com.intellij.rt.execution.junit.segments.Packet;
+import junit.framework.ComparisonFailure;
+
+public class FileComparisonFailure extends ComparisonFailure implements KnownException {
+  private final String myExpected;
+  private final String myActual;
+  private final String myFilePath;
+
+  public FileComparisonFailure(String message, String expected, String actual, String filePath) {
+    super(message, expected, actual);
+    myExpected = expected;
+    myActual = actual;
+    myFilePath = filePath;
+  }
+
+  public PacketFactory getPacketFactory() {
+    return new MyPacketFactory(this, myExpected, myActual, myFilePath);
+  }
+
+  private static class MyPacketFactory extends ComparisonDetailsExtractor {
+    private final String myFilePath;
+
+    public MyPacketFactory(ComparisonFailure assertion, String expected, String actual, String filePath) {
+      super(assertion, expected, actual);
+      myFilePath = filePath;
+    }
+
+    public Packet createPacket(OutputObjectRegistry registry, Object test) {
+      Packet packet = super.createPacket(registry, test);
+      packet.addLimitedString(myFilePath);
+      return packet;
+    }
+  }
+}

java/java-runtime/src/com/intellij/rt/execution/junit/KnownException.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2009 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.rt.execution.junit;
+
+public interface KnownException {
+  PacketFactory getPacketFactory();
+}