Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Jon Shahen
mohawk-t-conversion-tool
Commits
0c828d26
Commit
0c828d26
authored
Jan 25, 2015
by
Jonathan Shahen
Browse files
Reduced messages when running test
parent
ff3be132
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
35 deletions
+52
-35
src/mohawk/converter/ConverterInstance.java
src/mohawk/converter/ConverterInstance.java
+28
-19
src/mohawk/converter/generated/mohawktarbac.g4
src/mohawk/converter/generated/mohawktarbac.g4
+4
-2
src/mohawk/converter/helper/SpecHelper.java
src/mohawk/converter/helper/SpecHelper.java
+1
-1
src/mohawk/converter/testing/ConverterRegressionTests.java
src/mohawk/converter/testing/ConverterRegressionTests.java
+19
-13
No files found.
src/mohawk/converter/ConverterInstance.java
View file @
0c828d26
...
@@ -75,8 +75,25 @@ public class ConverterInstance {
...
@@ -75,8 +75,25 @@ public class ConverterInstance {
specHelper
.
loadSpecFiles
();
specHelper
.
loadSpecFiles
();
/* Timing */
timing
.
stopTimer
(
"loadFile"
);
/* Timing */
timing
.
stopTimer
(
"loadFile"
);
logger
.
info
(
"Spec File(s) to Convert: "
+
specHelper
.
specFiles
);
if
(!
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
if
(!
cmd
.
hasOption
(
OptionString
.
TO_ASAPTIME_NSA
.
toString
()))
{
logger
.
info
(
"[SKIP] Skipping converting to ASAPTime NSA"
);
}
if
(!
cmd
.
hasOption
(
OptionString
.
TO_ASAPTIME_SA
.
toString
()))
{
logger
.
info
(
"[SKIP] Skipping converting to ASAPTime SA"
);
}
if
(!
cmd
.
hasOption
(
OptionString
.
TO_TROLE
.
toString
()))
{
logger
.
info
(
"[SKIP] Skipping converting to TRole"
);
}
if
(!
cmd
.
hasOption
(
OptionString
.
TO_TRULE
.
toString
()))
{
logger
.
info
(
"[SKIP] Skipping converting to TRule"
);
}
if
(!
cmd
.
hasOption
(
OptionString
.
TO_MOHAWK
.
toString
()))
{
logger
.
info
(
"[SKIP] Skipping converting to Mohawk"
);
}
}
logger
.
info
(
"Spec File(s) to Convert: "
+
specHelper
.
specFiles
);
for
(
Integer
i
=
1
;
i
<=
specHelper
.
specFiles
.
size
();
i
++)
{
for
(
Integer
i
=
1
;
i
<=
specHelper
.
specFiles
.
size
();
i
++)
{
File
specFile
=
specHelper
.
specFiles
.
get
(
i
-
1
);
File
specFile
=
specHelper
.
specFiles
.
get
(
i
-
1
);
...
@@ -98,8 +115,8 @@ public class ConverterInstance {
...
@@ -98,8 +115,8 @@ public class ConverterInstance {
if
(
cmd
.
hasOption
(
OptionString
.
TO_ASAPTIME_NSA
.
toString
())
if
(
cmd
.
hasOption
(
OptionString
.
TO_ASAPTIME_NSA
.
toString
())
||
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
||
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
logger
.
info
(
"[CONVERTING] Converting to
Rainse
..."
);
logger
.
info
(
"[CONVERTING] Converting to
ASAPTime NSA
..."
);
/* Timing */
timing
.
startTimer
(
"convertTo
Ranise
("
+
i
+
")"
);
/* Timing */
timing
.
startTimer
(
"convertTo
ASAPTimeNSA
("
+
i
+
")"
);
ConvertToASAPTimeNSA
toRanise
=
new
ConvertToASAPTimeNSA
();
ConvertToASAPTimeNSA
toRanise
=
new
ConvertToASAPTimeNSA
();
toRanise
.
convert
(
m
,
specFile
,
true
);
toRanise
.
convert
(
m
,
specFile
,
true
);
...
@@ -112,18 +129,16 @@ public class ConverterInstance {
...
@@ -112,18 +129,16 @@ public class ConverterInstance {
}
}
/* Timing */
timing
.
stopTimer
(
"convertToRanise ("
+
i
+
")"
);
/* Timing */
timing
.
stopTimer
(
"convertToRanise ("
+
i
+
")"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to Rainse"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to ASAPTime NSA"
);
}
else
{
logger
.
info
(
"[SKIP] Skipping converting to Ranise"
);
}
}
if
(
cmd
.
hasOption
(
OptionString
.
TO_TR
O
LE
.
toString
())
||
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
if
(
cmd
.
hasOption
(
OptionString
.
TO_TR
U
LE
.
toString
())
||
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
logger
.
info
(
"[CONVERTING] Converting to
Uzun
..."
);
logger
.
info
(
"[CONVERTING] Converting to
TRule
..."
);
/* Timing */
timing
.
startTimer
(
"convertTo
Uzun
("
+
i
+
")"
);
/* Timing */
timing
.
startTimer
(
"convertTo
TRule
("
+
i
+
")"
);
// TODO: Convert imported spec files to Uzun format
// TODO: Convert imported spec files to Uzun format
ConvertToTRule
toUzun
=
new
ConvertToTRule
();
ConvertToTRule
toUzun
=
new
ConvertToTRule
();
String
uzunStr
=
toUzun
.
convert
(
m
,
specFile
,
true
);
toUzun
.
convert
(
m
,
specFile
,
true
);
if
(
toUzun
.
lastError
==
null
)
{
if
(
toUzun
.
lastError
==
null
)
{
logger
.
info
(
"[SUCCESS] Successfully converted to Uzun's Input Format"
);
logger
.
info
(
"[SUCCESS] Successfully converted to Uzun's Input Format"
);
...
@@ -132,10 +147,8 @@ public class ConverterInstance {
...
@@ -132,10 +147,8 @@ public class ConverterInstance {
+
toUzun
.
lastError
);
+
toUzun
.
lastError
);
}
}
/* Timing */
timing
.
stopTimer
(
"convertToUzun ("
+
i
+
")"
);
/* Timing */
timing
.
stopTimer
(
"convertToTRule ("
+
i
+
")"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to Uzun"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to TRule"
);
}
else
{
logger
.
info
(
"[SKIP] Skipping converting to Uzun"
);
}
}
if
(
cmd
.
hasOption
(
OptionString
.
TO_MOHAWK
.
toString
())
||
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
if
(
cmd
.
hasOption
(
OptionString
.
TO_MOHAWK
.
toString
())
||
cmd
.
hasOption
(
OptionString
.
TO_ALL
.
toString
()))
{
...
@@ -144,7 +157,7 @@ public class ConverterInstance {
...
@@ -144,7 +157,7 @@ public class ConverterInstance {
// TODO: Convert imported spec files to Mohawk format
// TODO: Convert imported spec files to Mohawk format
ConvertToMohawk
toMohawk
=
new
ConvertToMohawk
();
ConvertToMohawk
toMohawk
=
new
ConvertToMohawk
();
String
mohawkStr
=
toMohawk
.
convert
(
m
,
specFile
,
true
);
toMohawk
.
convert
(
m
,
specFile
,
true
);
if
(
toMohawk
.
lastError
==
null
)
{
if
(
toMohawk
.
lastError
==
null
)
{
logger
.
info
(
"[SUCCESS] Successfully converted to Mohawk's Input Format"
);
logger
.
info
(
"[SUCCESS] Successfully converted to Mohawk's Input Format"
);
...
@@ -155,8 +168,6 @@ public class ConverterInstance {
...
@@ -155,8 +168,6 @@ public class ConverterInstance {
/* Timing */
timing
.
stopTimer
(
"convertToMohawk ("
+
i
+
")"
);
/* Timing */
timing
.
stopTimer
(
"convertToMohawk ("
+
i
+
")"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to Mohawk"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to Mohawk"
);
}
else
{
logger
.
info
(
"[SKIP] Skipping converting to Mohawk"
);
}
}
if
(
cmd
.
hasOption
(
OptionString
.
TO_MOHAWK_T
.
toString
()))
{
if
(
cmd
.
hasOption
(
OptionString
.
TO_MOHAWK_T
.
toString
()))
{
...
@@ -169,8 +180,6 @@ public class ConverterInstance {
...
@@ -169,8 +180,6 @@ public class ConverterInstance {
/* Timing */
timing
.
stopTimer
(
"convertToMohawkT ("
+
i
+
")"
);
/* Timing */
timing
.
stopTimer
(
"convertToMohawkT ("
+
i
+
")"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to Mohawk-T"
);
logger
.
info
(
"[CONVERTING] ...Done Converting to Mohawk-T"
);
}
else
{
logger
.
info
(
"[SKIP] Skipping converting to Mohawk"
);
}
}
}
}
/* Timing */
timing
.
stopTimer
(
"totalTime"
);
/* Timing */
timing
.
stopTimer
(
"totalTime"
);
...
...
src/mohawk/converter/generated/mohawktarbac.g4
View file @
0c828d26
...
@@ -8,7 +8,7 @@ package mohawk.converter.generated;
...
@@ -8,7 +8,7 @@ package mohawk.converter.generated;
import
java
.
util
.
SortedSet
;
import
java
.
util
.
SortedSet
;
import
java
.
util
.
TreeSet
;
import
java
.
util
.
TreeSet
;
import
java
.
util
.
logging
.
Logger
;
import
java
.
util
.
logging
.
*
;
import
org
.
apache
.
commons
.
lang3
.
StringUtils
;
import
org
.
apache
.
commons
.
lang3
.
StringUtils
;
import
mohawk
.
converter
.
helper
.*;
import
mohawk
.
converter
.
helper
.*;
...
@@ -32,7 +32,9 @@ import mohawk.global.helper.*;
...
@@ -32,7 +32,9 @@ import mohawk.global.helper.*;
private
void
logmsg
(
String
msg
)
{
private
void
logmsg
(
String
msg
)
{
System
.
out
.
println
(
StringUtils
.
repeat
(
" "
,
tabsize
)
+
msg
);
if
(
logger
.
getLevel
()
==
Level
.
FINE
)
{
System
.
out
.
println
(
StringUtils
.
repeat
(
" "
,
tabsize
)
+
msg
);
}
}
}
}
}
...
...
src/mohawk/converter/helper/SpecHelper.java
View file @
0c828d26
...
@@ -108,7 +108,7 @@ public class SpecHelper {
...
@@ -108,7 +108,7 @@ public class SpecHelper {
FileInputStream
fis
=
new
FileInputStream
(
specFile
);
FileInputStream
fis
=
new
FileInputStream
(
specFile
);
error
.
errorFound
=
false
;
// reset the error listener
error
.
errorFound
=
false
;
// reset the error listener
MohawkTARBACParser
parser
=
ConverterRegressionTests
.
runParser
(
fis
,
error
);
MohawkTARBACParser
parser
=
ConverterRegressionTests
.
runParser
(
fis
,
error
,
false
);
if
(
error
.
errorFound
)
{
if
(
error
.
errorFound
)
{
logger
.
warning
(
"Unable to parse the file: "
+
specFile
.
getAbsolutePath
());
logger
.
warning
(
"Unable to parse the file: "
+
specFile
.
getAbsolutePath
());
...
...
src/mohawk/converter/testing/ConverterRegressionTests.java
View file @
0c828d26
...
@@ -198,28 +198,34 @@ public class ConverterRegressionTests {
...
@@ -198,28 +198,34 @@ public class ConverterRegressionTests {
}
}
public
static
MohawkTARBACParser
runParser
(
InputStream
is
,
BaseErrorListener
errorListener
)
throws
IOException
{
public
static
MohawkTARBACParser
runParser
(
InputStream
is
,
BaseErrorListener
errorListener
)
throws
IOException
{
return
runParser
(
is
,
errorListener
,
true
);
}
public
static
MohawkTARBACParser
runParser
(
InputStream
is
,
BaseErrorListener
errorListener
,
Boolean
displayStats
)
throws
IOException
{
ANTLRInputStream
input
=
new
ANTLRInputStream
(
is
);
ANTLRInputStream
input
=
new
ANTLRInputStream
(
is
);
MohawkTARBACLexer
lexer
=
new
MohawkTARBACLexer
(
input
);
MohawkTARBACLexer
lexer
=
new
MohawkTARBACLexer
(
input
);
CommonTokenStream
tokens
=
new
CommonTokenStream
(
lexer
);
CommonTokenStream
tokens
=
new
CommonTokenStream
(
lexer
);
MohawkTARBACParser
parser
=
new
MohawkTARBACParser
(
tokens
);
MohawkTARBACParser
parser
=
new
MohawkTARBACParser
(
tokens
);
System
.
out
.
println
(
tokens
.
getText
());
parser
.
removeErrorListeners
();
parser
.
removeErrorListeners
();
parser
.
addErrorListener
(
errorListener
);
parser
.
addErrorListener
(
errorListener
);
parser
.
init
();
parser
.
init
();
MohawkT
m
=
parser
.
mohawkT
;
if
(
displayStats
)
{
MohawkT
m
=
parser
.
mohawkT
;
System
.
out
.
println
(
"Roles: "
+
m
.
roleHelper
);
System
.
out
.
println
(
"Timeslots: "
+
m
.
timeIntervalHelper
);
System
.
out
.
println
(
"Tokes: "
+
tokens
.
getText
());
System
.
out
.
println
(
"Max Timeslot: "
+
m
.
timeIntervalHelper
.
maxTimeSlot
);
System
.
out
.
println
(
"Roles: "
+
m
.
roleHelper
);
System
.
out
.
println
(
m
.
query
.
toString
());
System
.
out
.
println
(
"Timeslots: "
+
m
.
timeIntervalHelper
);
System
.
out
.
println
(
m
.
expectedResult
.
toString
());
System
.
out
.
println
(
"Max Timeslot: "
+
m
.
timeIntervalHelper
.
maxTimeSlot
);
System
.
out
.
println
(
m
.
canAssign
.
toString
());
System
.
out
.
println
(
m
.
query
.
toString
());
System
.
out
.
println
(
m
.
canDisable
.
toString
());
System
.
out
.
println
(
m
.
expectedResult
.
toString
());
System
.
out
.
println
(
m
.
canEnable
.
toString
());
System
.
out
.
println
(
m
.
canAssign
.
toString
());
System
.
out
.
println
(
m
.
canRevoke
.
toString
());
System
.
out
.
println
(
m
.
canDisable
.
toString
());
System
.
out
.
println
(
m
.
canEnable
.
toString
());
System
.
out
.
println
(
m
.
canRevoke
.
toString
());
}
return
parser
;
return
parser
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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