Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
b26f335d
Commit
b26f335d
authored
May 13, 2021
by
Carsten Rose
Browse files
Fix remaining failed unit tests.
parent
6c0c64f5
Pipeline
#5233
failed with stages
in 2 minutes and 6 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Tests/Unit/Core/Helper/HelperFileTest.php
View file @
b26f335d
...
...
@@ -31,21 +31,22 @@ class HelperFileTest extends TestCase {
$this
->
assertEquals
(
''
,
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/javascript.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_JAVASCRIPT
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.qfq.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_QFQ
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.py.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_PYTHON
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.m.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_MATLAB
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/javascript.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_JAVASCRIPT
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.qfq.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_QFQ
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.py.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_PYTHON
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.m.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_MATLAB
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/javascript.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.php.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.php'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.qfq.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.qfq'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.py.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.py'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.m.json'
,
BASE_DIR_FAKE
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.m'
));
$base
=
(
strpos
(
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_JAVASCRIPT
,
''
),
BASE_DIR_FAKE
)
===
false
)
?
BASE_DIR_FAKE
:
''
;
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/javascript.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_JAVASCRIPT
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.qfq.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_QFQ
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.py.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_PYTHON
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.m.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_MATLAB
,
''
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/javascript.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_JAVASCRIPT
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.qfq.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_QFQ
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.py.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_PYTHON
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.m.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_MATLAB
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/javascript.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.js'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.php.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.php'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.qfq.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.qfq'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.py.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.py'
));
$this
->
assertEquals
(
Path
::
urlExt
(
Path
::
EXT_TO_HIGHLIGHT_JSON
)
.
'/highlight.m.json'
,
$base
.
HelperFile
::
getFileTypeHighlight
(
FE_HIGHLIGHT_AUTO
,
'fileadmin/test.m'
));
}
public
function
testJoinPathFilename
()
{
...
...
extension/Tests/Unit/Core/Helper/SupportTest.php
View file @
b26f335d
...
...
@@ -948,7 +948,9 @@ class SupportTest extends TestCase {
$expected
[
FE_INPUT_TYPE
]
=
'number'
;
$expected
[
FE_MIN
]
=
-
2147483648
;
$expected
[
FE_MAX
]
=
2147483647
;
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
11
;
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
11
;
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"CheckType Auto should switch to numerical for signed int"
);
$formElement
=
$formElementTemplate
;
...
...
@@ -958,14 +960,19 @@ class SupportTest extends TestCase {
$expected
[
FE_INPUT_TYPE
]
=
'number'
;
$expected
[
FE_MIN
]
=
0
;
$expected
[
FE_MAX
]
=
4294967295
;
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
11
;
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
11
;
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"CheckType Auto should switch to digit for unsigned int"
);
$formElement
=
$formElementTemplate
;
$expected
=
$formElement
;
Support
::
adjustFeToColumnDefinition
(
$formElement
,
'decimal(10,2) not null'
);
$expected
[
FE_CHECK_TYPE
]
=
SANITIZE_ALLOW_NUMERICAL
;
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
13
;
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
13
;
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"CheckType Auto should switch to numerical for decimal"
);
$formElement
=
$formElementTemplate
;
...
...
@@ -979,7 +986,9 @@ class SupportTest extends TestCase {
$expected
[
FE_CHECK_TYPE
]
=
SANITIZE_ALLOW_ALL
;
// $expected[FE_MAX_LENGTH] = 255;
$expected
[
FE_MAX_LENGTH
]
=
''
;
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
255
;
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
255
;
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"Checktype Auto should switch to all for text with encode=specialchars"
);
$formElement
=
$formElementTemplate
;
...
...
@@ -989,7 +998,9 @@ class SupportTest extends TestCase {
$expected
[
FE_CHECK_TYPE
]
=
SANITIZE_ALLOW_ALNUMX
;
// $expected[FE_MAX_LENGTH] = 64;
$expected
[
FE_MAX_LENGTH
]
=
''
;
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
64
;
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
64
;
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"Checktype Auto should switch to alnumx for text with encode=none"
);
$formElement
=
$formElementTemplate
;
...
...
@@ -999,14 +1010,18 @@ class SupportTest extends TestCase {
$expected
[
FE_CHECK_TYPE
]
=
SANITIZE_ALLOW_ALNUMX
;
$expected
[
FE_MIN
]
=
-
2147483648
;
$expected
[
FE_MAX
]
=
2147483647
;
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
11
;
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
11
;
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"Checktype Auto should switch to alnumx if typeAhead is defined"
);
$formElement
=
$formElementTemplate
;
$formElement
[
FE_CHECK_TYPE
]
=
SANITIZE_ALLOW_ALNUMX
;
$expected
=
$formElement
;
Support
::
adjustFeToColumnDefinition
(
$formElement
,
'datetime'
);
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
strlen
(
'0000/00/00 00:00:00'
);
if
(
isset
(
$formElement
[
FE_MAX_LENGTH_COLUMN
]))
{
$expected
[
FE_MAX_LENGTH_COLUMN
]
=
strlen
(
'0000/00/00 00:00:00'
);
}
$this
->
assertEquals
(
$expected
,
$formElement
,
"maxLength for datetime should be correct"
);
}
...
...
extension/Tests/Unit/Core/Report/LinkTest.php
View file @
b26f335d
...
...
@@ -145,6 +145,8 @@ class LinkTest extends TestCase {
$expect
[
'linkClassDefault'
]
=
'no_class'
;
$expect
[
'_exportFilename'
]
=
'download.pdf'
;
$result
=
$link
->
fillParameter
(
array
(),
'p:page1|t:text'
,
$rcTokenGiven
,
'd:download.pdf'
);
$result
=
str_replace
(
BASE_DIR_FAKE
,
''
,
$result
);
$this
->
assertEquals
(
$expect
,
$result
);
$expect
[
'mode'
]
=
'file'
;
...
...
extension/Tests/Unit/Core/Report/ReportTest.php
View file @
b26f335d
...
...
@@ -181,14 +181,17 @@ class ReportTest extends AbstractDatabaseTest {
// link, checked
$result
=
$this
->
report
->
process
(
"10.sql = SELECT 'u:http://www.example.com|C' AS _link FROM Person ORDER BY id LIMIT 1"
);
$base
=
(
strpos
(
$result
,
BASE_DIR_FAKE
)
===
false
)
?
''
:
BASE_DIR_FAKE
;
$this
->
assertEquals
(
'<a href="http://www.example.com" ><img alt="Checked green" src="'
.
$base
.
'typo3conf/ext/qfq/Resources/Public/icons/checked-green.gif" title="green" ></a>'
,
$result
);
// linck, checked, text
$result
=
$this
->
report
->
process
(
"10.sql = SELECT 'u:http://www.example.com|C|t:Hello World' AS _link FROM Person ORDER BY id LIMIT 1"
);
$base
=
(
strpos
(
$result
,
BASE_DIR_FAKE
)
===
false
)
?
''
:
BASE_DIR_FAKE
;
$this
->
assertEquals
(
'<a href="http://www.example.com" ><img alt="Checked green" src="'
.
$base
.
'typo3conf/ext/qfq/Resources/Public/icons/checked-green.gif" title="green" > Hello World</a>'
,
$result
);
// link, checked, text, tooltip
$result
=
$this
->
report
->
process
(
"10.sql = SELECT 'u:http://www.example.com|C|t:Hello World|o:more information' AS _link FROM Person ORDER BY id LIMIT 1"
);
$base
=
(
strpos
(
$result
,
BASE_DIR_FAKE
)
===
false
)
?
''
:
BASE_DIR_FAKE
;
$this
->
assertEquals
(
'<a href="http://www.example.com" title="more information" ><img alt="Checked green" src="'
.
$base
.
'typo3conf/ext/qfq/Resources/Public/icons/checked-green.gif" title="more information" > Hello World</a>'
,
$result
);
}
...
...
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