Skip to content

Commit ff522e3

Browse files
eregoneregon
committed
Move DynamicObject tests under a common package matching the mx project name
* Merge the two SharedShapeTest into one test file.
1 parent 0bd926b commit ff522e3

27 files changed

+145
-378
lines changed

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/CachedFallbackTest.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/CachedFallbackTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import static org.junit.Assert.assertEquals;
4444
import static org.junit.Assert.assertSame;
4545
import static org.junit.Assert.assertTrue;
4646

47-
import org.junit.Ignore;
48-
import org.junit.Test;
49-
5047
import com.oracle.truffle.api.object.DynamicObject;
5148
import com.oracle.truffle.api.object.DynamicObjectLibrary;
5249
import com.oracle.truffle.api.object.Shape;
50+
import org.junit.Ignore;
51+
import org.junit.Test;
52+
5353
import com.oracle.truffle.api.test.AbstractLibraryTest;
5454

5555
public class CachedFallbackTest extends AbstractLibraryTest {

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/CachedGetNode.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/CachedGetNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import com.oracle.truffle.api.dsl.GenerateInline;
4444
import com.oracle.truffle.api.dsl.Specialization;

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/CachedPutNode.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/CachedPutNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import com.oracle.truffle.api.dsl.GenerateInline;
4444
import com.oracle.truffle.api.dsl.Specialization;

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/ConstantLocationTest.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/ConstantLocationTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import java.util.Arrays;
4444
import java.util.List;
4545

46+
import com.oracle.truffle.api.object.DynamicObject;
47+
import com.oracle.truffle.api.object.DynamicObjectLibrary;
48+
import com.oracle.truffle.api.object.Property;
49+
import com.oracle.truffle.api.object.Shape;
4650
import org.hamcrest.CoreMatchers;
4751
import org.hamcrest.MatcherAssert;
4852
import org.junit.Assert;
@@ -51,10 +55,6 @@
5155
import org.junit.runners.Parameterized;
5256
import org.junit.runners.Parameterized.Parameters;
5357

54-
import com.oracle.truffle.api.object.DynamicObject;
55-
import com.oracle.truffle.api.object.DynamicObjectLibrary;
56-
import com.oracle.truffle.api.object.Property;
57-
import com.oracle.truffle.api.object.Shape;
5858
import com.oracle.truffle.api.test.AbstractParametrizedLibraryTest;
5959

6060
@SuppressWarnings("deprecation")

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/ext/test/CustomLayoutTest.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/CustomLayoutTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.ext.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import static org.junit.Assert.assertNotNull;
4444

4545
import java.lang.invoke.MethodHandles;
4646

47-
import org.junit.Test;
48-
4947
import com.oracle.truffle.api.object.DynamicObject;
5048
import com.oracle.truffle.api.object.Shape;
49+
import org.junit.Test;
5150

5251
public class CustomLayoutTest {
5352

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/DOTestAsserts.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DOTestAsserts.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import static org.junit.Assert.assertEquals;
4444
import static org.junit.Assert.assertTrue;
@@ -55,14 +55,14 @@
5555
import java.util.stream.Collectors;
5656
import java.util.stream.Stream;
5757

58-
import org.junit.Assert;
59-
60-
import com.oracle.truffle.api.Assumption;
6158
import com.oracle.truffle.api.object.DynamicObject;
6259
import com.oracle.truffle.api.object.DynamicObjectLibrary;
6360
import com.oracle.truffle.api.object.Location;
6461
import com.oracle.truffle.api.object.Property;
6562
import com.oracle.truffle.api.object.Shape;
63+
import org.junit.Assert;
64+
65+
import com.oracle.truffle.api.Assumption;
6666

6767
public abstract class DOTestAsserts {
6868

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/DynamicObjectConstructorTest.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectConstructorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import static org.hamcrest.CoreMatchers.containsString;
4444
import static org.hamcrest.MatcherAssert.assertThat;
4545

4646
import java.lang.invoke.MethodHandles;
4747

48-
import org.junit.Test;
49-
5048
import com.oracle.truffle.api.object.DynamicObjectLibrary;
5149
import com.oracle.truffle.api.object.Shape;
50+
import org.junit.Test;
51+
5252
import com.oracle.truffle.api.test.AbstractLibraryTest;
5353

5454
public class DynamicObjectConstructorTest extends AbstractLibraryTest {

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/DynamicObjectLibraryTest.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectLibraryTest.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import static org.junit.Assert.assertEquals;
4444
import static org.junit.Assert.assertFalse;
@@ -56,17 +56,18 @@
5656
import java.util.function.IntUnaryOperator;
5757
import java.util.function.Supplier;
5858

59+
import com.oracle.truffle.api.object.DynamicObject;
60+
import com.oracle.truffle.api.object.DynamicObjectLibrary;
61+
import com.oracle.truffle.api.object.Property;
62+
import com.oracle.truffle.api.object.Shape;
63+
import org.junit.Assert;
5964
import org.junit.Test;
6065
import org.junit.runner.RunWith;
6166
import org.junit.runners.Parameterized;
6267
import org.junit.runners.Parameterized.Parameter;
6368
import org.junit.runners.Parameterized.Parameters;
6469

6570
import com.oracle.truffle.api.nodes.UnexpectedResultException;
66-
import com.oracle.truffle.api.object.DynamicObject;
67-
import com.oracle.truffle.api.object.DynamicObjectLibrary;
68-
import com.oracle.truffle.api.object.Property;
69-
import com.oracle.truffle.api.object.Shape;
7071
import com.oracle.truffle.api.test.AbstractParametrizedLibraryTest;
7172

7273
@SuppressWarnings("deprecation")
@@ -270,7 +271,7 @@ public void testPut2() {
270271
DynamicObjectLibrary setNode1 = createLibraryForKey(k1);
271272
setNode1.put(o1, k1, v2);
272273
assertEquals(v2, uncachedGet(o1, k1));
273-
assertEquals(0, uncachedGetProperty(o1, k1).getFlags());
274+
Assert.assertEquals(0, uncachedGetProperty(o1, k1).getFlags());
274275
setNode1.put(o1, k1, v1);
275276
assertEquals(v1, uncachedGet(o1, k1));
276277
setNode1.put(o2, k1, v2);
@@ -283,7 +284,7 @@ public void testPut2() {
283284
assertSame(o1.getShape(), o3.getShape());
284285
uncachedPut(o3, k1, v1);
285286
assertEquals(v1, uncachedGet(o3, k1));
286-
assertEquals(0, uncachedGetProperty(o3, k1).getFlags());
287+
Assert.assertEquals(0, uncachedGetProperty(o3, k1).getFlags());
287288
assertSame(o1.getShape(), o3.getShape());
288289

289290
String v3 = "asdf";
@@ -304,7 +305,7 @@ public void testPut2() {
304305

305306
setNode3.putWithFlags(o3, k1, v1, f2);
306307
assertEquals(v1, uncachedGet(o3, k1));
307-
assertEquals(f2, uncachedGetProperty(o3, k1).getFlags());
308+
Assert.assertEquals(f2, uncachedGetProperty(o3, k1).getFlags());
308309
}
309310

310311
@Test
@@ -321,7 +322,7 @@ public void testPutWithFlags1() {
321322
DynamicObjectLibrary setNode1 = createLibraryForKey(k1);
322323
setNode1.putWithFlags(o1, k1, v2, flags);
323324
assertEquals(v2, uncachedGet(o1, k1));
324-
assertEquals(flags, uncachedGetProperty(o1, k1).getFlags());
325+
Assert.assertEquals(flags, uncachedGetProperty(o1, k1).getFlags());
325326
setNode1.putWithFlags(o1, k1, v1, flags);
326327
assertEquals(v1, uncachedGet(o1, k1));
327328
setNode1.putWithFlags(o2, k1, v2, flags);
@@ -334,7 +335,7 @@ public void testPutWithFlags1() {
334335
assertNotSame(o1.getShape(), o3.getShape());
335336
uncachedPut(o3, k1, v1, flags);
336337
assertEquals(v1, uncachedGet(o3, k1));
337-
assertEquals(flags, uncachedGetProperty(o3, k1).getFlags());
338+
Assert.assertEquals(flags, uncachedGetProperty(o3, k1).getFlags());
338339
// assertSame(o1.getShape(), o3.getShape());
339340

340341
String v3 = "asdf";
@@ -355,7 +356,7 @@ public void testPutWithFlags1() {
355356

356357
setNode3.putWithFlags(o3, k1, v1, f2);
357358
assertEquals(v1, uncachedGet(o3, k1));
358-
assertEquals(f2, uncachedGetProperty(o3, k1).getFlags());
359+
Assert.assertEquals(f2, uncachedGetProperty(o3, k1).getFlags());
359360
}
360361

361362
@Test
@@ -484,16 +485,16 @@ public void testPropertyFlags() {
484485
uncachedPut(o1, k1, v1, 0);
485486
assertTrue(lib.setPropertyFlags(o1, k1, f1));
486487
assertEquals(f1, lib.getPropertyFlagsOrDefault(o1, k1, -1));
487-
assertEquals(f1, uncachedGetProperty(o1, k1).getFlags());
488+
Assert.assertEquals(f1, uncachedGetProperty(o1, k1).getFlags());
488489
assertTrue(updatePropertyFlags(lib, o1, k1, f -> f | f2));
489490
assertEquals(f3, lib.getPropertyFlagsOrDefault(o1, k1, -1));
490-
assertEquals(f3, uncachedGetProperty(o1, k1).getFlags());
491+
Assert.assertEquals(f3, uncachedGetProperty(o1, k1).getFlags());
491492

492493
Shape before = o1.getShape();
493494
assertTrue(lib.setPropertyFlags(o1, k1, f3));
494495
assertFalse(updatePropertyFlags(lib, o1, k1, f -> f | f2));
495496
assertEquals(f3, lib.getPropertyFlagsOrDefault(o1, k1, -1));
496-
assertEquals(f3, uncachedGetProperty(o1, k1).getFlags());
497+
Assert.assertEquals(f3, uncachedGetProperty(o1, k1).getFlags());
497498
assertSame(before, o1.getShape());
498499

499500
DynamicObject o2 = createEmpty();

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/DynamicTypeTest.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicTypeTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.basic.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import static org.junit.Assert.assertSame;
4444

4545
import java.util.Arrays;
4646
import java.util.List;
4747

48+
import com.oracle.truffle.api.object.DynamicObjectLibrary;
49+
import com.oracle.truffle.api.object.Shape;
4850
import org.junit.Test;
4951
import org.junit.runner.RunWith;
5052
import org.junit.runners.Parameterized;
5153
import org.junit.runners.Parameterized.Parameters;
5254

53-
import com.oracle.truffle.api.object.DynamicObjectLibrary;
54-
import com.oracle.truffle.api.object.Shape;
5555
import com.oracle.truffle.api.test.AbstractParametrizedLibraryTest;
5656

5757
@RunWith(Parameterized.class)

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/ext/test/GR42603.java‎ renamed to ‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/GR42603.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.object.ext.test;
41+
package com.oracle.truffle.api.object.test;
4242

4343
import java.util.ArrayList;
4444
import java.util.List;
@@ -47,13 +47,13 @@
4747
import java.util.concurrent.Executors;
4848
import java.util.concurrent.Future;
4949

50+
import com.oracle.truffle.api.object.DynamicObjectLibrary;
51+
import com.oracle.truffle.api.object.Shape;
5052
import org.graalvm.polyglot.Context;
5153
import org.graalvm.polyglot.Engine;
5254
import org.junit.Test;
5355

54-
import com.oracle.truffle.api.object.DynamicObjectLibrary;
55-
import com.oracle.truffle.api.object.Shape;
56-
import com.oracle.truffle.object.ext.test.ObjectModelRegressionTest.TestDynamicObject;
56+
import com.oracle.truffle.api.object.test.ObjectModelRegressionTest.TestDynamicObject;
5757

5858
public class GR42603 {
5959

0 commit comments

Comments
 (0)