remove duplicate key and update to new variables scope api

ortus-boxlang · Jan 5, 2024 · bcb03dc · bcb03dc
1 parent d5e6a6a
commit bcb03dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/ortus/boxlang/runtime/scopes/Key.java b/src/main/java/ortus/boxlang/runtime/scopes/Key.java
@@ -109,7 +109,6 @@ public class Key {
 	public static final Key	mask				= Key.of( "mask" );
 	public static final Key	dateFormat			= Key.of( "dateFormat" );
 	public static final Key	timeFormat			= Key.of( "timeFormat" );
-	public static final Key	size				= Key.of( "size" );
 
 	/**
 	 * --------------------------------------------------------------------------

diff --git a/src/test/java/ortus/boxlang/runtime/bifs/global/io/DirectoryListTest.java b/src/test/java/ortus/boxlang/runtime/bifs/global/io/DirectoryListTest.java
@@ -86,7 +86,7 @@ public void testDirectoryListBif() {
 		    result = directoryList( variables.testDirectory );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Array );
 		Array listing = ( Array ) result;
 		assertTrue( listing.size() == 3 );
@@ -109,7 +109,7 @@ public void testRecursiveDirectoryListBif() {
 		    result = directoryList( variables.testDirectory, true );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Array );
 		Array listing = ( Array ) result;
 		assertTrue( listing.size() == 4 );
@@ -133,7 +133,7 @@ public void testNamesDirectoryListBif() {
 		    result = directoryList( variables.testDirectory, false, "name" );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Array );
 		Array listing = ( Array ) result;
 		assertTrue( listing.size() == 3 );
@@ -156,7 +156,7 @@ public void testQueryDirectoryListBif() {
 		    result = directoryList( variables.testDirectory, false, "query" );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Query );
 		Query listing = ( Query ) result;
 		assertTrue( listing.size() == 3 );
@@ -187,7 +187,7 @@ public void testFilterDirectoryListBif() {
 		    result = directoryList( variables.testDirectory, true, "name", "*.txt" );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Array );
 		Array listing = ( Array ) result;
 		assertTrue( listing.size() == 2 );
@@ -209,7 +209,7 @@ public void testSortDirectoryListBif() {
 		    result = directoryList( variables.testDirectory, true, "name", "*.txt", "name desc" );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Array );
 		Array listing = ( Array ) result;
 		assertTrue( listing.size() == 2 );
@@ -227,7 +227,7 @@ public void testTypeDirectoryListBif() {
 		    result = directoryList( variables.testDirectory, true, "path", "*", "name", "directory" );
 		    """,
 		    context );
-		var result = variables.dereference( Key.of( "result" ), false );
+		var result = variables.get( Key.of( "result" ) );
 		assertTrue( result instanceof Array );
 		Array listing = ( Array ) result;
 		assertTrue( listing.size() == 2 );