branch: master
commit 08ba593a8b8395463e8d7f8de19ad04bd3d720b9
Author: oleh <w...@mail.ua>
Commit: oleh <w...@mail.ua>
tiny.el: fixed `tiny-tokenize'
Added a bunch of tests as well.
---
tiny-test.el | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/tiny-test.el b/tiny-test.el
index fb64963..2350724 100644
--- a/tiny-test.el
+++ b/tiny-test.el
@@ -7,7 +7,7 @@ with point at the end of TXT."
(insert txt)
(apply fn args)))
-(ert-deftest tiny-mapconcat-parse-test ()
+(ert-deftest tiny-mapconcat-parse ()
(should (equal (with-text-value "m10" #'tiny-mapconcat-parse)
'(nil nil "10" nil nil)))
(should (equal (with-text-value "m5%x" #'tiny-mapconcat-parse)
@@ -37,9 +37,123 @@ with point at the end of TXT."
(should (equal (with-text-value "m\\n;; 10|%(+ x x) and %(* x x) and %s"
#'tiny-mapconcat-parse)
'(nil "\\n;; " "10" nil "%(+ x x) and %(* x x) and %s"))))
-(ert-deftest tiny-extract-sexps-test ()
+(ert-deftest tiny-extract-sexps ()
(should (equal (tiny-extract-sexps "expr1 %(+ x x), nothing %% char %c, hex
%x, and expr2 %(* x x), float %0.2f and sym %s")
'("expr1 %s, nothing %% char %c, hex %x, and expr2 %s, float
%0.2f and sym %s"
"(+ x x)" nil nil "(* x x)" nil nil))))
+(ert-deftest tiny-mapconcat ()
+ (should (equal (with-text-value "m10" (lambda()(eval (read
(tiny-mapconcat)))))
+ "0 1 2 3 4 5 6 7 8 9 10"))
+ (should (equal (with-text-value "m5 10" (lambda()(eval (read
(tiny-mapconcat)))))
+ "5 6 7 8 9 10"))
+ (should (equal (with-text-value "m5 10*xx" (lambda()(eval (read
(tiny-mapconcat)))))
+ "25 36 49 64 81 100"))
+ (should (equal (with-text-value "m5 10*xx%x" (lambda()(eval (read
(tiny-mapconcat)))))
+ "19 24 31 40 51 64"))
+ (should (equal (with-text-value "m5 10*xx|0x%x" (lambda()(eval (read
(tiny-mapconcat)))))
+ "0x19 0x24 0x31 0x40 0x51 0x64"))
+ (should (equal (with-text-value "m25+x?a%c" (lambda()(eval (read
(tiny-mapconcat)))))
+ "a b c d e f g h i j k l m n o p q r s t u v w x y z"))
+ (should (equal (with-text-value "m25+x?A%c" (lambda()(eval (read
(tiny-mapconcat)))))
+ "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"))
+ (should (equal (with-text-value "m97,122(string x)" (lambda()(eval (read
(tiny-mapconcat)))))
+ "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"))
+ (should (equal (with-text-value "m97,122stringxx" (lambda()(eval (read
(tiny-mapconcat)))))
+
"aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu,vv,ww,xx,yy,zz"))
+ (should (equal (with-text-value "m97,120stringxupcasex" (lambda()(eval (read
(tiny-mapconcat)))))
+
"aA,bB,cC,dD,eE,fF,gG,hH,iI,jJ,kK,lL,mM,nN,oO,pP,qQ,rR,sS,tT,uU,vV,wW,xX"))
+ (should (equal (with-text-value "m97,120stringxupcasex)x" (lambda()(eval
(read (tiny-mapconcat)))))
+
"aAa,bBb,cCc,dDd,eEe,fFf,gGg,hHh,iIi,jJj,kKk,lLl,mMm,nNn,oOo,pPp,qQq,rRr,sSs,tTt,uUu,vVv,wWw,xXx"))
+ (should (equal (with-text-value "m10|%(+ x x) and %(* x x) and %s"
(lambda()(eval (read (tiny-mapconcat)))))
+ "0 and 0 and 0 2 and 1 and 1 4 and 4 and 2 6 and 9 and 3 8
and 16 and 4 10 and 25 and 5 12 and 36 and 6 14 and 49 and 7 16 and 64 and 8 18
and 81 and 9 20 and 100 and 10"))
+ (should (equal (with-text-value "m10*2+3x" (lambda()(eval (read
(tiny-mapconcat)))))
+ "6 8 10 12 14 16 18 20 22 24 26"))
+ (should (equal (with-text-value "m10expx" (lambda()(eval (read
(tiny-mapconcat)))))
+ "1.0 2.718281828459045 7.38905609893065 20.085536923187668
54.598150033144236 148.4131591025766 403.4287934927351 1096.6331584284585
2980.9579870417283 8103.083927575384 22026.465794806718"))
+ (should (equal (with-text-value "m5 20expx%014.2f" (lambda()(eval (read
(tiny-mapconcat)))))
+ "00000000148.41 00000000403.43 00000001096.63 00000002980.96
00000008103.08 00000022026.47 00000059874.14 00000162754.79 00000442413.39
00001202604.28 00003269017.37 00008886110.52 00024154952.75 00065659969.14
00178482300.96 00485165195.41"))
+ (should (equal (with-text-value "m, 7|0x%02x" (lambda()(eval (read
(tiny-mapconcat)))))
+ "0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07"))
+ (should (equal (with-text-value "m1\\n14|*** TODO
http://emacsrocks.com/e%02d.html"; (lambda()(eval (read (tiny-mapconcat)))))
+ "*** TODO http://emacsrocks.com/e01.html
+*** TODO http://emacsrocks.com/e02.html
+*** TODO http://emacsrocks.com/e03.html
+*** TODO http://emacsrocks.com/e04.html
+*** TODO http://emacsrocks.com/e05.html
+*** TODO http://emacsrocks.com/e06.html
+*** TODO http://emacsrocks.com/e07.html
+*** TODO http://emacsrocks.com/e08.html
+*** TODO http://emacsrocks.com/e09.html
+*** TODO http://emacsrocks.com/e10.html
+*** TODO http://emacsrocks.com/e11.html
+*** TODO http://emacsrocks.com/e12.html
+*** TODO http://emacsrocks.com/e13.html
+*** TODO http://emacsrocks.com/e14.html";))
+ (should (equal (with-text-value "m1\\n10|convert img%s.jpg -monochrome
-resize 50%% -rotate 180 img%s_mono.pdf" (lambda()(eval (read
(tiny-mapconcat)))))
+ "convert img1.jpg -monochrome -resize 50% -rotate 180
img1_mono.pdf
+convert img2.jpg -monochrome -resize 50% -rotate 180 img2_mono.pdf
+convert img3.jpg -monochrome -resize 50% -rotate 180 img3_mono.pdf
+convert img4.jpg -monochrome -resize 50% -rotate 180 img4_mono.pdf
+convert img5.jpg -monochrome -resize 50% -rotate 180 img5_mono.pdf
+convert img6.jpg -monochrome -resize 50% -rotate 180 img6_mono.pdf
+convert img7.jpg -monochrome -resize 50% -rotate 180 img7_mono.pdf
+convert img8.jpg -monochrome -resize 50% -rotate 180 img8_mono.pdf
+convert img9.jpg -monochrome -resize 50% -rotate 180 img9_mono.pdf
+convert img10.jpg -monochrome -resize 50% -rotate 180 img10_mono.pdf"))
+ (should (equal (with-text-value "m\\n;; 16list*xxx)*xx%s:%s:%s"
(lambda()(eval (read (tiny-mapconcat)))))
+ "0:0:0
+;; 1:1:1
+;; 8:4:2
+;; 27:9:3
+;; 64:16:4
+;; 125:25:5
+;; 216:36:6
+;; 343:49:7
+;; 512:64:8
+;; 729:81:9
+;; 1000:100:10
+;; 1331:121:11
+;; 1728:144:12
+;; 2197:169:13
+;; 2744:196:14
+;; 3375:225:15
+;; 4096:256:16"))
+ (should (equal (with-text-value "m\\n8|**** TODO Learning from Data Week %(+
x 2)\\nSCHEDULED: <%(t-date \"Oct 7\" (* x 7))> DEADLINE: <%(t-date \"Oct 14\"
(* x 7))>" (lambda()(eval (read (tiny-mapconcat)))))
+ "**** TODO Learning from Data Week 2
+SCHEDULED: <2013-10-07 Mon> DEADLINE: <2013-10-14 Mon>
+**** TODO Learning from Data Week 3
+SCHEDULED: <2013-10-14 Mon> DEADLINE: <2013-10-21 Mon>
+**** TODO Learning from Data Week 4
+SCHEDULED: <2013-10-21 Mon> DEADLINE: <2013-10-28 Mon>
+**** TODO Learning from Data Week 5
+SCHEDULED: <2013-10-28 Mon> DEADLINE: <2013-11-04 Mon>
+**** TODO Learning from Data Week 6
+SCHEDULED: <2013-11-04 Mon> DEADLINE: <2013-11-11 Mon>
+**** TODO Learning from Data Week 7
+SCHEDULED: <2013-11-11 Mon> DEADLINE: <2013-11-18 Mon>
+**** TODO Learning from Data Week 8
+SCHEDULED: <2013-11-18 Mon> DEADLINE: <2013-11-25 Mon>
+**** TODO Learning from Data Week 9
+SCHEDULED: <2013-11-25 Mon> DEADLINE: <2013-12-02 Mon>
+**** TODO Learning from Data Week 10
+SCHEDULED: <2013-12-02 Mon> DEADLINE: <2013-12-09 Mon>"
+ )))
+
+(ert-deftest tiny-tokenize ()
+ (should (equal (tiny-tokenize "stringxx") "(string x x)"))
+ (should (equal (tiny-tokenize "*2+xxx") "(* 2 (+ x x x))"))
+ (should (equal (tiny-tokenize "*2+xxx") "(* 2 (+ x x x))"))
+ (should (equal (tiny-tokenize "*2+xx)x") "(* 2 (+ x x) x)"))
+ (should (equal (tiny-tokenize "string x") "(string x)"))
+ (should (equal (tiny-tokenize "(string x)") "(string x)"))
+ (should (equal (tiny-tokenize "string x)") "(string x)"))
+ (should (equal (tiny-tokenize "stringxupcasex)x") "(string x (upcase x)
x)"))
+ (should (equal (tiny-tokenize "(stringxupcasex)x") "(string x (upcase x)
x)"))
+ (should (equal (tiny-tokenize "(string xupcasex)x") "(string x (upcase x)
x)"))
+ (should (equal (tiny-tokenize "(string x upcasex)x") "(string x (upcase x)
x)"))
+ (should (equal (tiny-tokenize "(string x upcase x) x") "(string x (upcase
x) x)"))
+ (should (equal (tiny-tokenize "(string x (upcase x) x") "(string x (upcase
x) x)"))
+ (should (equal (tiny-tokenize "(string x (upcase x) x)") "(string x
(upcase x) x)")))
+
(provide 'tiny-test)
