1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

v2.10.3.1

This commit is contained in:
gnosygnu
2015-10-18 22:17:57 -04:00
parent 8e18af05b6
commit 4f43f51b18
1935 changed files with 12500 additions and 12889 deletions

View File

@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.ios; import gplx.*;
public class IoEngineFxt {
IoEngine EngineOf(Io_url url) {return IoEnginePool._.Get_by(url.Info().EngineKey());}
IoEngine EngineOf(Io_url url) {return IoEnginePool.Instance.Get_by(url.Info().EngineKey());}
public void tst_ExistsPaths(boolean expd, Io_url... ary) {
for (Io_url fil : ary) {
if (fil.Type_dir())

View File

@@ -38,7 +38,7 @@ public class IoEngine_fil_basic_memory_tst extends IoEngine_fil_basic_base {
fx.run_SaveFilText(fil, "text");
fx.tst_ExistsPaths(true, fil);
IoRecycleBin bin = IoRecycleBin._;
IoRecycleBin bin = IoRecycleBin.Instance;
List_adp list = Tfds.RscDir.XtoNames();
// foreach (String s in list)
// Tfds.Write(s);

View File

@@ -33,7 +33,7 @@ public class IoEngine_fil_basic_system_tst extends IoEngine_fil_basic_base {
fx.run_SaveFilText(fil, "text");
fx.tst_ExistsPaths(true, fil);
IoRecycleBin bin = IoRecycleBin._;
IoRecycleBin bin = IoRecycleBin.Instance;
List_adp list = root.XtoNames(); list.Del_at(0); // remove drive
IoEngine_xrg_recycleFil recycleXrg = bin.Send_xrg(fil)
.RootDirNames_(list)

View File

@@ -22,7 +22,7 @@ public class IoEngine_fil_xfer_memory_tst extends IoEngine_fil_xfer_base {
root = Io_url_.mem_dir_("mem");
} @Override protected IoEngine engine_() {return IoEngine_.Mem_init_();}
@Override protected Io_url AltRoot() {
Io_mgr.I.InitEngine_mem_("mem2");
Io_mgr.Instance.InitEngine_mem_("mem2");
return Io_url_.mem_dir_("mem2");
}
}

View File

@@ -21,9 +21,9 @@ public class IoEngine_stream_xfer_tst {
@Before public void setup() {
srcEngine = IoEngine_memory.new_("mock1");
trgEngine = IoEngine_memory.new_("mock2");
IoEnginePool._.Add_if_dupe_use_nth(srcEngine); IoEnginePool._.Add_if_dupe_use_nth(trgEngine);
IoUrlInfoRegy._.Reg(IoUrlInfo_.mem_("mem1/", srcEngine.Key()));
IoUrlInfoRegy._.Reg(IoUrlInfo_.mem_("mem2/", trgEngine.Key()));
IoEnginePool.Instance.Add_if_dupe_use_nth(srcEngine); IoEnginePool.Instance.Add_if_dupe_use_nth(trgEngine);
IoUrlInfoRegy.Instance.Reg(IoUrlInfo_.mem_("mem1/", srcEngine.Key()));
IoUrlInfoRegy.Instance.Reg(IoUrlInfo_.mem_("mem2/", trgEngine.Key()));
srcDir = Io_url_.mem_dir_("mem1/dir"); trgDir = Io_url_.mem_dir_("mem2/dir");
}
@Test public void TransferBetween() {

View File

@@ -58,7 +58,7 @@ public class IoEngine_xrg_queryDir_tst {
Io_url[] save_text_(Io_url... ary) {
for (Io_url url : ary)
Io_mgr.I.SaveFilStr(url, url.Raw());
Io_mgr.Instance.SaveFilStr(url, url.Raw());
return ary;
}
void tst_ExecPathAry(IoEngine_xrg_queryDir finder, Io_url... expd) {Tfds.Eq_ary(expd, finder.ExecAsUrlAry());}

View File

@@ -19,29 +19,29 @@ package gplx.stores; import gplx.*;
import org.junit.*;
public class GfoNdeRdr_read_tst {
@Test public void ReadInt() {
rdr = rdr_(IntClassXtn._, "id", 1);
rdr = rdr_(IntClassXtn.Instance, "id", 1);
Tfds.Eq(rdr.ReadInt("id"), 1);
}
@Test public void ReadIntOr() {
rdr = rdr_(IntClassXtn._, "id", 1);
rdr = rdr_(IntClassXtn.Instance, "id", 1);
Tfds.Eq(rdr.ReadIntOr("id", -1), 1);
}
@Test public void ReadIntElse_minus1() {
rdr = rdr_(IntClassXtn._, "id", null);
rdr = rdr_(IntClassXtn.Instance, "id", null);
Tfds.Eq(rdr.ReadIntOr("id", -1), -1);
}
@Test public void ReadInt_parse() {
rdr = rdr_(StringClassXtn._, "id", "1");
rdr = rdr_(StringClassXtn.Instance, "id", "1");
Tfds.Eq(rdr.ReadInt("id"), 1);
}
@Test public void ReadIntElse_parse() {
rdr = rdr_(StringClassXtn._, "id", "2");
rdr = rdr_(StringClassXtn.Instance, "id", "2");
Tfds.Eq(rdr.ReadIntOr("id", -1), 2);
}
GfoNdeRdr rdr_(ClassXtn type, String key, Object val) { // makes rdr with one row and one val
GfoFldList flds = GfoFldList_.new_().Add(key, type);
GfoNde row = GfoNde_.vals_(flds, new Object[] {val});
boolean parse = type == StringClassXtn._; // assumes type is either StringClassXtn or IntClassXtn
boolean parse = type == StringClassXtn.Instance; // assumes type is either StringClassXtn or IntClassXtn
return GfoNdeRdr_.leaf_(row, parse);
}
GfoNdeRdr rdr;