diff --git a/.gitignore b/.gitignore
index bff2d7629..94f1036e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*.iml
+**/.idea/**
diff --git a/100_core/src/gplx/Io_url__tst.java b/100_core/src/gplx/Io_url__tst.java
index 5d2198292..9e6758361 100644
--- a/100_core/src/gplx/Io_url__tst.java
+++ b/100_core/src/gplx/Io_url__tst.java
@@ -13,18 +13,20 @@ 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;
-import org.junit.*; import gplx.core.tests.*; import gplx.core.envs.*;
-public class Io_url__tst {
- @Before public void init() {fxt.Clear();} private final Io_url__fxt fxt = new Io_url__fxt();
- @Test public void Basic__lnx() {fxt.Test__New__http_or_null(Bool_.N, "file:///C:/a.txt", "C:/a.txt");}
- @Test public void Basic__wnt() {fxt.Test__New__http_or_null(Bool_.Y, "file:///C:/a.txt", "C:\\a.txt");}
- @Test public void Null() {fxt.Test__New__http_or_null(Bool_.N, "C:/a.txt", null);}
-}
-class Io_url__fxt {
- public void Clear() {Io_mgr.Instance.InitEngine_mem();}
- public void Test__New__http_or_null(boolean os_is_wnt, String raw, String expd) {
- Op_sys.Cur_(os_is_wnt ? Op_sys.Tid_wnt : Op_sys.Tid_lnx);
- Gftest.Eq__obj_or_null(expd, Io_url_.New__http_or_null(raw));
- }
-}
+package gplx;
+import org.junit.*; import gplx.core.tests.*; import gplx.core.envs.*;
+public class Io_url__tst {
+ @Before public void init() {fxt.Clear();} private final Io_url__fxt fxt = new Io_url__fxt();
+ @Test public void Basic__lnx() {fxt.Test__New__http_or_null(Bool_.N, "file:///C:/a.txt", "C:/a.txt");}
+ @Test public void Basic__wnt() {fxt.Test__New__http_or_null(Bool_.Y, "file:///C:/a.txt", "C:\\a.txt");}
+ @Test public void Null() {fxt.Test__New__http_or_null(Bool_.N, "C:/a.txt", null);}
+}
+class Io_url__fxt {
+ public void Clear() {Io_mgr.Instance.InitEngine_mem();}
+ public void Test__New__http_or_null(boolean os_is_wnt, String raw, String expd) {
+ int curTid = Op_sys.Cur().Tid();
+ Op_sys.Cur_(os_is_wnt ? Op_sys.Tid_wnt : Op_sys.Tid_lnx);
+ Gftest.Eq__obj_or_null(expd, Io_url_.New__http_or_null(raw));
+ Op_sys.Cur_(curTid);
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/core/htmls/tidy/Xoh_tidy_wkr_jtidy_tst.java b/400_xowa/src/gplx/xowa/htmls/core/htmls/tidy/Xoh_tidy_wkr_jtidy_tst.java
index 70f0f9938..b51e24708 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/htmls/tidy/Xoh_tidy_wkr_jtidy_tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/htmls/tidy/Xoh_tidy_wkr_jtidy_tst.java
@@ -1,6 +1,6 @@
/*
XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2017 gnosygnu@gmail.com
+Copyright (C) 2012-2020 gnosygnu@gmail.com
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
or alternatively under the terms of the Apache License Version 2.0.
@@ -13,51 +13,56 @@ 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.htmls.core.htmls.tidy; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.htmls.*;
-import gplx.core.envs.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import org.w3c.tidy.Tidy;
-import org.junit.*;
-public class Xoh_tidy_wkr_jtidy_tst {
- @Before public void init() {fxt.Clear();} private Jtidy_fxt fxt = new Jtidy_fxt();
- @Test public void Image_full() {
- String nl = Op_sys.Cur().Tid_is_wnt() ? "\r\n" : "\n"; // NOTE: JTidy uses different line-endings based on OS; DATE:2015-05-11
- fxt.Test_tidy("𐎍𐎁_𐎜", "ðð_ð" + nl);
- }
-}
-class Jtidy_fxt {
- public void Clear() {
- }
- public void Test_tidy(String raw, String expd) {
- Tidy tidy = new Tidy();
- tidy.setPrintBodyOnly(true);
- tidy.setWraplen(0);
- tidy.setQuiet(true);
- tidy.setShowWarnings(false);
- tidy.setShowErrors(0);
- ByteArrayInputStream rdr = null;
- try {
- rdr = new ByteArrayInputStream(raw.getBytes("UTF-8"));
- } catch (Exception e) {}
- ByteArrayOutputStream wtr = new ByteArrayOutputStream();
- tidy.parse(rdr, wtr);
- String actl = wtr.toString();
- Test_mgr.Eq_str(expd, actl);
- }
-}
-class Test_mgr {
- public static void Eq_str(String expd, String actl) {
-// byte[] expd_bry = Bry_.new_u8(expd);
-// byte[] actl_bry = Bry_.new_u8(actl);
-// int expd_len = expd_bry.length;
-// int actl_len = actl_bry.length;
-// if (expd_len != actl_len) throw new RuntimeException(String.format("expd != actl; expd:%s actl:%s", Int_.To_str(expd_len), Int_.To_str(actl_len)));
-// for (int i = 0; i < expd_len; ++i) {
-// byte expd_byte = expd_bry[i];
-// byte actl_byte = actl_bry[i];
-// if (expd_byte != actl_byte) throw new RuntimeException(String.format("expd != actl; %s expd:%s actl:%s", Int_.To_str(i), Byte_.To_str(expd_byte), Byte_.To_str(actl_byte)));
-// }
- if (!expd.equals(actl)) throw new RuntimeException(String.format("expd != actl; expd:%s actl:%s", expd, actl));
- }
-}
+package gplx.xowa.htmls.core.htmls.tidy;
+
+import gplx.core.envs.Op_sys;
+import org.junit.Before;
+import org.junit.Test;
+import org.w3c.tidy.Tidy;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class Xoh_tidy_wkr_jtidy_tst {
+ private Jtidy_fxt fxt = new Jtidy_fxt();
+ @Before public void init() {fxt.Clear();}
+ @Test public void Image_full() {
+ String nl = Op_sys.Cur().Tid_is_wnt() ? "\r\n" : "\n"; // NOTE: JTidy uses different line-endings based on OS; DATE:2015-05-11
+ fxt.Test_tidy("𐎍𐎁_𐎜", "ðð_ð" + nl);
+ }
+}
+class Jtidy_fxt {
+ public void Clear() {
+ }
+ public void Test_tidy(String raw, String expd) {
+ Tidy tidy = new Tidy();
+ tidy.setPrintBodyOnly(true);
+ tidy.setWraplen(0);
+ tidy.setQuiet(true);
+ tidy.setShowWarnings(false);
+ tidy.setShowErrors(0);
+ ByteArrayInputStream rdr = null;
+ try {
+ rdr = new ByteArrayInputStream(raw.getBytes("UTF-8"));
+ } catch (Exception e) {}
+ ByteArrayOutputStream wtr = new ByteArrayOutputStream();
+ tidy.parse(rdr, wtr);
+ String actl = wtr.toString();
+ Test_mgr.Eq_str(expd, actl);
+ }
+}
+class Test_mgr {
+ public static void Eq_str(String expd, String actl) {
+// byte[] expd_bry = Bry_.new_u8(expd);
+// byte[] actl_bry = Bry_.new_u8(actl);
+// int expd_len = expd_bry.length;
+// int actl_len = actl_bry.length;
+// if (expd_len != actl_len) throw new RuntimeException(String.format("expd != actl; expd:%s actl:%s", Int_.To_str(expd_len), Int_.To_str(actl_len)));
+// for (int i = 0; i < expd_len; ++i) {
+// byte expd_byte = expd_bry[i];
+// byte actl_byte = actl_bry[i];
+// if (expd_byte != actl_byte) throw new RuntimeException(String.format("expd != actl; %s expd:%s actl:%s", Int_.To_str(i), Byte_.To_str(expd_byte), Byte_.To_str(actl_byte)));
+// }
+ if (!expd.equals(actl)) throw new RuntimeException(String.format("expd != actl; expd:%s actl:%s", expd, actl));
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/tocs/Xoh_toc_make__basic__tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/tocs/Xoh_toc_make__basic__tst.java
index 6414511ad..5546dc5be 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/tocs/Xoh_toc_make__basic__tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/tocs/Xoh_toc_make__basic__tst.java
@@ -1,19 +1,21 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2017 gnosygnu@gmail.com
-
-XOWA is licensed under the terms of the General Public License (GPL) Version 3,
-or alternatively under the terms of the Apache License Version 2.0.
-
-You may use XOWA according to either of these licenses as is most appropriate
-for your project on a case-by-case basis.
-
-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.htmls.core.wkrs.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012-2017 gnosygnu@gmail.com
+
+XOWA is licensed under the terms of the General Public License (GPL) Version 3,
+or alternatively under the terms of the Apache License Version 2.0.
+
+You may use XOWA according to either of these licenses as is most appropriate
+for your project on a case-by-case basis.
+
+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.htmls.core.wkrs.tocs; import gplx.*;
+import gplx.core.envs.Op_sys;
+import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
import org.junit.*; import gplx.xowa.htmls.core.makes.tests.*; import gplx.xowa.parsers.lnkis.*;
public class Xoh_toc_make__basic__tst {
private final Xoh_make_fxt fxt = new Xoh_make_fxt();
@@ -51,6 +53,7 @@ public class Xoh_toc_make__basic__tst {
fxt.Test__make(orig, fxt.Page_chkr().Body_(expd));
}
@Test public void Disabled_if_drd() {
+ int curTid = Op_sys.Cur().Tid();
gplx.core.envs.Op_sys.Cur_(gplx.core.envs.Op_sys.Tid_drd);
String expd = String_.Concat_lines_nl_skip_last
( "abc"
@@ -62,5 +65,6 @@ public class Xoh_toc_make__basic__tst {
, "b 1"
);
fxt.Test__make(orig, fxt.Page_chkr().Body_(expd));
+ Op_sys.Cur_(curTid);
}
}
diff --git a/gplx.xowa.mediawiki/.classpath b/gplx.xowa.mediawiki/.classpath
deleted file mode 100644
index cb1ba271b..000000000
--- a/gplx.xowa.mediawiki/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/lib/hamcrest-core-1.3.jar differ