You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/12/03 11:19:57 UTC
[myfaces-tobago] branch master updated: chore: using junit 5 style
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 2a8d174 chore: using junit 5 style
2a8d174 is described below
commit 2a8d1745ddd49eae5ee1b5c8ede0b81cd9758974
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Dec 3 12:17:51 2020 +0100
chore: using junit 5 style
---
.../myfaces/tobago/component/TagsUnitTest.java | 2 +-
.../tobago/context/ThemeResourcesUnitTest.java | 44 ++++++++--------
.../renderkit/renderer/BoxRendererUnitTest.java | 8 +--
.../renderer/ButtonsRendererUnitTest.java | 6 +--
.../renderkit/renderer/FileRendererUnitTest.java | 4 +-
.../renderkit/renderer/InRendererUnitTest.java | 46 ++++++++---------
.../renderkit/renderer/LinkRendererUnitTest.java | 12 ++---
.../renderkit/renderer/LinksRendererUnitTest.java | 6 +--
.../renderer/SectionRendererUnitTest.java | 8 +--
.../renderer/SelectOneChoiceRendererUnitTest.java | 4 +-
.../renderer/SelectOneRadioRendererUnitTest.java | 4 +-
.../renderer/TextareaRendererUnitTest.java | 4 +-
.../tobago/internal/util/RenderUtilsUnitTest.java | 8 +--
.../tobago/model/SelectedStateUnitTest.java | 58 +++++++++++-----------
14 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/TagsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/TagsUnitTest.java
index d5e24e4..e2500bb 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/TagsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/TagsUnitTest.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.component;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.util.EnumUnitTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TagsUnitTest extends EnumUnitTest {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeResourcesUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeResourcesUnitTest.java
index 4440b5e..950aba8 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeResourcesUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeResourcesUnitTest.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.context;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
class ThemeResourcesUnitTest {
@@ -29,38 +29,38 @@ class ThemeResourcesUnitTest {
final ThemeResources resources = new ThemeResources(false);
// empty
// empty
- Assert.assertEquals(0, resources.getScriptList().size());
- Assert.assertEquals(0, resources.getStyleList().size());
+ Assertions.assertEquals(0, resources.getScriptList().size());
+ Assertions.assertEquals(0, resources.getStyleList().size());
final ThemeScript a = new ThemeScript();
a.setName("a");
// a
// empty
resources.addIncludeScript(a);
- Assert.assertEquals(1, resources.getScriptList().size());
- Assert.assertEquals(0, resources.getStyleList().size());
- Assert.assertEquals("a", resources.getScriptList().get(0).getName());
+ Assertions.assertEquals(1, resources.getScriptList().size());
+ Assertions.assertEquals(0, resources.getStyleList().size());
+ Assertions.assertEquals("a", resources.getScriptList().get(0).getName());
final ThemeScript b = new ThemeScript();
b.setName("b");
resources.addIncludeScript(b);
// a b
// empty
- Assert.assertEquals(2, resources.getScriptList().size());
- Assert.assertEquals(0, resources.getStyleList().size());
- Assert.assertEquals("a", resources.getScriptList().get(0).getName());
- Assert.assertEquals("b", resources.getScriptList().get(1).getName());
+ Assertions.assertEquals(2, resources.getScriptList().size());
+ Assertions.assertEquals(0, resources.getStyleList().size());
+ Assertions.assertEquals("a", resources.getScriptList().get(0).getName());
+ Assertions.assertEquals("b", resources.getScriptList().get(1).getName());
final ThemeStyle c = new ThemeStyle();
c.setName("c");
resources.addIncludeStyle(c);
// a b
// c
- Assert.assertEquals(2, resources.getScriptList().size());
- Assert.assertEquals(1, resources.getStyleList().size());
- Assert.assertEquals("a", resources.getScriptList().get(0).getName());
- Assert.assertEquals("b", resources.getScriptList().get(1).getName());
- Assert.assertEquals("c", resources.getStyleList().get(0).getName());
+ Assertions.assertEquals(2, resources.getScriptList().size());
+ Assertions.assertEquals(1, resources.getStyleList().size());
+ Assertions.assertEquals("a", resources.getScriptList().get(0).getName());
+ Assertions.assertEquals("b", resources.getScriptList().get(1).getName());
+ Assertions.assertEquals("c", resources.getStyleList().get(0).getName());
// merging exclude
final ThemeResources resources2 = new ThemeResources(false);
@@ -74,19 +74,19 @@ class ThemeResourcesUnitTest {
final ThemeResources merge = ThemeResources.merge(resources, resources2);
// a b merge with -a -> b
// c merge with d -> c d
- Assert.assertEquals(1, merge.getScriptList().size());
- Assert.assertEquals(2, merge.getStyleList().size());
- Assert.assertEquals("b", merge.getScriptList().get(0).getName());
- Assert.assertEquals("c", merge.getStyleList().get(0).getName());
- Assert.assertEquals("d", merge.getStyleList().get(1).getName());
+ Assertions.assertEquals(1, merge.getScriptList().size());
+ Assertions.assertEquals(2, merge.getStyleList().size());
+ Assertions.assertEquals("b", merge.getScriptList().get(0).getName());
+ Assertions.assertEquals("c", merge.getStyleList().get(0).getName());
+ Assertions.assertEquals("d", merge.getStyleList().get(1).getName());
}
@Test
public void prodVsDev() {
final ThemeResources dev = new ThemeResources(false);
- Assert.assertFalse(dev.isProduction());
+ Assertions.assertFalse(dev.isProduction());
final ThemeResources prod = new ThemeResources(true);
- Assert.assertTrue(prod.isProduction());
+ Assertions.assertTrue(prod.isProduction());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRendererUnitTest.java
index 76a6064..475b302 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRendererUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UIBox;
import org.apache.myfaces.tobago.component.UIOut;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -38,7 +38,7 @@ public class BoxRendererUnitTest extends RendererTestBase {
c.setLabel("label");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/box/box-label.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/box/box-label.html"), formattedResult());
}
@Test
@@ -52,7 +52,7 @@ public class BoxRendererUnitTest extends RendererTestBase {
c.getFacets().put("label", o);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/box/box-label-facet.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/box/box-label-facet.html"), formattedResult());
}
@Test
@@ -61,7 +61,7 @@ public class BoxRendererUnitTest extends RendererTestBase {
facesContext, Tags.box.componentType(), RendererTypes.Box, "id");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/box/simple.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/box/simple.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRendererUnitTest.java
index c4a6a16..0a5014f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRendererUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.component.UIButtons;
import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.component.UISeparator;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -67,7 +67,7 @@ public class ButtonsRendererUnitTest extends RendererTestBase {
l.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/buttons/separator-inside-buttons.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/buttons/separator-inside-buttons.html"), formattedResult());
}
@Test
@@ -85,7 +85,7 @@ public class ButtonsRendererUnitTest extends RendererTestBase {
l.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/buttons/badge-inside-buttons.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/buttons/badge-inside-buttons.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java
index 19a00c4..4677aed 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UIFile;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -37,6 +37,6 @@ public class FileRendererUnitTest extends RendererTestBase {
c.setLabel("label");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/file/file-label.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/file/file-label.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
index af91a17..3b1a82c 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.component.UISelectOneChoice;
import org.apache.myfaces.tobago.component.UITextarea;
import org.apache.myfaces.tobago.layout.SegmentMeasureList;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import javax.faces.component.behavior.AjaxBehavior;
@@ -54,7 +54,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-button-after.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-button-after.html"), formattedResult());
}
@Test
@@ -69,7 +69,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-button-before.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-button-before.html"), formattedResult());
}
@Test
@@ -92,7 +92,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-choice-after.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-choice-after.html"), formattedResult());
}
@Test
@@ -118,7 +118,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-dropdown-after.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-dropdown-after.html"), formattedResult());
}
@Test
@@ -144,7 +144,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-dropdown-before.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-dropdown-before.html"), formattedResult());
}
@Test
@@ -159,7 +159,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-out-after.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-out-after.html"), formattedResult());
}
@Test
@@ -174,7 +174,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/input-group-out-before.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/input-group-out-before.html"), formattedResult());
}
@Test
@@ -183,7 +183,7 @@ public class InRendererUnitTest extends RendererTestBase {
facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/simple.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/simple.html"), formattedResult());
}
@Test
@@ -194,7 +194,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.flexLeft); // same as default
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-flexLeft.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-flexLeft.html"), formattedResult());
}
@Test
@@ -205,7 +205,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.flexRight);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-flexRight.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-flexRight.html"), formattedResult());
}
@Test
@@ -216,7 +216,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.flowLeft);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-flowLeft.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-flowLeft.html"), formattedResult());
}
@Test
@@ -227,7 +227,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.flowRight);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-flowRight.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-flowRight.html"), formattedResult());
}
@Test
@@ -238,7 +238,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.top);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-top.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-top.html"), formattedResult());
}
@Test
@@ -249,7 +249,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.gridLeft);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-gridLeft.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-gridLeft.html"), formattedResult());
}
@Test
@@ -260,7 +260,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.gridRight);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-gridRight.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-gridRight.html"), formattedResult());
}
@Test
@@ -271,7 +271,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.gridTop);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-gridTop.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-gridTop.html"), formattedResult());
}
@Test
@@ -282,7 +282,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.gridBottom);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-gridBottom.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-gridBottom.html"), formattedResult());
}
@Test
@@ -300,7 +300,7 @@ public class InRendererUnitTest extends RendererTestBase {
l.getChildren().add(c);
l.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-segmentLeft.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-segmentLeft.html"), formattedResult());
}
@Test
@@ -318,7 +318,7 @@ public class InRendererUnitTest extends RendererTestBase {
l.getChildren().add(c);
l.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-segmentRight.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-segmentRight.html"), formattedResult());
}
@Test
@@ -329,7 +329,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.skip);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-skip.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-skip.html"), formattedResult());
}
@Test
@@ -340,7 +340,7 @@ public class InRendererUnitTest extends RendererTestBase {
c.setLabelLayout(LabelLayout.none);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/label-none.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/label-none.html"), formattedResult());
}
@Test
@@ -368,7 +368,7 @@ public class InRendererUnitTest extends RendererTestBase {
p.getChildren().add(a);
p.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/in/ajax.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/in/ajax.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java
index 2933aa7..3e417d6 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.component.UISelectManyCheckbox;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
import org.apache.myfaces.tobago.component.UISeparator;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -49,7 +49,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/link/booleanInsideLink.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/link/booleanInsideLink.html"), formattedResult());
}
@Test
@@ -60,7 +60,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
c.setLink("https://www.apache.org/");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/link/link.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/link/link.html"), formattedResult());
}
@Test
@@ -86,7 +86,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/link/manyInsideLink.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/link/manyInsideLink.html"), formattedResult());
}
@Test
@@ -112,7 +112,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/link/radioInsideLink.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/link/radioInsideLink.html"), formattedResult());
}
@Test
@@ -140,7 +140,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/link/separatorInsideLink.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/link/separatorInsideLink.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRendererUnitTest.java
index 7ebcef0..0262deb 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRendererUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.component.UILinks;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -42,7 +42,7 @@ public class LinksRendererUnitTest extends RendererTestBase {
l.getChildren().add(c);
l.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/links/link-inside-links.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/links/link-inside-links.html"), formattedResult());
}
@Test
@@ -62,7 +62,7 @@ public class LinksRendererUnitTest extends RendererTestBase {
l.getChildren().add(c);
l.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/links/link-inside-links-sub.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/links/link-inside-links-sub.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRendererUnitTest.java
index b77bc4b..3cc553f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRendererUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UISection;
import org.apache.myfaces.tobago.component.UIOut;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -38,7 +38,7 @@ public class SectionRendererUnitTest extends RendererTestBase {
c.setLabel("label");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/section/section-label.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/section/section-label.html"), formattedResult());
}
@Test
@@ -52,7 +52,7 @@ public class SectionRendererUnitTest extends RendererTestBase {
c.getFacets().put("label", o);
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/section/section-label-facet.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/section/section-label-facet.html"), formattedResult());
}
@Test
@@ -61,7 +61,7 @@ public class SectionRendererUnitTest extends RendererTestBase {
facesContext, Tags.section.componentType(), RendererTypes.Section, "id");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/section/simple.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/section/simple.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRendererUnitTest.java
index 615af5a..ca76fa1 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRendererUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UISelectItem;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -48,7 +48,7 @@ public class SelectOneChoiceRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/selectOneChoice/selectOneChoiceLabel.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/selectOneChoice/selectOneChoiceLabel.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java
index 7dae3cb..8232110 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UISelectItem;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -48,7 +48,7 @@ public class SelectOneRadioRendererUnitTest extends RendererTestBase {
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/selectOneRadio/selectOneRadioLabel.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/selectOneRadio/selectOneRadioLabel.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRendererUnitTest.java
index 7278589..2502e3f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRendererUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UITextarea;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -37,7 +37,7 @@ public class TextareaRendererUnitTest extends RendererTestBase {
c.setLabel("label");
c.encodeAll(facesContext);
- Assert.assertEquals(loadHtml("renderer/textarea/with-label.html"), formattedResult());
+ Assertions.assertEquals(loadHtml("renderer/textarea/with-label.html"), formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
index c2d6010..519a3b9 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.internal.util;
import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.internal.config.AbstractTobagoTestBase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import javax.faces.component.UIParameter;
@@ -33,7 +33,7 @@ public class RenderUtilsUnitTest extends AbstractTobagoTestBase {
final UILink link = new UILink();
link.setLink("local.xhtml");
final String url = RenderUtils.generateUrl(getFacesContext(), link);
- Assert.assertEquals("local.xhtml", url);
+ Assertions.assertEquals("local.xhtml", url);
}
@Test
@@ -54,7 +54,7 @@ public class RenderUtilsUnitTest extends AbstractTobagoTestBase {
link.getChildren().add(body);
final String url = RenderUtils.generateUrl(getFacesContext(), link);
- Assert.assertEquals("mailto:MyFaces Discussion <us...@myfaces.apache.org>"
+ Assertions.assertEquals("mailto:MyFaces Discussion <us...@myfaces.apache.org>"
+ "?subject=%5BTobago%5D%20Preparation%20for%20the%205.0.0%20release"
+ "&body=Hi%2C%20folks%2C%0A%0Awe%20plan%20to%20build%20version%205.0.0%20of%20Tobago%20soon.", url);
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectedStateUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectedStateUnitTest.java
index 318c3ba..d14ff9b 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectedStateUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectedStateUnitTest.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.model;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class SelectedStateUnitTest {
@@ -30,30 +30,30 @@ public class SelectedStateUnitTest {
state.select(new TreePath(0, 0));
state.select(new TreePath(1, 1, 1));
- Assert.assertTrue(state.isAncestorOfSelected(new TreePath()));
- Assert.assertTrue(state.isAncestorOfSelected(new TreePath(0)));
- Assert.assertTrue(state.isAncestorOfSelected(new TreePath(0, 0)));
- Assert.assertTrue(state.isAncestorOfSelected(new TreePath(1)));
- Assert.assertTrue(state.isAncestorOfSelected(new TreePath(1, 1)));
- Assert.assertTrue(state.isAncestorOfSelected(new TreePath(1, 1, 1)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(2)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(0, 1)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(1, 0)));
+ Assertions.assertTrue(state.isAncestorOfSelected(new TreePath()));
+ Assertions.assertTrue(state.isAncestorOfSelected(new TreePath(0)));
+ Assertions.assertTrue(state.isAncestorOfSelected(new TreePath(0, 0)));
+ Assertions.assertTrue(state.isAncestorOfSelected(new TreePath(1)));
+ Assertions.assertTrue(state.isAncestorOfSelected(new TreePath(1, 1)));
+ Assertions.assertTrue(state.isAncestorOfSelected(new TreePath(1, 1, 1)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(2)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(0, 1)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(1, 0)));
}
@Test
public void testAncestorOfSelectedEmpty() {
SelectedState state = new SelectedState();
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath()));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(0)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(0, 0)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(1)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(1, 1)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(1, 1, 1)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(2)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(0, 1)));
- Assert.assertFalse(state.isAncestorOfSelected(new TreePath(1, 0)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath()));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(0)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(0, 0)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(1)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(1, 1)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(1, 1, 1)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(2)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(0, 1)));
+ Assertions.assertFalse(state.isAncestorOfSelected(new TreePath(1, 0)));
}
@Test
@@ -62,15 +62,15 @@ public class SelectedStateUnitTest {
state.select(new TreePath(0, 0));
state.select(new TreePath(1, 1, 1));
- Assert.assertFalse(state.isSelected(new TreePath()));
- Assert.assertFalse(state.isSelected(new TreePath(0)));
- Assert.assertTrue(state.isSelected(new TreePath(0, 0)));
- Assert.assertFalse(state.isSelected(new TreePath(1)));
- Assert.assertFalse(state.isSelected(new TreePath(1, 1)));
- Assert.assertTrue(state.isSelected(new TreePath(1, 1, 1)));
- Assert.assertFalse(state.isSelected(new TreePath(2)));
- Assert.assertFalse(state.isSelected(new TreePath(0, 1)));
- Assert.assertFalse(state.isSelected(new TreePath(1, 0)));
+ Assertions.assertFalse(state.isSelected(new TreePath()));
+ Assertions.assertFalse(state.isSelected(new TreePath(0)));
+ Assertions.assertTrue(state.isSelected(new TreePath(0, 0)));
+ Assertions.assertFalse(state.isSelected(new TreePath(1)));
+ Assertions.assertFalse(state.isSelected(new TreePath(1, 1)));
+ Assertions.assertTrue(state.isSelected(new TreePath(1, 1, 1)));
+ Assertions.assertFalse(state.isSelected(new TreePath(2)));
+ Assertions.assertFalse(state.isSelected(new TreePath(0, 1)));
+ Assertions.assertFalse(state.isSelected(new TreePath(1, 0)));
}
}