moved/fixed tests

7 files changed, 209 insertions, 1 deletions

diff --git a/test/dirsize_benchmark.py b/test/stuff/dirsize_benchmark.py
index 5784ee80..5784ee80 100644
--- a/test/dirsize_benchmark.py
+++ b/test/stuff/dirsize_benchmark.py
diff --git a/test/stuff/test1.py b/test/stuff/test1.py
new file mode 100644
index 00000000..97505c41
--- /dev/null
+++ b/test/stuff/test1.py
@@ -0,0 +1,70 @@
+#!/usr/bin/python3
+# coding=utf-8
+# some tests with curses, threads and unicode
+import os
+import curses
+import time
+import threading
+import locale
+import _thread
+
+lock = _thread.allocate_lock()
+
+locale.setlocale(locale.LC_ALL, 'en_US.utf8')
+
+blocked = False
+stringy = 'るでか'
+stdscr = curses.initscr()
+
+curses.noecho()
+curses.cbreak()
+curses.halfdelay(3)
+stdscr.keypad(1)
+#curses.curs_set(0)
+
+stdscr.addstr(4, 0, stringy)
+stdscr.refresh()
+
+class ThreadTest(threading.Thread):
+	def __init__(self, *a, **b):
+		threading.Thread.__init__(self, *a, **b)
+		self.killed = False
+
+	def run(self):
+		global stdscr
+		global blocked
+		for i in range(1,50):
+			while blocked: time.sleep(0.1)
+			blocked = True
+			stdscr.addstr(1, 0, str(i))
+			stdscr.refresh()
+			blocked = False
+			time.sleep(0.1)
+			if self.killed: raise SystemExit()
+
+	def kill(self):
+		self.killed = True
+
+thr = ThreadTest()
+thr.start()
+
+try:
+	while 1:
+		c = stdscr.getch()
+		if c == ord('q'): raise
+		while blocked: time.sleep(0.1)
+		blocked = True
+		stdscr.addstr(0, 0, str(c))
+		stdscr.refresh()
+		blocked = False
+
+except Exception:
+	thr.kill()
+	raise
+finally:
+	curses.nocbreak()
+	stdscr.keypad(1)
+	curses.echo()
+	curses.endwin()
+#	curses.curs_set(1)
+
diff --git a/test/stuff/test2.py b/test/stuff/test2.py
new file mode 100644
index 00000000..21c5a5f9
--- /dev/null
+++ b/test/stuff/test2.py
@@ -0,0 +1,7 @@
+from code import cli
+import signal
+
+with cli.lock:
+	with cli.lock:
+		print("this will be delayed forever")
+	print("hi!")
diff --git a/test/stuff/test3.py b/test/stuff/test3.py
new file mode 100644
index 00000000..3b1986b7
--- /dev/null
+++ b/test/stuff/test3.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+# coding=utf-8
+# some tests with curses, threads and unicode
+import os
+import curses
+import time
+import locale
+
+lock = _thread.allocate_lock()
+
+locale.setlocale(locale.LC_ALL, 'en_US.utf8')
+
+blocked = False
+stringy = 'るでか'
+stdscr = curses.initscr()
+#win1 = curses.newwin(
+
+curses.noecho()
+curses.cbreak()
+curses.halfdelay(3)
+stdscr.keypad(1)
+#curses.curs_set(0)
+
+stdscr.addstr(4, 0, stringy)
+stdscr.refresh()
+
+class ThreadTest(threading.Thread):
+	def __init__(self, *a, **b):
+		threading.Thread.__init__(self, *a, **b)
+		self.killed = False
+
+	def run(self):
+		global stdscr
+		global blocked
+		for i in range(1,50):
+			while blocked: time.sleep(0.1)
+			blocked = True
+			stdscr.addstr(1, 0, str(i))
+			stdscr.refresh()
+			blocked = False
+			time.sleep(0.1)
+			if self.killed: raise SystemExit()
+
+	def kill(self):
+		self.killed = True
+
+thr = ThreadTest()
+thr.start()
+
+try:
+	while 1:
+		c = stdscr.getch()
+		if c == ord('q'): raise
+		while blocked: time.sleep(0.1)
+		blocked = True
+		stdscr.addstr(0, 0, str(c))
+		stdscr.refresh()
+		blocked = False
+
+except Exception:
+	thr.kill()
+	raise
+finally:
+	curses.nocbreak()
+	stdscr.keypad(1)
+	curses.echo()
+	curses.endwin()
+#	curses.curs_set(1)
+
diff --git a/test/stuff/test4.py b/test/stuff/test4.py
new file mode 100644
index 00000000..b2390a03
--- /dev/null
+++ b/test/stuff/test4.py
@@ -0,0 +1,36 @@
+import random, time
+
+class DelValue():
+	def a(d):
+		return dict((k, v) for k, v in d.items() if v is not 0)
+
+	def b(d):
+		for k, v in d.copy().items():
+			if v == 0: del d[k]
+		return d
+
+	def c(d):
+		for k in tuple(d.keys()):
+			if d[k] == 0: del d[k]
+		return d
+
+	def d(d):
+		for k, v in tuple(d.items()):
+			if v == 0: del d[k]
+		return d
+
+
+basedict = {}
+for i in range(200):
+	basedict[i] = random.randint(0, 1)
+
+expected = DelValue.a(basedict.copy())
+
+for algo in ['a', 'b', 'c', 'd']:
+	copy = basedict.copy()
+	t = time.time()
+	for i in range(100):
+		assert DelValue.__dict__[algo](copy) == expected
+	print("algorithm %s: %f" % (algo, time.time() - t))
+
+# c it is, although b is faster with smaller dictionaries
diff --git a/test/stuff/test5.py b/test/stuff/test5.py
new file mode 100644
index 00000000..682a716f
--- /dev/null
+++ b/test/stuff/test5.py
@@ -0,0 +1,26 @@
+class A:
+	def foo(self, x):
+		y = x + 1
+		print(y)
+		return y
+
+	@staticmethod
+	def zar():
+		print("l o l")
+
+class B(A):
+	def bar(self, x):
+		y = self.foo(x) + 3
+		print(y)
+		return y
+
+class C():
+	def foo(self, x):
+		y = x - 1
+		print(y)
+		return y
+
+a = C()
+A.foo(a, 5)
+
+B.zar()
diff --git a/test/tc_history.py b/test/tc_history.py
index 3e5adcff..e78af0aa 100644
--- a/test/tc_history.py
+++ b/test/tc_history.py
@@ -3,7 +3,7 @@ if __name__ == '__main__':
 	import sys
 	sys.path.append(abspath(join(sys.path[0], '..')))
 
-from ranger.history import History
+from ranger.container import History
 from unittest import TestCase, main
 import unittest