Skip to content

Commit d91c0d4

Browse files
AndreasArneAndreasArne
committed
updated folder structure and validation
1 parent 319fa88 commit d91c0d4

2 files changed

Lines changed: 40 additions & 34 deletions

File tree

‎.dbwebb.map‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ me/kmom03/functions
2222
# kmom04
2323
me/kmom04/lab4
2424
me/kmom04/marvin3
25-
me/kmom04/list
25+
me/kmom04/modules
2626
me/kmom04/file
2727

2828
# kmom05
2929
me/kmom05/lab5
30-
me/kmom05/analyzer
31-
me/kmom05/argparse
32-
me/kmom05/warehouse
30+
me/kmom05/list
31+
me/kmom05/file
3332
me/kmom05/marvin4
3433

3534
# kmom06
36-
me/kmom06/analyzer2
37-
me/kmom06/external
35+
me/kmom06/lab6
36+
me/kmom06/analyzer
37+
me/kmom06/warehouse
3838

3939
# kmom10
40-
me/kmom10/adventure
40+
me/kmom10/exam
4141

4242
# redovisa
4343
me/redovisa

‎.dbwebb.tests‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dbwebb validate lab1
2020

2121
# hello
2222
test -d me/kmom01/hello
23-
cp example/hello/hello.py me/kmom01/hello
23+
cp -i example/hello/hello.py me/kmom01/hello
2424
cd me/kmom01/hello && python3 hello.py
2525
dbwebb validate hello
2626

@@ -29,14 +29,14 @@ dbwebb validate hello
2929
# plane
3030
test -d me/kmom01/plane
3131
#cd me/kmom01/ && cp -i hello/hello.py plane/plane.py && cd plane
32-
cd me/kmom01/ && cp hello/hello.py plane/plane.py
32+
cd me/kmom01/ && cp -i hello/hello.py plane/plane.py
3333
dbwebb validate plane
3434

3535

3636

3737
# redovisa
3838
test -d me/redovisa
39-
cp -r example/redovisa/* me/redovisa
39+
cp -ri example/redovisa/* me/redovisa
4040
dbwebb validate redovisa
4141

4242

@@ -90,22 +90,21 @@ cd me/kmom04 && dbwebb recreate lab4
9090
cd me/kmom04/lab4 && python3 answer.py; [[ $? = 42 ]]
9191
dbwebb validate lab4
9292

93-
94-
9593
# marvin3
9694
test -d me/kmom04/marvin3
9795
cd me && cp -ri kmom03/marvin2/main.py kmom04/marvin3/ && cd kmom04/marvin3
96+
cd me && cp -i ../example/marvin/quotes_lgtg.txt kmom04/marvin3/quotes.txt
9897
dbwebb validate marvin3
9998

100-
test -d me/kmom04/list
101-
dbwebb validate me/kmom04/list
99+
# modules
100+
test -d me/kmom04/modules
101+
dbwebb validate me/kmom04/modules
102102

103+
# file
103104
test -d me/kmom04/file
105+
cd me && cp ../example/file/string/items.txt kmom04/file
104106
dbwebb validate me/kmom04/file
105107

106-
107-
108-
109108
# --------------------------------------------------------------------------
110109
#
111110
# Kmom05
@@ -116,35 +115,42 @@ cd me/kmom05 && dbwebb recreate lab5
116115
cd me/kmom05/lab5 && python3 answer.py; [[ $? = 42 ]]
117116
dbwebb validate lab5
118117

119-
# argparse
120-
test -d me/kmom05/argparse
121-
cp -ri example/argparse/* me/kmom05/argparse/
122-
dbwebb validate argparse
118+
# marvin4
119+
test -d me/kmom05/marvin4
120+
cd me && cp -ri kmom04/marvin3/*.py kmom05/marvin4 && cd kmom05/marvin4
121+
dbwebb validate marvin4
123122

124-
# analyzer
125-
test -d me/kmom05/analyzer
126-
cd me/kmom05 && cp -ri argparse/*.py analyzer/
127-
cd me/kmom05 && cp -ri ../../example/text/phil.txt analyzer/ && cd analyzer/
128-
dbwebb validate analyzer
123+
# list
124+
test -d me/kmom05/list
129125

130-
test -d me/kmom05/warehouse
131-
dbwebb validate warehouse
126+
# file
127+
test -d me/kmom05/file
128+
cd me && cp -i ../example/file/string/items.txt kmom05/file
129+
dbwebb validate me/kmom05/file
132130

133131
# --------------------------------------------------------------------------
134132
#
135133
# Kmom06
136134
#
137135

138-
# external
139-
test -d me/kmom06/external
136+
# lab6
137+
cd me/kmom06 && dbwebb recreate lab6
138+
cd me/kmom06/lab6 && python3 answer.py; [[ $? = 42 ]]
139+
dbwebb validate lab6
140140

141-
# analyzer2
142-
test -d me/kmom06/analyzer2
143-
cd me/ && cp -ri kmom05/analyzer/{*.py,*.txt} kmom06/analyzer2/
144-
dbwebb validate analyzer2
145141

142+
# dict/tuple
143+
test -d me/kmom06/warehouse
144+
145+
# analyzer
146+
test -d me/kmom06/analyzer
147+
cd me && cp -i ../example/text/phil.txt kmom06/analyzer/ && cd kmom06/analyzer/
148+
dbwebb validate analyzer
146149

147150
# --------------------------------------------------------------------------
148151
#
149152
# Kmom10
150153
#
154+
155+
# exam
156+
test -d me/kmom10/exam

0 commit comments

Comments
 (0)