Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CoTA
cota-backend
Commits
acd8c826
Commit
acd8c826
authored
1 year ago
by
Lückemeyer
Browse files
Options
Download
Email Patches
Plain Diff
removed dtt remnants
parent
d1fab229
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/main/java/de/hftstuttgart/dtabackend/rest/v1/task/TaskUpload.java
+2
-2
...a/de/hftstuttgart/dtabackend/rest/v1/task/TaskUpload.java
src/main/java/de/hftstuttgart/dtabackend/rest/v1/unittest/UnitTestUpload.java
+131
-131
...stuttgart/dtabackend/rest/v1/unittest/UnitTestUpload.java
src/main/java/de/hftstuttgart/dtabackend/utils/RegexUtil.java
+78
-78
...main/java/de/hftstuttgart/dtabackend/utils/RegexUtil.java
src/main/java/de/hftstuttgart/dtabackend/utils/UnifiedTicketingUtil.java
+288
-288
...e/hftstuttgart/dtabackend/utils/UnifiedTicketingUtil.java
src/main/resources/application.properties
+1
-1
src/main/resources/application.properties
with
500 additions
and
500 deletions
+500
-500
src/main/java/de/hftstuttgart/dtabackend/rest/v1/task/TaskUpload.java
+
2
-
2
View file @
acd8c826
...
...
@@ -52,7 +52,7 @@ public class TaskUpload {
LOG
.
info
(
"submission for testing received"
);
LOG
.
debug
(
"creating new temporary directory"
);
Path
workDirectory
=
Files
.
createTempDirectory
(
testTmpPath
,
"dt
t
"
);
Path
workDirectory
=
Files
.
createTempDirectory
(
testTmpPath
,
"dt
a
"
);
LOG
.
debug
(
String
.
format
(
"working dir for test is: %s"
,
workDirectory
.
toAbsolutePath
().
toString
()));
// define paths for the test, the submission and where the result is to be expected afterwards
...
...
@@ -61,7 +61,7 @@ public class TaskUpload {
String
mimeInfo
=
new
Tika
().
detect
(
taskFileRef
.
getInputStream
());
switch
(
mimeInfo
)
{
case
"text/plain"
:
LOG
.
debug
(
"textfile uploaded, searching for dt
t
config"
);
LOG
.
debug
(
"textfile uploaded, searching for dt
a
config"
);
// find URI in config file
Matcher
config
=
RegexUtil
.
findStudentConfig
(
taskFileRef
.
getInputStream
());
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/hftstuttgart/dtabackend/rest/v1/unittest/UnitTestUpload.java
+
131
-
131
View file @
acd8c826
...
...
@@ -79,7 +79,7 @@ public class UnitTestUpload {
while
(
config
==
null
&&
(
line
=
br
.
readLine
())
!=
null
)
{
Matcher
matcher
=
pattern
.
matcher
(
line
);
if
(
matcher
.
matches
())
{
LOG
.
debug
(
String
.
format
(
"found dt
t
test line: %s"
,
line
));
LOG
.
debug
(
String
.
format
(
"found dt
a
test line: %s"
,
line
));
config
=
matcher
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/hftstuttgart/dtabackend/utils/RegexUtil.java
+
78
-
78
View file @
acd8c826
...
...
@@ -59,7 +59,7 @@ public class RegexUtil {
while
(
config
==
null
&&
(
line
=
br
.
readLine
())
!=
null
)
{
Matcher
matcher
=
pattern
.
matcher
(
line
);
if
(
matcher
.
matches
())
{
LOG
.
debug
(
String
.
format
(
"found dt
t
line: %s"
,
line
));
LOG
.
debug
(
String
.
format
(
"found dt
a
line: %s"
,
line
));
config
=
matcher
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/hftstuttgart/dtabackend/utils/UnifiedTicketingUtil.java
+
288
-
288
View file @
acd8c826
...
...
@@ -26,7 +26,7 @@ public class UnifiedTicketingUtil {
private
final
static
Logger
LOG
=
LogManager
.
getLogger
(
UnifiedTicketingUtil
.
class
);
private
final
static
String
LABEL
=
"DT
T
created"
;
private
final
static
String
LABEL
=
"DT
A
created"
;
private
final
static
String
TITLE
=
" | "
+
LABEL
;
public
static
String
createTicketDescriptionFromResult
(
TicketSystem
ts
,
Result
result
,
boolean
compilationError
)
{
...
...
@@ -114,7 +114,7 @@ public class UnifiedTicketingUtil {
// depending on label support, identify tickets by label or title containing string
if
(
ts
.
hasLabelSupport
())
{
LOG
.
debug
(
String
.
format
(
"ticketsystem has label support, using label %s to find dt
t
tickets"
,
LABEL
));
"ticketsystem has label support, using label %s to find dt
a
tickets"
,
LABEL
));
f
.
withLabel
(
LABEL
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application.properties
+
1
-
1
View file @
acd8c826
...
...
@@ -7,7 +7,7 @@ spring.http.multipart.max-file-size=5Mb
###############################################
# Holds the uploaded Zip-Files
tests.tmp.dir
=
/tmp
/dta-tests
tests.tmp.dir
=
~
/dta-tests
host.tests.tmp.dir
=
${tests.tmp.dir}
data.dir
=
/data
data.dir.test.folder.name
=
UnitTests
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets