Merge "Remove junit classes from android.jar"

  ../opt/net/voip/src/java/android/net/rtp \

  ../opt/net/voip/src/java/android/net/sip \

framework_base_android_test_base_src_files := \

  $(call all-java-files-under, test-base/src/junit)

framework_base_android_test_runner_src_files := \

  $(call all-java-files-under, test-runner/src/junit)

# Find all files in specific directories (relative to frameworks/base)

# to document and check apis

files_to_check_apis := \

# These are relative to frameworks/base

framework_docs_LOCAL_API_CHECK_SRC_FILES := \

  $(framework_base_android_test_base_src_files) \

  $(framework_base_android_test_runner_src_files) \

  $(files_to_check_apis) \

  $(common_src_files) \

}

package junit.framework {

  public class Assert {

    ctor protected Assert();

    method public static void assertEquals(java.lang.String, java.lang.Object, java.lang.Object);

    method public static void assertEquals(java.lang.Object, java.lang.Object);

    method public static void assertEquals(java.lang.String, java.lang.String, java.lang.String);

    method public static void assertEquals(java.lang.String, java.lang.String);

    method public static void assertEquals(java.lang.String, double, double, double);

    method public static void assertEquals(double, double, double);

    method public static void assertEquals(java.lang.String, float, float, float);

    method public static void assertEquals(float, float, float);

    method public static void assertEquals(java.lang.String, long, long);

    method public static void assertEquals(long, long);

    method public static void assertEquals(java.lang.String, boolean, boolean);

    method public static void assertEquals(boolean, boolean);

    method public static void assertEquals(java.lang.String, byte, byte);

    method public static void assertEquals(byte, byte);

    method public static void assertEquals(java.lang.String, char, char);

    method public static void assertEquals(char, char);

    method public static void assertEquals(java.lang.String, short, short);

    method public static void assertEquals(short, short);

    method public static void assertEquals(java.lang.String, int, int);

    method public static void assertEquals(int, int);

    method public static void assertFalse(java.lang.String, boolean);

    method public static void assertFalse(boolean);

    method public static void assertNotNull(java.lang.Object);

    method public static void assertNotNull(java.lang.String, java.lang.Object);

    method public static void assertNotSame(java.lang.String, java.lang.Object, java.lang.Object);

    method public static void assertNotSame(java.lang.Object, java.lang.Object);

    method public static void assertNull(java.lang.Object);

    method public static void assertNull(java.lang.String, java.lang.Object);

    method public static void assertSame(java.lang.String, java.lang.Object, java.lang.Object);

    method public static void assertSame(java.lang.Object, java.lang.Object);

    method public static void assertTrue(java.lang.String, boolean);

    method public static void assertTrue(boolean);

    method public static void fail(java.lang.String);

    method public static void fail();

    method public static void failNotEquals(java.lang.String, java.lang.Object, java.lang.Object);

    method public static void failNotSame(java.lang.String, java.lang.Object, java.lang.Object);

    method public static void failSame(java.lang.String);

    method public static java.lang.String format(java.lang.String, java.lang.Object, java.lang.Object);

  }

  public class AssertionFailedError extends java.lang.AssertionError {

    ctor public AssertionFailedError();

    ctor public AssertionFailedError(java.lang.String);

  }

  public class ComparisonFailure extends junit.framework.AssertionFailedError {

    ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);

    method public java.lang.String getActual();

    method public java.lang.String getExpected();

  }

  public abstract interface Protectable {

    method public abstract void protect() throws java.lang.Throwable;

  }

  public abstract interface Test {

    method public abstract int countTestCases();

    method public abstract void run(junit.framework.TestResult);

  }

  public abstract class TestCase extends junit.framework.Assert implements junit.framework.Test {

    ctor public TestCase();

    ctor public TestCase(java.lang.String);

    method public int countTestCases();

    method protected junit.framework.TestResult createResult();

    method public java.lang.String getName();

    method public junit.framework.TestResult run();

    method public void run(junit.framework.TestResult);

    method public void runBare() throws java.lang.Throwable;

    method protected void runTest() throws java.lang.Throwable;

    method public void setName(java.lang.String);

    method protected void setUp() throws java.lang.Exception;

    method protected void tearDown() throws java.lang.Exception;

  }

  public class TestFailure {

    ctor public TestFailure(junit.framework.Test, java.lang.Throwable);

    method public java.lang.String exceptionMessage();

    method public junit.framework.Test failedTest();

    method public boolean isFailure();

    method public java.lang.Throwable thrownException();

    method public java.lang.String trace();

    field protected junit.framework.Test fFailedTest;

    field protected java.lang.Throwable fThrownException;

  }

  public abstract interface TestListener {

    method public abstract void addError(junit.framework.Test, java.lang.Throwable);

    method public abstract void addFailure(junit.framework.Test, junit.framework.AssertionFailedError);

    method public abstract void endTest(junit.framework.Test);

    method public abstract void startTest(junit.framework.Test);

  }

  public class TestResult {

    ctor public TestResult();

    method public synchronized void addError(junit.framework.Test, java.lang.Throwable);

    method public synchronized void addFailure(junit.framework.Test, junit.framework.AssertionFailedError);

    method public synchronized void addListener(junit.framework.TestListener);

    method public void endTest(junit.framework.Test);

    method public synchronized int errorCount();

    method public synchronized java.util.Enumeration<junit.framework.TestFailure> errors();

    method public synchronized int failureCount();

    method public synchronized java.util.Enumeration<junit.framework.TestFailure> failures();

    method public synchronized void removeListener(junit.framework.TestListener);

    method protected void run(junit.framework.TestCase);

    method public synchronized int runCount();

    method public void runProtected(junit.framework.Test, junit.framework.Protectable);

    method public synchronized boolean shouldStop();

    method public void startTest(junit.framework.Test);

    method public synchronized void stop();

    method public synchronized boolean wasSuccessful();

    field protected java.util.Vector<junit.framework.TestFailure> fErrors;

    field protected java.util.Vector<junit.framework.TestFailure> fFailures;

    field protected java.util.Vector<junit.framework.TestListener> fListeners;

    field protected int fRunTests;

  }

  public class TestSuite implements junit.framework.Test {

    ctor public TestSuite();

    ctor public TestSuite(java.lang.Class<?>);

    ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>, java.lang.String);

    ctor public TestSuite(java.lang.String);

    ctor public TestSuite(java.lang.Class<?>...);

    ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>[], java.lang.String);

    method public void addTest(junit.framework.Test);

    method public void addTestSuite(java.lang.Class<? extends junit.framework.TestCase>);

    method public int countTestCases();

    method public static junit.framework.Test createTest(java.lang.Class<?>, java.lang.String);

    method public java.lang.String getName();

    method public static java.lang.reflect.Constructor<?> getTestConstructor(java.lang.Class<?>) throws java.lang.NoSuchMethodException;

    method public void run(junit.framework.TestResult);

    method public void runTest(junit.framework.Test, junit.framework.TestResult);

    method public void setName(java.lang.String);

    method public junit.framework.Test testAt(int);

    method public int testCount();

    method public java.util.Enumeration<junit.framework.Test> tests();

    method public static junit.framework.Test warning(java.lang.String);

  }

}

package junit.runner {

  public abstract class BaseTestRunner implements junit.framework.TestListener {

    ctor public BaseTestRunner();

    method public synchronized void addError(junit.framework.Test, java.lang.Throwable);

    method public synchronized void addFailure(junit.framework.Test, junit.framework.AssertionFailedError);

    method protected void clearStatus();

    method public java.lang.String elapsedTimeAsString(long);

    method public synchronized void endTest(junit.framework.Test);

    method public java.lang.String extractClassName(java.lang.String);

    method public static java.lang.String getFilteredTrace(java.lang.Throwable);

    method public static java.lang.String getFilteredTrace(java.lang.String);

    method public deprecated junit.runner.TestSuiteLoader getLoader();

    method public static java.lang.String getPreference(java.lang.String);

    method public static int getPreference(java.lang.String, int);

    method protected static java.util.Properties getPreferences();

    method public junit.framework.Test getTest(java.lang.String);

    method public static deprecated boolean inVAJava();

    method protected java.lang.Class<?> loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException;

    method protected java.lang.String processArguments(java.lang.String[]);

    method protected abstract void runFailed(java.lang.String);

    method public static void savePreferences() throws java.io.IOException;

    method public void setLoading(boolean);

    method public void setPreference(java.lang.String, java.lang.String);

    method protected static void setPreferences(java.util.Properties);

    method protected static boolean showStackRaw();

    method public synchronized void startTest(junit.framework.Test);

    method public abstract void testEnded(java.lang.String);

    method public abstract void testFailed(int, junit.framework.Test, java.lang.Throwable);

    method public abstract void testStarted(java.lang.String);

    method public static java.lang.String truncate(java.lang.String);

    method protected boolean useReloadingTestSuiteLoader();

    field public static final java.lang.String SUITE_METHODNAME = "suite";

  }

  public abstract interface TestSuiteLoader {

    method public abstract java.lang.Class load(java.lang.String) throws java.lang.ClassNotFoundException;

    method public abstract java.lang.Class reload(java.lang.Class) throws java.lang.ClassNotFoundException;

  }

  public class Version {

    method public static java.lang.String id();

  }

}

package org.apache.http.conn {

  public deprecated class ConnectTimeoutException extends java.io.InterruptedIOException {