Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xwiki-platform
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XWiki
xwiki-platform
Commits
e098da5f
Commit
e098da5f
authored
4 months ago
by
Vincent Massol
Browse files
Options
Downloads
Patches
Plain Diff
[Misc] Convert one momre JUnit4-based rendering tests to JUnit5, removing the jmock usage
parent
6cb4c88a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/src/test/java/org/xwiki/localization/macro/IntegrationTests.java
+89
-103
89 additions, 103 deletions
...t/java/org/xwiki/localization/macro/IntegrationTests.java
with
89 additions
and
103 deletions
xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/src/test/java/org/xwiki/localization/macro/IntegrationTests.java
+
89
−
103
View file @
e098da5f
...
...
@@ -22,18 +22,17 @@
import
java.util.Arrays
;
import
java.util.Locale
;
import
org.jmock.Expectations
;
import
org.jmock.Mockery
;
import
org.jmock.integration.junit4.JUnit4Mockery
;
import
org.junit.runner.RunWith
;
import
org.xwiki.localization.TranslationBundle
;
import
org.xwiki.localization.LocalizationContext
;
import
org.xwiki.localization.LocalizationManager
;
import
org.xwiki.localization.Translation
;
import
org.xwiki.rendering.block.Block
;
import
org.xwiki.rendering.block.WordBlock
;
import
org.xwiki.rendering.test.integration.RenderingTestSuite
;
import
org.xwiki.test.jmock.MockingComponentManager
;
import
org.xwiki.rendering.test.integration.junit5.RenderingTests
;
import
org.xwiki.test.annotation.AllComponents
;
import
org.xwiki.test.mockito.MockitoComponentManager
;
import
static
org
.
mockito
.
Mockito
.
when
;
/**
* Run all tests found in {@code *.test} files located in the classpath. These {@code *.test} files must follow the
...
...
@@ -42,110 +41,97 @@
* @version $Id$
* @since 3.4M2
*/
@RunWith
(
RenderingTestSuite
.
class
)
public
class
IntegrationTests
@AllComponents
@RenderingTests
.
Scope
(
pattern
=
"macrotranslation.*"
)
public
class
IntegrationTests
implements
RenderingTests
{
@RenderingTest
Suite
.
Initialized
public
void
initialize
(
Mocki
ng
ComponentManager
componentManager
)
throws
Exception
@RenderingTest
s
.
Initialized
public
void
initialize
(
Mocki
to
ComponentManager
componentManager
)
throws
Exception
{
Mockery
mockery
=
new
JUnit4Mockery
();
LocalizationManager
localizationManager
=
componentManager
.
registerMockComponent
(
LocalizationManager
.
class
);
LocalizationContext
localizationContext
=
componentManager
.
registerMockComponent
(
LocalizationContext
.
class
);
when
(
localizationManager
.
getTranslation
(
"some.translation"
,
Locale
.
ENGLISH
)).
thenReturn
(
new
Translation
()
{
@Override
public
Block
render
(
Locale
locale
,
Object
...
parameters
)
{
return
parameters
.
length
>
0
?
new
WordBlock
(
"entranslationmessage"
+
Arrays
.
toString
(
parameters
))
:
new
WordBlock
(
"entranslationmessage"
);
}
@Override
public
Block
render
(
Object
...
parameters
)
{
return
render
(
null
,
parameters
);
}
@Override
public
String
getRawSource
()
{
return
"entranslationmessagesource"
;
}
@Override
public
Locale
getLocale
()
{
return
Locale
.
ENGLISH
;
}
final
LocalizationManager
localizationManager
=
componentManager
.
registerMockComponent
(
mockery
,
LocalizationManager
.
class
);
final
LocalizationContext
localizationContext
=
componentManager
.
registerMockComponent
(
mockery
,
LocalizationContext
.
class
);
@Override
public
String
getKey
()
{
return
"some.translation"
;
}
@Override
public
TranslationBundle
getBundle
()
{
return
null
;
}
});
mockery
.
checking
(
new
Expect
ation
s
()
when
(
localizationManager
.
getTranslation
(
"some.translation"
,
Locale
.
FRENCH
)).
thenReturn
(
new
Transl
ation
()
{
@Override
public
Block
render
(
Locale
locale
,
Object
...
parameters
)
{
return
parameters
.
length
>
0
?
new
WordBlock
(
"frtranslationmessage"
+
Arrays
.
toString
(
parameters
))
:
new
WordBlock
(
"frtranslationmessage"
);
}
@Override
public
Block
render
(
Object
...
parameters
)
{
return
render
(
null
,
parameters
);
}
@Override
public
String
getRawSource
()
{
return
"frtranslationmessagesource"
;
}
@Override
public
Locale
getLocale
()
{
return
Locale
.
FRENCH
;
}
@Override
public
String
getKey
()
{
allowing
(
localizationManager
).
getTranslation
(
"some.translation"
,
Locale
.
ENGLISH
);
will
(
returnValue
(
new
Translation
()
{
@Override
public
Block
render
(
Locale
locale
,
Object
...
parameters
)
{
return
parameters
.
length
>
0
?
new
WordBlock
(
"entranslationmessage"
+
Arrays
.
toString
(
parameters
))
:
new
WordBlock
(
"entranslationmessage"
);
}
@Override
public
Block
render
(
Object
...
parameters
)
{
return
render
(
null
,
parameters
);
}
@Override
public
String
getRawSource
()
{
return
"entranslationmessagesource"
;
}
@Override
public
Locale
getLocale
()
{
return
Locale
.
ENGLISH
;
}
@Override
public
String
getKey
()
{
return
"some.translation"
;
}
@Override
public
TranslationBundle
getBundle
()
{
return
null
;
}
}));
allowing
(
localizationManager
).
getTranslation
(
"some.translation"
,
Locale
.
FRENCH
);
will
(
returnValue
(
new
Translation
()
{
@Override
public
Block
render
(
Locale
locale
,
Object
...
parameters
)
{
return
parameters
.
length
>
0
?
new
WordBlock
(
"frtranslationmessage"
+
Arrays
.
toString
(
parameters
))
:
new
WordBlock
(
"frtranslationmessage"
);
}
@Override
public
Block
render
(
Object
...
parameters
)
{
return
render
(
null
,
parameters
);
}
@Override
public
String
getRawSource
()
{
return
"frtranslationmessagesource"
;
}
@Override
public
Locale
getLocale
()
{
return
Locale
.
FRENCH
;
}
@Override
public
String
getKey
()
{
return
"some.translation"
;
}
@Override
public
TranslationBundle
getBundle
()
{
return
null
;
}
}));
allowing
(
localizationManager
).
getTranslation
(
"unexisting.translation"
,
Locale
.
ENGLISH
);
will
(
returnValue
(
null
));
allowing
(
localizationContext
).
getCurrentLocale
();
will
(
returnValue
(
Locale
.
ENGLISH
));
return
"some.translation"
;
}
@Override
public
TranslationBundle
getBundle
()
{
return
null
;
}
});
when
(
localizationManager
.
getTranslation
(
"unexisting.translation"
,
Locale
.
ENGLISH
)).
thenReturn
(
null
);
when
(
localizationContext
.
getCurrentLocale
()).
thenReturn
(
Locale
.
ENGLISH
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment