From 1cde843264bec6cf7fe18bd61d4bd3e48faf083b Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Fri, 26 Apr 2019 22:24:44 -0400 Subject: [PATCH] Project: Rename test classes for xowa_maven script --- 100_core/src/gplx/Gfo_usr_dlg_.java | 2 +- 100_core/src/gplx/Gfo_usr_dlg__gui_.java | 2 +- ..._usr_dlg__gui_test.java => Gfo_usr_dlg__gui_mock.java} | 2 +- 400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java | 8 ++++---- 400_xowa/src/gplx/xowa/Xop_fxt.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename 100_core/src/gplx/{Gfo_usr_dlg__gui_test.java => Gfo_usr_dlg__gui_mock.java} (94%) diff --git a/100_core/src/gplx/Gfo_usr_dlg_.java b/100_core/src/gplx/Gfo_usr_dlg_.java index 4934fd343..3a193bf33 100644 --- a/100_core/src/gplx/Gfo_usr_dlg_.java +++ b/100_core/src/gplx/Gfo_usr_dlg_.java @@ -27,7 +27,7 @@ public class Gfo_usr_dlg_ { } public static String Test__list__term__get_1st() { Instance = Noop; - String[] rv = ((Gfo_usr_dlg__gui_test)test__list.Gui_wkr()).Warns().To_str_ary_and_clear(); + String[] rv = ((Gfo_usr_dlg__gui_mock)test__list.Gui_wkr()).Warns().To_str_ary_and_clear(); return rv.length == 0 ? "" : rv[0]; } public static void Test__show__init() { diff --git a/100_core/src/gplx/Gfo_usr_dlg__gui_.java b/100_core/src/gplx/Gfo_usr_dlg__gui_.java index 5b32428fa..046e0d93c 100644 --- a/100_core/src/gplx/Gfo_usr_dlg__gui_.java +++ b/100_core/src/gplx/Gfo_usr_dlg__gui_.java @@ -18,7 +18,7 @@ import gplx.core.consoles.*; import gplx.core.lists.rings.*; public class Gfo_usr_dlg__gui_ { public static final Gfo_usr_dlg__gui Noop = new Gfo_usr_dlg__gui_noop(); public static final Gfo_usr_dlg__gui Console = new Gfo_usr_dlg__gui_console(); - public static final Gfo_usr_dlg__gui Test = new Gfo_usr_dlg__gui_test(); + public static final Gfo_usr_dlg__gui Test = new Gfo_usr_dlg__gui_mock(); public static final Gfo_usr_dlg__gui Mem = new Gfo_usr_dlg__gui_mem_string(); public static String Mem_file() {return ((Gfo_usr_dlg__gui_mem_string)Mem).file;} } diff --git a/100_core/src/gplx/Gfo_usr_dlg__gui_test.java b/100_core/src/gplx/Gfo_usr_dlg__gui_mock.java similarity index 94% rename from 100_core/src/gplx/Gfo_usr_dlg__gui_test.java rename to 100_core/src/gplx/Gfo_usr_dlg__gui_mock.java index e5c84763a..e32bece3f 100644 --- a/100_core/src/gplx/Gfo_usr_dlg__gui_test.java +++ b/100_core/src/gplx/Gfo_usr_dlg__gui_mock.java @@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx; import gplx.core.lists.rings.*; -public class Gfo_usr_dlg__gui_test implements Gfo_usr_dlg__gui { +public class Gfo_usr_dlg__gui_mock implements Gfo_usr_dlg__gui { public List_adp Warns() {return warns;} private final List_adp warns = List_adp_.New(); public List_adp Msgs() {return msgs;} private final List_adp msgs = List_adp_.New(); public Ring__string Prog_msgs() {return ring;} private final Ring__string ring = new Ring__string().Max_(0); diff --git a/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java b/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java index 8d1b2b8fe..6ece9f442 100644 --- a/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java +++ b/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java @@ -16,7 +16,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.core.consoles; import gplx.*; import gplx.core.*; import org.junit.*; import gplx.core.tests.*; import gplx.core.envs.*; public class Gfo_cmd_arg_mgr_tst { - @Before public void init() {fxt.Clear();} private final Gfo_cmd_arg_mgr_fxt fxt = new Gfo_cmd_arg_mgr_fxt(); + @Before public void init() {fxt.Clear();} private final Gfo_cmd_arg_mgr_fxt fxt = new Gfo_cmd_arg_mgr_fxt(); @Test public void Val__many() { fxt.Init_args(fxt.Make_arg("a"), fxt.Make_arg("b")); fxt.Exec_process("--a", "0", "--b", "1"); @@ -67,9 +67,9 @@ public class Gfo_cmd_arg_mgr_tst { } } class Gfo_cmd_arg_mgr_fxt { - private final Tst_mgr tst_mgr = new Tst_mgr(); + private final Tst_mgr tst_mgr = new Tst_mgr(); public Gfo_usr_dlg Usr_dlg() {return usr_dlg;} Gfo_usr_dlg usr_dlg; - public Gfo_cmd_arg_mgr Mgr() {return mgr;} private final Gfo_cmd_arg_mgr mgr = new Gfo_cmd_arg_mgr(); + public Gfo_cmd_arg_mgr Mgr() {return mgr;} private final Gfo_cmd_arg_mgr mgr = new Gfo_cmd_arg_mgr(); public Gfo_cmd_arg_mgr_fxt Clear() { if (usr_dlg == null) usr_dlg = Gfo_usr_dlg_.Test(); @@ -100,7 +100,7 @@ class Gfo_cmd_arg_mgr_fxt { return this; } public Gfo_cmd_arg_mgr_fxt Test_write(String... expd) { - Tfds.Eq_ary_str(expd, ((Gfo_usr_dlg__gui_test)usr_dlg.Gui_wkr()).Msgs().To_str_ary_and_clear()); + Tfds.Eq_ary_str(expd, ((Gfo_usr_dlg__gui_mock)usr_dlg.Gui_wkr()).Msgs().To_str_ary_and_clear()); return this; } public void Test_val_as_url_rel_dir_or(String root_dir, String dir_spr, String val, String expd) { diff --git a/400_xowa/src/gplx/xowa/Xop_fxt.java b/400_xowa/src/gplx/xowa/Xop_fxt.java index 31cd8ab1b..3ba0e03ca 100644 --- a/400_xowa/src/gplx/xowa/Xop_fxt.java +++ b/400_xowa/src/gplx/xowa/Xop_fxt.java @@ -343,7 +343,7 @@ public class Xop_fxt { } public void tst_Warn(String... expd) { Gfo_usr_dlg usr_dlg = app.Usr_dlg(); - Gfo_usr_dlg__gui_test ui_wkr = (Gfo_usr_dlg__gui_test)usr_dlg.Gui_wkr(); + Gfo_usr_dlg__gui_mock ui_wkr = (Gfo_usr_dlg__gui_mock)usr_dlg.Gui_wkr(); String[] actl = ui_wkr.Warns().To_str_ary(); Tfds.Eq_ary_str(expd, actl); }