Remove test helper from TreeMap and its usage. This creates a difficult pattern to cross run TreeMapTest and doesn't add too much of a value. Black box tests should cover all concerns. PiperOrigin-RevId: 332557480 Change-Id: Ibaaade4758dbf9ce5122f5ef58299f14a1e7c13f
diff --git a/user/test/com/google/gwt/emultest/java/util/TreeMapTest.java b/user/test/com/google/gwt/emultest/java/util/TreeMapTest.java index b1a7434..84b2d24 100644 --- a/user/test/com/google/gwt/emultest/java/util/TreeMapTest.java +++ b/user/test/com/google/gwt/emultest/java/util/TreeMapTest.java
@@ -3500,15 +3500,6 @@ this.comparator = comparator; } - @Override - protected void verifyMap() { - if (!TestUtils.isJvm()) { - // Verify red-black correctness in our implementation - TreeMapViolator.callAssertCorrectness((TreeMap) map); - } - super.verifyMap(); - } - NavigableMap<K, V> createMap() { return createNavigableMap(); }
diff --git a/user/test/com/google/gwt/emultest/java/util/TreeMapViolator.java b/user/test/com/google/gwt/emultest/java/util/TreeMapViolator.java deleted file mode 100644 index 80da65d..0000000 --- a/user/test/com/google/gwt/emultest/java/util/TreeMapViolator.java +++ /dev/null
@@ -1,30 +0,0 @@ -/* - * Copyright 2010 Google Inc. - * - * 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.google.gwt.emultest.java.util; - -import java.util.TreeMap; - -/** - * Used to delay referencing methods only present in the emulated JRE until they - * are actually used. - */ -public class TreeMapViolator { - // Use JSNI to call a special method on our implementation of TreeMap. - @SuppressWarnings("unchecked") // raw Map - public static native void callAssertCorrectness(TreeMap map) /*-{ - map.@java.util.TreeMap::assertCorrectness()(); - }-*/; -}