Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

XOMW: Consolidate XophpArray_ into XophpArray [#632]

Browse Source
This commit is contained in:
gnosygnu
2020-05-09 07:21:14 -04:00
parent ee68162a4a
commit a9367eaca8
45 changed files with 1140 additions and 1179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
400_xowa/tst/gplx/xowa/mediawiki/XophpArray_tst.java → 400_xowa/tst/gplx/xowa/mediawiki/XophpArrayInstanceTest.java
View File

@@ -13,18 +13,19 @@ The terms of each license can be found in the source code repository:
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/
package gplx.xowa.mediawiki; import gplx.*; import gplx.xowa.*;
package gplx.xowa.mediawiki;
import org.junit.*; import gplx.core.tests.*;
public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.array.php
private final XophpArray_fxt fxt = new XophpArray_fxt();
public class XophpArrayInstanceTest { // REF: http://php.net/manual/en/language.types.array.php
private final XophpArrayfxt fxt = new XophpArrayfxt();
@Test public void array__kvs() {
// $array = array("foo" => "bar", "bar" => "foo",);
fxt.Test__array
( XophpArray.New()
. Add("foo", "bar")
. Add("bar", "foo")
, XophpArrayItm.New_str("foo", "bar")
, XophpArrayItm.New_str("bar", "foo")
, XophpArrayItm.NewStr("foo", "bar")
, XophpArrayItm.NewStr("bar", "foo")
);
}
@Test public void array__casting() {
@@ -35,7 +36,7 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
. Add("1" , "b")
. Add(1.5 , "c")
. Add(true, "d")
, XophpArrayItm.New_int(1, "d"));
, XophpArrayItm.NewInt(1, "d"));
}
@Test public void array__mixed() {
// $array = array("foo" => "bar", "bar" => "foo", 100 => -100, -100 => 100);
@@ -45,10 +46,10 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
. Add("bar", "foo")
. Add(100, -100)
. Add(-100, 100)
, XophpArrayItm.New_str("foo", "bar")
, XophpArrayItm.New_str("bar", "foo")
, XophpArrayItm.New_int(100, -100)
, XophpArrayItm.New_int(-100, 100)
, XophpArrayItm.NewStr("foo", "bar")
, XophpArrayItm.NewStr("bar", "foo")
, XophpArrayItm.NewInt(100, -100)
, XophpArrayItm.NewInt(-100, 100)
);
}
@Test public void array__objs() {
@@ -59,10 +60,10 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
. Add("bar")
. Add("hello")
. Add("world")
, XophpArrayItm.New_int(0, "foo")
, XophpArrayItm.New_int(1, "bar")
, XophpArrayItm.New_int(2, "hello")
, XophpArrayItm.New_int(3, "world")
, XophpArrayItm.NewInt(0, "foo")
, XophpArrayItm.NewInt(1, "bar")
, XophpArrayItm.NewInt(2, "hello")
, XophpArrayItm.NewInt(3, "world")
);
}
@Test public void array__unkeyed() {
@@ -73,10 +74,10 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
. Add("b")
. Add(6, "c")
. Add("d")
, XophpArrayItm.New_int(0, "a")
, XophpArrayItm.New_int(1, "b")
, XophpArrayItm.New_int(6, "c")
, XophpArrayItm.New_int(7, "d")
, XophpArrayItm.NewInt(0, "a")
, XophpArrayItm.NewInt(1, "b")
, XophpArrayItm.NewInt(6, "c")
, XophpArrayItm.NewInt(7, "d")
);
}
@Test public void array__multidimensional() {
@@ -99,9 +100,9 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
. Add("dimensional", XophpArray.New()
. Add("array", "foo")
))
, XophpArrayItm.New_str("foo", "bar")
, XophpArrayItm.New_int(42, "24")
, XophpArrayItm.New_str("multi", XophpArray.New()
, XophpArrayItm.NewStr("foo", "bar")
, XophpArrayItm.NewInt(42, "24")
, XophpArrayItm.NewStr("multi", XophpArray.New()
. Add("dimensional", XophpArray.New()
. Add("array", "foo")
))
@@ -112,13 +113,13 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
ary.Add(0, "a").Add(1, "b");
// delete all
ary.unset(0);
ary.unset(1);
XophpArray.unset(ary, 0);
XophpArray.unset(ary, 1);
fxt.Test__array(ary);
// add new and assert idx is 2
ary.Add("c");
fxt.Test__array(ary, XophpArrayItm.New_int(2, "c"));
fxt.Test__array(ary, XophpArrayItm.NewInt(2, "c"));
}
@Test public void Pop() {
XophpArray ary = XophpArray.New();
@@ -154,9 +155,9 @@ public class XophpArray_tst { // REF: http://php.net/manual/en/language.types.ar
fxt.Test__Get_by(ary, "missing", null);
}
}
class XophpArray_fxt {
class XophpArrayfxt {
public void Test__Count(XophpArray ary, int expd) {
Gftest.Eq__int(expd, ary.count());
Gftest.Eq__int(expd, ary.Len());
}
public void Test__array(XophpArray ary, XophpArrayItm... expd) {
XophpArrayItm[] actl = ary.To_ary();
@@ -167,7 +168,7 @@ class XophpArray_fxt {
Gftest.Eq__ary(expd, actl);
}
public void Test__Pop(XophpArray ary, String expd) {
String actl = (String)ary.pop();
String actl = (String)XophpArray.array_pop(ary);
Gftest.Eq__str(expd, actl);
}
public void Test__Itm_str_concat_end(XophpArray ary, String expd, int idx, String v) {

90
400_xowa/tst/gplx/xowa/mediawiki/XophpArray__tst.java → 400_xowa/tst/gplx/xowa/mediawiki/XophpArrayStaticTest.java
View File

@@ -22,61 +22,61 @@ import gplx.String_;
import gplx.core.tests.Gftest;
import org.junit.Test;
public class XophpArray__tst {
private final XophpArray__fxt fxt = new XophpArray__fxt();
public class XophpArrayStaticTest {
private final XophpArray_fxt fxt = new XophpArray_fxt();
// REF.PHP:https://www.php.net/manual/en/function.array-merge.php
@Test public void array_merge__basic() {
XophpArray ary1 = fxt.Make().Add("key1", "val1").Add("a");
XophpArray ary2 = fxt.Make().Add("key2", "val2").Add("b");
fxt.Test__eq
( fxt.Make().Add("key1", "val1").Add("a").Add("key2", "val2").Add("b")
, XophpArray_.array_merge(ary1, ary2));
, XophpArray.array_merge(ary1, ary2));
}
@Test public void array_merge__same_key() {
XophpArray ary1 = fxt.Make().Add("key", "val1");
XophpArray ary2 = fxt.Make().Add("key", "val2");
fxt.Test__eq
( fxt.Make().Add("key", "val2")
, XophpArray_.array_merge(ary1, ary2));
, XophpArray.array_merge(ary1, ary2));
}
@Test public void array_merge__same_idx() {
XophpArray ary1 = fxt.Make().Add(0, "a");
XophpArray ary2 = fxt.Make().Add(0, "b");
fxt.Test__eq
( fxt.Make().Add(0, "a").Add(1, "b")
, XophpArray_.array_merge(ary1, ary2));
, XophpArray.array_merge(ary1, ary2));
}
@Test public void array_merge__renumber() {
XophpArray ary1 = fxt.Make().Add(3, "a");
XophpArray ary2 = fxt.Make().Add(2, "b");
fxt.Test__eq
( fxt.Make().Add(0, "a").Add(1, "b")
, XophpArray_.array_merge(ary1, ary2));
, XophpArray.array_merge(ary1, ary2));
}
@Test public void array_merge__example_1() {
XophpArray ary1 = fxt.Make().Add("color", "red").Add_many(2, 4);
XophpArray ary2 = fxt.Make().Add_many("a", "b").Add("color", "green").Add("shape", "trapezoid").Add(4);
fxt.Test__eq
( fxt.Make().Add("color", "green").Add_many(2, 4, "a", "b").Add("shape", "trapezoid").Add(4)
, XophpArray_.array_merge(ary1, ary2));
, XophpArray.array_merge(ary1, ary2));
}
@Test public void array_merge__example_2() {
XophpArray ary1 = fxt.Make();
XophpArray ary2 = fxt.Make().Add(1, "data");
fxt.Test__eq
( fxt.Make().Add(0, "data")
, XophpArray_.array_merge(ary1, ary2));
, XophpArray.array_merge(ary1, ary2));
}
@Test public void array_add() {
XophpArray ary1 = fxt.Make().Add(0, "zero_a").Add(2, "two_a").Add(3, "three_a");
XophpArray ary2 = fxt.Make().Add(1, "one_b").Add(3, "three_b").Add(4, "four_b");
fxt.Test__eq
( fxt.Make().Add(0, "zero_a").Add(2, "two_a").Add(3, "three_a").Add(1, "one_b").Add(4, "four_b")
, XophpArray_.array_add(ary1, ary2));
, XophpArray.array_add(ary1, ary2));
}
@Test public void array_splice__bgn_is_positive() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, 1);
XophpArray del = XophpArray.array_splice(src, 1);
fxt.Test__eq
( fxt.Make().Add_many("a")
, src
@@ -88,7 +88,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__bgn_is_positive_large() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, 99);
XophpArray del = XophpArray.array_splice(src, 99);
fxt.Test__eq
( fxt.Make().Add_many("a", "b", "c", "d")
, src
@@ -100,7 +100,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__bgn_is_negative() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, -3);
XophpArray del = XophpArray.array_splice(src, -3);
fxt.Test__eq
( fxt.Make().Add_many("a")
, src
@@ -112,7 +112,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__bgn_is_negative_large() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, -99);
XophpArray del = XophpArray.array_splice(src, -99);
fxt.Test__eq
( fxt.Make()
, src
@@ -124,7 +124,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__len_is_positive() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, 1, 2);
XophpArray del = XophpArray.array_splice(src, 1, 2);
fxt.Test__eq
( fxt.Make().Add_many("a", "d")
, src
@@ -136,7 +136,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__len_is_positive_large() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, 1, 99);
XophpArray del = XophpArray.array_splice(src, 1, 99);
fxt.Test__eq
( fxt.Make().Add_many("a")
, src
@@ -148,7 +148,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__len_is_negative() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, 1, -2);
XophpArray del = XophpArray.array_splice(src, 1, -2);
fxt.Test__eq
( fxt.Make().Add_many("a", "c", "d")
, src
@@ -160,7 +160,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__len_is_negative_large() {
XophpArray src = fxt.Make().Add_many("a", "b", "c", "d");
XophpArray del = XophpArray_.array_splice(src, 1, -99);
XophpArray del = XophpArray.array_splice(src, 1, -99);
fxt.Test__eq
( fxt.Make().Add_many("a", "b", "c", "d")
, src
@@ -172,7 +172,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__repl() {
XophpArray src = fxt.Make().Add(0, "a").Add(1, "b").Add(2, "c").Add(3, "d");
XophpArray del = XophpArray_.array_splice(src, 1, 2, fxt.Make().Add(0, "x"));
XophpArray del = XophpArray.array_splice(src, 1, 2, fxt.Make().Add(0, "x"));
fxt.Test__eq
( fxt.Make().Add(0, "a").Add(1, "x").Add(2, "d")
, src
@@ -184,7 +184,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__example_1a() {
XophpArray src = fxt.Make().Add_many("red", "green", "blue", "yellow");
XophpArray del = XophpArray_.array_splice(src, 2);
XophpArray del = XophpArray.array_splice(src, 2);
fxt.Test__eq
( fxt.Make().Add_many("red", "green")
, src
@@ -196,7 +196,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__example_1b() {
XophpArray src = fxt.Make().Add_many("red", "green", "blue", "yellow");
XophpArray del = XophpArray_.array_splice(src, 1, -1);
XophpArray del = XophpArray.array_splice(src, 1, -1);
fxt.Test__eq
( fxt.Make().Add_many("red", "yellow")
, src
@@ -208,7 +208,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__example_1c() {
XophpArray src = fxt.Make().Add_many("red", "green", "blue", "yellow");
XophpArray del = XophpArray_.array_splice(src, 1, 4, XophpArray.New("orange"));
XophpArray del = XophpArray.array_splice(src, 1, 4, XophpArray.New("orange"));
fxt.Test__eq
( fxt.Make().Add_many("red", "orange")
, src
@@ -220,7 +220,7 @@ public class XophpArray__tst {
}
@Test public void array_splice__example_1d() {
XophpArray src = fxt.Make().Add_many("red", "green", "blue", "yellow");
XophpArray del = XophpArray_.array_splice(src, -1, 1, XophpArray.New("black", "maroon"));
XophpArray del = XophpArray.array_splice(src, -1, 1, XophpArray.New("black", "maroon"));
fxt.Test__eq
( fxt.Make().Add_many("red", "green", "blue", "black", "maroon")
, src
@@ -234,35 +234,35 @@ public class XophpArray__tst {
XophpArray orig = fxt.Make().Add("size", "XL").Add("color", "gold");
fxt.Test__eq
( fxt.Make().Add(0, "XL").Add(1, "gold")
, orig.values()
, XophpArray.array_values(orig)
);
}
@Test public void array_map() {
XophpArray orig = fxt.Make().Add_many("a", "b", "c");
fxt.Test__eq
( fxt.Make().Add_many("A", "B", "C")
, XophpArray_.array_map(XophpString_.Callback_owner, "strtoupper", orig)
, XophpArray.array_map(XophpString_.Callback_owner, "strtoupper", orig)
);
}
@Test public void array_flip__basic() {
XophpArray orig = fxt.Make().Add_many("oranges", "apples", "pears");
fxt.Test__eq
( fxt.Make().Add("oranges", 0).Add("apples", 1).Add("pears", 2)
, XophpArray_.array_flip(orig)
, XophpArray.array_flip(orig)
);
}
@Test public void array_flip__collision() {
XophpArray orig = fxt.Make().Add("a", 1).Add("b", 1).Add("c", 2);
fxt.Test__eq
( fxt.Make().Add("1", "b").Add("2", "c")
, XophpArray_.array_flip(orig)
, XophpArray.array_flip(orig)
);
}
@Test public void implode() {
XophpArray orig = fxt.Make().Add_many("a", "b", "c");
Gftest.Eq__str
( "a b c"
, XophpArray_.implode(" ", orig)
, XophpArray.implode(" ", orig)
);
}
@Test public void in_array() {
@@ -270,19 +270,19 @@ public class XophpArray__tst {
XophpArray array;
// Example #1
array = XophpArray.New("Mac", "NT", "Irix", "Linux");
Gftest.Eq__bool(Bool_.Y, XophpArray_.in_array("Irix", array));
Gftest.Eq__bool(Bool_.N, XophpArray_.in_array("mac" , array));
Gftest.Eq__bool(Bool_.Y, XophpArray.in_array("Irix", array));
Gftest.Eq__bool(Bool_.N, XophpArray.in_array("mac" , array));
// Example #2
array = XophpArray.New(12.4d, 1.13d);
Gftest.Eq__bool(Bool_.N, XophpArray_.in_array("12.4", array, true));
Gftest.Eq__bool(Bool_.Y, XophpArray_.in_array( 1.13d, array, true));
Gftest.Eq__bool(Bool_.N, XophpArray.in_array("12.4", array, true));
Gftest.Eq__bool(Bool_.Y, XophpArray.in_array( 1.13d, array, true));
// Example #3
array = XophpArray.New(XophpArray.New('p', 'h'), XophpArray.New('p', 'r'), 'o');
Gftest.Eq__bool(Bool_.Y, XophpArray_.in_array(XophpArray.New('p', 'h'), array));
Gftest.Eq__bool(Bool_.N, XophpArray_.in_array(XophpArray.New('f', 'i'), array));
Gftest.Eq__bool(Bool_.Y, XophpArray_.in_array('o', array));
Gftest.Eq__bool(Bool_.Y, XophpArray.in_array(XophpArray.New('p', 'h'), array));
Gftest.Eq__bool(Bool_.N, XophpArray.in_array(XophpArray.New('f', 'i'), array));
Gftest.Eq__bool(Bool_.Y, XophpArray.in_array('o', array));
}
@Test public void array_shift() {
XophpArray array;
@@ -290,7 +290,7 @@ public class XophpArray__tst {
// key is int
array = XophpArray.New("a", "b");
shifted = (String)XophpArray_.array_shift(array);
shifted = (String)XophpArray.array_shift(array);
Gftest.Eq__str("a", shifted);
fxt.Test__eq
@@ -300,7 +300,7 @@ public class XophpArray__tst {
// key is str and int
array = XophpArray.New().Add("a", "a").Add(2, "b").Add(5, "c");
shifted = (String)XophpArray_.array_shift(array);
shifted = (String)XophpArray.array_shift(array);
Gftest.Eq__str("a", shifted);
fxt.Test__eq
@@ -310,7 +310,7 @@ public class XophpArray__tst {
// empty
array = XophpArray.New();
shifted = (String)XophpArray_.array_shift(array);
shifted = (String)XophpArray.array_shift(array);
Gftest.Eq__bool_y(shifted == null);
fxt.Test__eq
@@ -320,7 +320,7 @@ public class XophpArray__tst {
// null
array = null;
shifted = (String)XophpArray_.array_shift(array);
shifted = (String)XophpArray.array_shift(array);
Gftest.Eq__bool_y(shifted == null);
Gftest.Eq__bool_y(array == null);
@@ -328,7 +328,7 @@ public class XophpArray__tst {
// PHP examples
// Example #1
array = XophpArray.New("orange", "banana", "apple", "strawberry");
shifted = (String)XophpArray_.array_shift(array);
shifted = (String)XophpArray.array_shift(array);
Gftest.Eq__str("orange", shifted);
fxt.Test__eq
@@ -344,31 +344,31 @@ public class XophpArray__tst {
array = XophpArray.New().Add("a", 1).Add("b", 2).Add("c", 3).Add("d", 4).Add("e", 5);
fxt.Test__eq
( XophpArray.New().Add("a", 1).Add("c", 3).Add("e", 5)
, XophpArray_.array_filter(array, callbackOwner.NewCallback("array_filter_odd"))
, XophpArray.array_filter(array, callbackOwner.NewCallback("array_filter_odd"))
);
array = XophpArray.New(6, 7, 8, 9, 10, 11, 12);
fxt.Test__eq
( XophpArray.New().Add(0, 6).Add(2, 8).Add(4, 10).Add(6, 12)
, XophpArray_.array_filter(array, callbackOwner.NewCallback( "array_filter_even"))
, XophpArray.array_filter(array, callbackOwner.NewCallback( "array_filter_even"))
);
// Example #2 array_filter() without callback
array = XophpArray.New().Add(0, "foo").Add(1, false).Add(2, -1).Add(3, null).Add(4, "").Add(5, "0").Add(6, 0);
fxt.Test__eq
( XophpArray.New().Add(0, "foo").Add(2, -1)
, XophpArray_.array_filter(array)
, XophpArray.array_filter(array)
);
// Example #3 array_filter() with flag
array = XophpArray.New().Add("a", 1).Add("b", 2).Add("c", 3).Add("d", 4);
fxt.Test__eq
( XophpArray.New().Add("b", 2)
, XophpArray_.array_filter(array, callbackOwner.NewCallback("array_filter_key"), XophpArray_.ARRAY_FILTER_USE_KEY)
, XophpArray.array_filter(array, callbackOwner.NewCallback("array_filter_key"), XophpArray.ARRAY_FILTER_USE_KEY)
);
fxt.Test__eq
( XophpArray.New().Add("b", 2).Add("d", 4)
, XophpArray_.array_filter(array, callbackOwner.NewCallback("array_filter_both"), XophpArray_.ARRAY_FILTER_USE_BOTH)
, XophpArray.array_filter(array, callbackOwner.NewCallback("array_filter_both"), XophpArray.ARRAY_FILTER_USE_BOTH)
);
}
@Test public void reset() {
@@ -390,7 +390,7 @@ public class XophpArray__tst {
Gftest.Eq__str("step one", (String)XophpArray.current(array));
}
}
class XophpArray__fxt {
class XophpArray_fxt {
public XophpArray Make() {return new XophpArray();}
public void Test__eq(XophpArray expd, XophpArray actl) {
Gftest.Eq__str(expd.To_str(), actl.To_str());

3
400_xowa/tst/gplx/xowa/mediawiki/includes/XomwHooksTest.java
View File

@@ -2,7 +2,6 @@ package gplx.xowa.mediawiki.includes;
import gplx.core.tests.Gftest;
import gplx.xowa.mediawiki.XophpArray;
import gplx.xowa.mediawiki.XophpArray__tst;
import gplx.xowa.mediawiki.XophpCallback;
import gplx.xowa.mediawiki.XophpCallbackOwner;
import org.junit.Before;
@@ -75,7 +74,7 @@ class XomwHooksTestCallbackOwner implements XophpCallbackOwner {
public String Result() {return result;} private String result = "";
@Override
public Object Call(String method, Object... args) {
result += method + ":" + (args == null ? -1 : ((XophpArray)args[0]).count()) + ";";
result += method + ":" + (args == null ? -1 : ((XophpArray)args[0]).Len()) + ";";
return null; // NOTE: XomwHooks throws error if non-null
}
}