infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-10 18:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8170781: PropertyMapIterator throws NoSuchElementException on last element

Browse Source 
Reviewed-by: sundar, attila
This commit is contained in:
Hannes Wallnöfer 2017-01-10 15:27:14 +01:00
parent 63348f62cf
commit d8842ee65e
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
View File

@ -1032,7 +1032,7 @@ public class PropertyMap implements Iterable<Object>, Serializable {
}
final Object key = property.getKey();
property = iter.next();
property = iter.hasNext() ? iter.next() : null;
skipNotEnumerable();
return key;

65
nashorn/test/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.nashorn.internal.runtime.test;
import java.util.Iterator;
import jdk.nashorn.internal.runtime.PropertyMap;
import jdk.nashorn.internal.runtime.ScriptObject;
import org.testng.Assert;
import org.testng.annotations.Test;
/**
* Tests for PropertyMap functionality
*
* @test
* @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
* @run testng jdk.nashorn.internal.runtime.test.PropertyMapTest
*/
@SuppressWarnings("javadoc")
public class PropertyMapTest {
@Test
public void propertyMapIteratorTest() {
final ScriptObject scriptObject = new ScriptObject(PropertyMap.newMap()) {};
Assert.assertFalse(scriptObject.getMap().iterator().hasNext());
scriptObject.set("a", "a", 0);
scriptObject.set("b", 3, 0);
// 3 is a valid array key not stored in property map
scriptObject.set(3, 1, 0);
scriptObject.set(6.5, 1.3, 0);
final Iterator<Object> iterator = scriptObject.getMap().iterator();
Assert.assertTrue(iterator.hasNext());
Assert.assertEquals(iterator.next(), "a");
Assert.assertTrue(iterator.hasNext());
Assert.assertEquals(iterator.next(), "b");
Assert.assertTrue(iterator.hasNext());
Assert.assertEquals(iterator.next(), "6.5");
Assert.assertFalse(iterator.hasNext());
}
}