Remove JavaIterator and MapEntry

pkg/analyzer/test/generated/engine_test.dart

Index: pkg/analyzer/test/generated/engine_test.dart
diff --git a/pkg/analyzer/test/generated/engine_test.dart b/pkg/analyzer/test/generated/engine_test.dart
index 845636ee75be090f716bc673727f1741a2e75052..3fe69c28773693114710415c9598150d3956adf6 100644
--- a/pkg/analyzer/test/generated/engine_test.dart
+++ b/pkg/analyzer/test/generated/engine_test.dart
@@ -6966,13 +6966,11 @@ class UniversalCachePartitionTest extends EngineTestCase {
     TestSource source = new TestSource();
     DartEntry entry = new DartEntry();
     partition.put(source, entry);
-    JavaIterator<MapEntry<Source, SourceEntry>> entries =
-        new JavaIterator(getMapEntrySet(partition.map));
-    JUnitTestCase.assertTrue(entries.hasNext);
-    MapEntry<Source, SourceEntry> mapEntry = entries.next();
-    JUnitTestCase.assertSame(source, mapEntry.getKey());
-    JUnitTestCase.assertSame(entry, mapEntry.getValue());
-    JUnitTestCase.assertFalse(entries.hasNext);
+    Map<Source, SourceEntry> entryMap = partition.map;
+    JUnitTestCase.assertEquals(1, entryMap.length);
+    Source entryKey = entryMap.keys.first;
+    JUnitTestCase.assertSame(source, entryKey);
+    JUnitTestCase.assertSame(entry, entryMap[entryKey]);
   }
   void test_get() {
     UniversalCachePartition partition =
@@ -7030,15 +7028,12 @@ class UniversalCachePartitionTest extends EngineTestCase {
   void _assertNonFlushedCount(int expectedCount,
       UniversalCachePartition partition) {
     int nonFlushedCount = 0;
-    JavaIterator<MapEntry<Source, SourceEntry>> entries =
-        new JavaIterator(getMapEntrySet(partition.map));
-    while (entries.hasNext) {
-      MapEntry<Source, SourceEntry> entry = entries.next();
-      if (entry.getValue().getState(DartEntry.PARSED_UNIT) !=
-          CacheState.FLUSHED) {
+    Map<Source, SourceEntry> entryMap = partition.map;
+    entryMap.values.forEach((SourceEntry value) {
+      if (value.getState(DartEntry.PARSED_UNIT) != CacheState.FLUSHED) {
         nonFlushedCount++;
       }
-    }
+    });
     JUnitTestCase.assertEquals(expectedCount, nonFlushedCount);
   }
 }