From 49fc8ec7ec496c1944224a618a2fe741fdc2bbab Mon Sep 17 00:00:00 2001 From: Ian Farmer Date: Thu, 4 Jul 2013 20:09:11 +0000 Subject: [PATCH] Remove obsolete test class TableArrayTest.java. This file contained the same tests as TableTest.java. --- test/junit/org/luaj/vm2/AllTests.java | 1 - test/junit/org/luaj/vm2/TableArrayTest.java | 351 -------------------- 2 files changed, 352 deletions(-) delete mode 100644 test/junit/org/luaj/vm2/TableArrayTest.java diff --git a/test/junit/org/luaj/vm2/AllTests.java b/test/junit/org/luaj/vm2/AllTests.java index 6fee66b8..daf2acd1 100644 --- a/test/junit/org/luaj/vm2/AllTests.java +++ b/test/junit/org/luaj/vm2/AllTests.java @@ -56,7 +56,6 @@ public class AllTests { // table tests TestSuite table = new TestSuite("Table Tests"); table.addTestSuite(TableTest.class); - table.addTestSuite(TableArrayTest.class); table.addTestSuite(TableHashTest.class); table.addTestSuite(WeakValueTableTest.class); table.addTestSuite(WeakKeyTableTest.class); diff --git a/test/junit/org/luaj/vm2/TableArrayTest.java b/test/junit/org/luaj/vm2/TableArrayTest.java deleted file mode 100644 index ac084e92..00000000 --- a/test/junit/org/luaj/vm2/TableArrayTest.java +++ /dev/null @@ -1,351 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Luaj.org. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - ******************************************************************************/ -package org.luaj.vm2; - -import java.util.Vector; - -import org.luaj.vm2.LuaDouble; -import org.luaj.vm2.LuaInteger; -import org.luaj.vm2.LuaString; -import org.luaj.vm2.LuaTable; -import org.luaj.vm2.LuaValue; - -import junit.framework.TestCase; - -/** - * Tests for tables used as lists. - */ -public class TableArrayTest extends TestCase { - - protected LuaTable new_Table() { - return new LuaTable(); - } - - protected LuaTable new_Table(int n,int m) { - return new LuaTable(n,m); - } - - public void testInOrderIntegerKeyInsertion() { - LuaTable t = new_Table(); - - for ( int i = 1; i <= 32; ++i ) { - t.set( i, LuaString.valueOf( "Test Value! "+i ) ); - } - - // Ensure all keys are still there. - for ( int i = 1; i <= 32; ++i ) { - assertEquals( "Test Value! " + i, t.get( i ).tojstring() ); - } - - // Ensure capacities make sense - assertEquals( 0, t.getHashLength() ); - - assertTrue( t.getArrayLength() >= 32 ); - assertTrue( t.getArrayLength() <= 64 ); - - } - - public void testResize() { - LuaTable t = new_Table(); - - // NOTE: This order of insertion is important. - t.set(3, LuaInteger.valueOf(3)); - t.set(1, LuaInteger.valueOf(1)); - t.set(5, LuaInteger.valueOf(5)); - t.set(4, LuaInteger.valueOf(4)); - t.set(6, LuaInteger.valueOf(6)); - t.set(2, LuaInteger.valueOf(2)); - - for ( int i = 1; i < 6; ++i ) { - assertEquals(LuaInteger.valueOf(i), t.get(i)); - } - - assertTrue( t.getArrayLength() >= 0 && t.getArrayLength() <= 2 ); - assertTrue( t.getHashLength() >= 4 ); - } - - public void testOutOfOrderIntegerKeyInsertion() { - LuaTable t = new_Table(); - - for ( int i = 32; i > 0; --i ) { - t.set( i, LuaString.valueOf( "Test Value! "+i ) ); - } - - // Ensure all keys are still there. - for ( int i = 1; i <= 32; ++i ) { - assertEquals( "Test Value! "+i, t.get( i ).tojstring() ); - } - - // Ensure capacities make sense - assertTrue( t.getArrayLength() >= 0 ); - assertTrue( t.getArrayLength() <= 6 ); - - assertTrue( t.getHashLength() >= 16 ); - assertTrue( t.getHashLength() <= 64 ); - - } - - public void testStringAndIntegerKeys() { - LuaTable t = new_Table(); - - for ( int i = 0; i < 10; ++i ) { - LuaString str = LuaString.valueOf( String.valueOf( i ) ); - t.set( i, str ); - t.set( str, LuaInteger.valueOf( i ) ); - } - - assertTrue( t.getArrayLength() >= 9 ); // 1, 2, ..., 9 - assertTrue( t.getArrayLength() <= 18 ); - assertTrue( t.getHashLength() >= 11 ); // 0, "0", "1", ..., "9" - assertTrue( t.getHashLength() <= 33 ); - - LuaValue[] keys = t.keys(); - - int intKeys = 0; - int stringKeys = 0; - - assertEquals( 20, keys.length ); - for ( int i = 0; i < keys.length; ++i ) { - LuaValue k = keys[i]; - - if ( k instanceof LuaInteger ) { - final int ik = k.toint(); - assertTrue( ik >= 0 && ik < 10 ); - final int mask = 1 << ik; - assertTrue( ( intKeys & mask ) == 0 ); - intKeys |= mask; - } else if ( k instanceof LuaString ) { - final int ik = Integer.parseInt( k.tojstring() ); - assertEquals( String.valueOf( ik ), k.tojstring() ); - assertTrue( ik >= 0 && ik < 10 ); - final int mask = 1 << ik; - assertTrue( "Key \""+ik+"\" found more than once", ( stringKeys & mask ) == 0 ); - stringKeys |= mask; - } else { - fail( "Unexpected type of key found" ); - } - } - - assertEquals( 0x03FF, intKeys ); - assertEquals( 0x03FF, stringKeys ); - } - - public void testBadInitialCapacity() { - LuaTable t = new_Table(0, 1); - - t.set( "test", LuaString.valueOf("foo") ); - t.set( "explode", LuaString.valueOf("explode") ); - assertEquals( 2, t.keyCount() ); - } - - public void testRemove0() { - LuaTable t = new_Table(2, 0); - - t.set( 1, LuaString.valueOf("foo") ); - t.set( 2, LuaString.valueOf("bah") ); - assertNotSame(LuaValue.NIL, t.get(1)); - assertNotSame(LuaValue.NIL, t.get(2)); - assertEquals(LuaValue.NIL, t.get(3)); - - t.set( 1, LuaValue.NIL ); - t.set( 2, LuaValue.NIL ); - t.set( 3, LuaValue.NIL ); - assertEquals(LuaValue.NIL, t.get(1)); - assertEquals(LuaValue.NIL, t.get(2)); - assertEquals(LuaValue.NIL, t.get(3)); - } - - public void testRemove1() { - LuaTable t = new_Table(0, 1); - assertEquals( 0, t.keyCount() ); - - t.set( "test", LuaString.valueOf("foo") ); - assertEquals( 1, t.keyCount() ); - t.set( "explode", LuaValue.NIL ); - assertEquals( 1, t.keyCount() ); - t.set( 42, LuaValue.NIL ); - assertEquals( 1, t.keyCount() ); - t.set( new_Table(), LuaValue.NIL ); - assertEquals( 1, t.keyCount() ); - t.set( "test", LuaValue.NIL ); - assertEquals( 0, t.keyCount() ); - - t.set( 10, LuaInteger.valueOf( 5 ) ); - t.set( 10, LuaValue.NIL ); - assertEquals( 0, t.keyCount() ); - } - - public void testRemove2() { - LuaTable t = new_Table(0, 1); - - t.set( "test", LuaString.valueOf("foo") ); - t.set( "string", LuaInteger.valueOf( 10 ) ); - assertEquals( 2, t.keyCount() ); - - t.set( "string", LuaValue.NIL ); - t.set( "three", LuaDouble.valueOf( 3.14 ) ); - assertEquals( 2, t.keyCount() ); - - t.set( "test", LuaValue.NIL ); - assertEquals( 1, t.keyCount() ); - - t.set( 10, LuaInteger.valueOf( 5 ) ); - assertEquals( 2, t.keyCount() ); - - t.set( 10, LuaValue.NIL ); - assertEquals( 1, t.keyCount() ); - - t.set( "three", LuaValue.NIL ); - assertEquals( 0, t.keyCount() ); - } - - public void testInOrderlen() { - LuaTable t = new_Table(); - - for ( int i = 1; i <= 32; ++i ) { - LuaValue v = LuaString.valueOf( "Test Value! "+i ); - t.set( i, v ); - assertEquals( i, t.length() ); - } - } - - public void testOutOfOrderlen() { - LuaTable t = new_Table(); - - for ( int j=8; j<32; j+=8 ) { - for ( int i = j; i > 0; --i ) { - t.set( i, LuaString.valueOf( "Test Value! "+i ) ); - } - assertEquals( j, t.length() ); - } - } - - public void testStringKeyslen() { - LuaTable t = new_Table(); - - for ( int i = 1; i <= 32; ++i ) { - t.set( "str-"+i, LuaString.valueOf( "String Key Test Value! "+i ) ); - assertEquals( 0, t.length() ); - } - } - - public void testMixedKeyslen() { - LuaTable t = new_Table(); - - for ( int i = 1; i <= 32; ++i ) { - t.set( "str-"+i, LuaString.valueOf( "String Key Test Value! "+i ) ); - t.set( i, LuaString.valueOf( "Int Key Test Value! "+i ) ); - assertEquals( i, t.length() ); - } - } - - private static final void compareLists(LuaTable t,Vector v) { - int n = v.size(); - assertEquals(v.size(),t.length()); - for ( int j=0; j