Skip to content

Commit b7268c6

Browse files
mosbthmosbth
committed
aligning with js1, adding inspect kmom01 - 04
1 parent 7fa89c2 commit b7268c6

3 files changed

Lines changed: 222 additions & 2 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ History
4646

4747
v1.0.x (latest)
4848

49+
* Inspect javascript1 kmom01 - 04 added.
4950
* Inspect `plane.py` failed when windows style line endings.
5051
* Updated `bin/dbwebb` to version v1.0.12 with first version of dbwebb-inspect.
5152
* Updated example `example/ping`.

‎bin/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ History
2929

3030
v1.0.x (latest)
3131

32+
* Inspect javascript1 kmom01 - 04 added.
3233
* Inspect plane.py failed when windows style line endings.
3334

3435

‎bin/dbwebb-inspect‎

Lines changed: 220 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ checkEnvironment()
6666
fi
6767

6868
dirname="$THEDIR"
69-
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable."
69+
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable.\nPerhaps login to the studserver and execute the command:\nsudo setpre-dbwebb-kurser.bash studID"
7070
}
7171

7272

@@ -195,7 +195,7 @@ pythonmarvin2()
195195
target="$1"
196196

197197
dirname="$THEDIR/$target"
198-
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable.\nPerhaps login to the studserver and execute the command:\nsudo setpre-dbwebb-kurser.bash studID"
198+
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable."
199199

200200
filename="$THEDIR/$target/marvin.py"
201201
assert 0 "test -r $filename -a -f $filename" "The file marvin.py is missing."
@@ -323,6 +323,224 @@ pythonkmom04()
323323

324324

325325

326+
#
327+
# Test javascript1 me
328+
#
329+
javascript1me()
330+
{
331+
$ECHO "\n\n-----------------------------------------"
332+
$ECHO "\n----------- me-page ---------------------"
333+
$ECHO "\n-----------------------------------------"
334+
335+
filename="$THEDIR/me/me.html"
336+
assert 0 "test -r $filename -a -f $filename" "Me file is not readable. $filename"
337+
338+
url="$SERVERURL/~$THEUSER/$BASEDIR/$PROJECT"
339+
$ECHO "\nLink to me-page: $url/me/me.html"
340+
341+
filename="$THEDIR/me/redovisning.html"
342+
assert 0 "test -r $filename -a -f $filename" "Redovisning file is not readable. $filename"
343+
344+
url="$SERVERURL/~$THEUSER/$BASEDIR/$PROJECT"
345+
$ECHO "\nLink to redovisning-page: $url/me/redovisning.html"
346+
347+
$ECHO "\nPress enter to continue..."
348+
read void
349+
}
350+
351+
352+
353+
#
354+
# Test javascript1 sandbox
355+
#
356+
javascript1sandbox()
357+
{
358+
$ECHO "\n\n-----------------------------------------"
359+
$ECHO "\n----------- sandbox ---------------------"
360+
$ECHO "\n-----------------------------------------"
361+
362+
target="$1"
363+
364+
dirname="$THEDIR/$target"
365+
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable."
366+
367+
filename="$THEDIR/$target/index.html"
368+
assert 0 "test -r $filename -a -f $filename" "Index file is not readable. $filename"
369+
370+
url="$SERVERURL/~$THEUSER/$BASEDIR/$PROJECT/$target"
371+
$ECHO "\nLink to lab-page: $url"
372+
373+
$ECHO "\nPress enter to continue..."
374+
read void
375+
}
376+
377+
378+
379+
#
380+
# Test javascript1 flag
381+
#
382+
javascript1flag()
383+
{
384+
$ECHO "\n\n-----------------------------------------"
385+
$ECHO "\n----------- flag ---------------------"
386+
$ECHO "\n-----------------------------------------"
387+
388+
target="$1"
389+
390+
dirname="$THEDIR/$target"
391+
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable."
392+
393+
filename="$THEDIR/$target/index.html"
394+
assert 0 "test -r $filename -a -f $filename" "Index file is not readable. $filename"
395+
396+
url="$SERVERURL/~$THEUSER/$BASEDIR/$PROJECT/$target"
397+
$ECHO "\nLink to lab-page: $url"
398+
399+
$ECHO "\nPress enter to continue..."
400+
read void
401+
}
402+
403+
404+
405+
#
406+
# Test javascript1 baddie
407+
#
408+
javascript1baddie()
409+
{
410+
$ECHO "\n\n-----------------------------------------"
411+
$ECHO "\n----------- baddie ---------------------"
412+
$ECHO "\n-----------------------------------------"
413+
414+
target="$1"
415+
416+
dirname="$THEDIR/$target"
417+
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable."
418+
419+
filename="$THEDIR/$target/index.html"
420+
assert 0 "test -r $filename -a -f $filename" "Index file is not readable. $filename"
421+
422+
url="$SERVERURL/~$THEUSER/$BASEDIR/$PROJECT/$target"
423+
$ECHO "\nLink to lab-page: $url"
424+
425+
$ECHO "\nPress enter to continue..."
426+
read void
427+
}
428+
429+
430+
431+
#
432+
# Test javascript1 lab
433+
#
434+
javascript1lab()
435+
{
436+
$ECHO "\n\n-----------------------------------------"
437+
$ECHO "\n----------- lab ----------------"
438+
$ECHO "\n-----------------------------------------"
439+
440+
target="$1"
441+
442+
dirname="$THEDIR/$target"
443+
assert 0 "test -r $dirname -a -d $dirname" "Directory $dirname not readable."
444+
445+
filename="$THEDIR/$target/answer.html"
446+
assert 0 "test -r $filename -a -f $filename" "Answer file is not readable. $filename"
447+
448+
url="$SERVERURL/~$THEUSER/$BASEDIR/$PROJECT/$target"
449+
$ECHO "\nLink to lab-page: $url/answer.html"
450+
451+
$ECHO "\nPress enter to continue..."
452+
read void
453+
}
454+
455+
456+
457+
#
458+
# Test javascript1 kmom01
459+
#
460+
javascript1kmom01()
461+
{
462+
$ECHO "\n\n-----------------------------------------"
463+
$ECHO "\n----------- javascript1 kmom01 ------------"
464+
$ECHO "\n-----------------------------------------"
465+
466+
THEKMOM="kmom01"
467+
THETARGET="me/$THEKMOM"
468+
469+
checkKmomDir "$THETARGET"
470+
validateKmom "$THEKMOM"
471+
javascript1me
472+
javascript1sandbox "$THETARGET/sandbox"
473+
}
474+
475+
476+
477+
#
478+
# Test javascript1 kmom02
479+
#
480+
javascript1kmom02()
481+
{
482+
$ECHO "\n\n-----------------------------------------"
483+
$ECHO "\n----------- javascript1 kmom02 ------------"
484+
$ECHO "\n-----------------------------------------"
485+
486+
THEKMOM="kmom02"
487+
THETARGET="me/$THEKMOM"
488+
489+
checkKmomDir "$THETARGET"
490+
validateKmom "$THEKMOM"
491+
javascript1me
492+
javascript1lab "$THETARGET/lab1"
493+
javascript1flag "$THETARGET/flag1"
494+
javascript1baddie "$THETARGET/baddie1"
495+
}
496+
497+
498+
499+
#
500+
# Test javascript1 kmom03
501+
#
502+
javascript1kmom03()
503+
{
504+
$ECHO "\n\n-----------------------------------------"
505+
$ECHO "\n----------- javascript1 kmom03 ------------"
506+
$ECHO "\n-----------------------------------------"
507+
508+
THEKMOM="kmom03"
509+
THETARGET="me/$THEKMOM"
510+
511+
checkKmomDir "$THETARGET"
512+
validateKmom "$THEKMOM"
513+
javascript1me
514+
javascript1lab "$THETARGET/lab2"
515+
javascript1flag "$THETARGET/flag2"
516+
javascript1baddie "$THETARGET/baddie2"
517+
}
518+
519+
520+
521+
#
522+
# Test javascript1 kmom04
523+
#
524+
javascript1kmom04()
525+
{
526+
$ECHO "\n\n-----------------------------------------"
527+
$ECHO "\n----------- javascript1 kmom04 ------------"
528+
$ECHO "\n-----------------------------------------"
529+
530+
THEKMOM="kmom04"
531+
THETARGET="me/$THEKMOM"
532+
533+
checkKmomDir "$THETARGET"
534+
validateKmom "$THEKMOM"
535+
javascript1me
536+
javascript1lab "$THETARGET/lab3"
537+
javascript1lab "$THETARGET/lab4"
538+
javascript1flag "$THETARGET/flag3"
539+
javascript1baddie "$THETARGET/baddie3"
540+
}
541+
542+
543+
326544
# javascript1)
327545
# FILES="me.html redovisning.html"
328546
# KMOM01="kmom01 kmom01/sandbox"

0 commit comments

Comments
 (0)