Merge pull request #1721 from Desislav-Petrov/migrate_junit_templates…

…_to_5
eclipse · Oct 19, 2024 · 00c519f · 00c519f
2 parents 538fff9 + 541148f
commit 00c519f
Show file tree

Hide file tree

Showing 147 changed files with 1,040 additions and 1,152 deletions.
diff --git a/...generator/src/main/resources/test/bag/immutable/abstractImmutablePrimitiveBagTestCase.stg b/...generator/src/main/resources/test/bag/immutable/abstractImmutablePrimitiveBagTestCase.stg
@@ -38,13 +38,13 @@ import org.eclipse.collections.impl.list.mutable.primitive.<name>ArrayList;
 import org.eclipse.collections.impl.test.Verify;
 import org.eclipse.collections.impl.tuple.primitive.PrimitiveTuples;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * JUnit test for {@link Immutable<name>Bag}.

diff --git a/...s-code-generator/src/main/resources/test/bag/immutable/immutablePrimitiveEmptyBagTest.stg b/...s-code-generator/src/main/resources/test/bag/immutable/immutablePrimitiveEmptyBagTest.stg
@@ -24,13 +24,13 @@ import org.eclipse.collections.impl.factory.primitive.<name>Bags;
 import org.eclipse.collections.impl.math.Mutable<wrapperName>;
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.eclipse.collections.impl.factory.primitive.<name>Sets;
 import org.eclipse.collections.api.set.primitive.Immutable<name>Set;
 
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * JUnit test for {@link Immutable<name>EmptyBag}.

diff --git a/...ns-code-generator/src/main/resources/test/bag/immutable/immutablePrimitiveHashBagTest.stg b/...ns-code-generator/src/main/resources/test/bag/immutable/immutablePrimitiveHashBagTest.stg
@@ -24,10 +24,10 @@ import org.eclipse.collections.impl.bag.mutable.primitive.<name>HashBag;
 import org.eclipse.collections.impl.factory.primitive.<name>Bags;
 import org.eclipse.collections.impl.math.Mutable<wrapperName>;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.eclipse.collections.impl.factory.primitive.<name>Sets;
 import org.eclipse.collections.api.set.primitive.Immutable<name>Set;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * JUnit test for {@link Immutable<name>HashBag}.

diff --git a/...de-generator/src/main/resources/test/bag/immutable/immutablePrimitiveSingletonBagTest.stg b/...de-generator/src/main/resources/test/bag/immutable/immutablePrimitiveSingletonBagTest.stg
@@ -24,8 +24,8 @@ import org.eclipse.collections.impl.math.Mutable<wrapperName>;
 import org.eclipse.collections.impl.factory.primitive.<name>Sets;
 import org.eclipse.collections.api.set.primitive.Immutable<name>Set;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * JUnit test for {@link Immutable<name>SingletonBag}.

diff --git a/...ode-generator/src/main/resources/test/bag/mutable/abstractMutablePrimitiveBagTestCase.stg b/...ode-generator/src/main/resources/test/bag/mutable/abstractMutablePrimitiveBagTestCase.stg
@@ -34,16 +34,16 @@ import org.eclipse.collections.impl.collection.mutable.primitive.AbstractMutable
 import org.eclipse.collections.impl.list.mutable.primitive.<name>ArrayList;
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.eclipse.collections.impl.factory.primitive.<name>Sets;
 import org.eclipse.collections.api.set.primitive.Mutable<name>Set;
 
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 /**
  * JUnit test for {@link Mutable<name>Bag}.

diff --git a/...e-collections-code-generator/src/main/resources/test/bag/mutable/primitiveHashBagTest.stg b/...e-collections-code-generator/src/main/resources/test/bag/mutable/primitiveHashBagTest.stg
@@ -21,8 +21,8 @@ package org.eclipse.collections.impl.bag.mutable.primitive;
 import org.eclipse.collections.impl.list.mutable.primitive.<name>ArrayList;
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * JUnit test for {@link <name>HashBag}.

diff --git a/...tions-code-generator/src/main/resources/test/bag/mutable/synchronizedPrimitiveBagTest.stg b/...tions-code-generator/src/main/resources/test/bag/mutable/synchronizedPrimitiveBagTest.stg
@@ -19,9 +19,9 @@ package org.eclipse.collections.impl.bag.mutable.primitive;
 
 import org.eclipse.collections.api.bag.primitive.Mutable<name>Bag;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * JUnit test for {@link Synchronized<name>Bag}.

diff --git a/...tions-code-generator/src/main/resources/test/bag/mutable/unmodifiablePrimitiveBagTest.stg b/...tions-code-generator/src/main/resources/test/bag/mutable/unmodifiablePrimitiveBagTest.stg
@@ -26,13 +26,13 @@ import org.eclipse.collections.api.tuple.primitive.<name>IntPair;
 import org.eclipse.collections.impl.block.factory.primitive.<name>Predicates;
 import org.eclipse.collections.impl.factory.primitive.<name>Bags;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * JUnit test for {@link Unmodifiable<name>Bag}.

diff --git a/...lections-code-generator/src/main/resources/test/block/factory/primitivePredicatesTest.stg b/...lections-code-generator/src/main/resources/test/block/factory/primitivePredicatesTest.stg
@@ -18,9 +18,9 @@ package org.eclipse.collections.impl.block.factory.primitive;
 
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Provides a set of common tests of predicates for <type> values.

diff --git a/...tions-code-generator/src/main/resources/test/block/function/primitiveCaseFunctionTest.stg b/...tions-code-generator/src/main/resources/test/block/function/primitiveCaseFunctionTest.stg
@@ -23,10 +23,10 @@ import org.eclipse.collections.impl.factory.primitive.<name>Lists;
 import org.eclipse.collections.impl.list.primitive.IntInterval;
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * This file was automatically generated from template file primitiveCaseFunctionTest.stg.

diff --git a/...r/src/main/resources/test/block/procedure/checked/checkedObjectPrimitiveProcedureTest.stg b/...r/src/main/resources/test/block/procedure/checked/checkedObjectPrimitiveProcedureTest.stg
@@ -18,9 +18,9 @@ package org.eclipse.collections.impl.block.procedure.checked.primitive;
 
 import java.io.IOException;
 
-import org.junit.Test;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Provides a set of common tests of checked procedures for Object and <type> values.

diff --git a/...r/src/main/resources/test/block/procedure/checked/checkedPrimitiveObjectProcedureTest.stg b/...r/src/main/resources/test/block/procedure/checked/checkedPrimitiveObjectProcedureTest.stg
@@ -18,9 +18,9 @@ package org.eclipse.collections.impl.block.procedure.checked.primitive;
 
 import java.io.IOException;
 
-import org.junit.Test;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Provides a set of common tests of checked procedures for <type> and Object values.

diff --git a/...rc/main/resources/test/block/procedure/checked/checkedPrimitivePrimitiveProcedureTest.stg b/...rc/main/resources/test/block/procedure/checked/checkedPrimitivePrimitiveProcedureTest.stg
@@ -21,9 +21,9 @@ body(type1, type2, name1, name2) ::= <<
 package org.eclipse.collections.impl.block.procedure.checked.primitive;
 
 import java.io.IOException;
-import org.junit.Test;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Provides a set of common tests of checked procedures for <type1> and <type2> values.

diff --git a/...nerator/src/main/resources/test/block/procedure/checked/checkedPrimitiveProcedureTest.stg b/...nerator/src/main/resources/test/block/procedure/checked/checkedPrimitiveProcedureTest.stg
@@ -18,9 +18,9 @@ package org.eclipse.collections.impl.block.procedure.checked.primitive;
 
 import java.io.IOException;
 
-import org.junit.Test;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Provides a set of common tests of checked procedures for <type> values.

diff --git a/...-code-generator/src/main/resources/test/block/procedure/collectPrimitiveProcedureTest.stg b/...-code-generator/src/main/resources/test/block/procedure/collectPrimitiveProcedureTest.stg
@@ -22,8 +22,8 @@ import org.eclipse.collections.api.list.primitive.Immutable<name>List;
 import org.eclipse.collections.api.list.primitive.Mutable<name>List;
 import org.eclipse.collections.impl.factory.primitive.<name>Lists;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * This file was automatically generated from template file CollectPrimitiveProcedureTest.stg.

diff --git a/...ons-code-generator/src/main/resources/test/block/procedure/primitiveCaseProcedureTest.stg b/...ons-code-generator/src/main/resources/test/block/procedure/primitiveCaseProcedureTest.stg
@@ -24,8 +24,8 @@ import org.eclipse.collections.api.list.primitive.Mutable<name>List;
 import org.eclipse.collections.impl.factory.primitive.<name>Lists;
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * This file was automatically generated from template file primitiveCaseProcedureTest.stg.

diff --git a/...ns-code-generator/src/main/resources/test/block/procedure/sumOfPrimitiveProcedureTest.stg b/...ns-code-generator/src/main/resources/test/block/procedure/sumOfPrimitiveProcedureTest.stg
@@ -21,8 +21,8 @@ package org.eclipse.collections.impl.block.procedure;
 
 import org.eclipse.collections.api.block.function.primitive.<name>Function;
 
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * JUnit test for {@link SumOf<name>Procedure}.

diff --git a/...main/resources/test/collection/immutable/abstractImmutablePrimitiveCollectionTestCase.stg b/...main/resources/test/collection/immutable/abstractImmutablePrimitiveCollectionTestCase.stg
@@ -22,9 +22,9 @@ import org.eclipse.collections.api.collection.primitive.Immutable<name>Collectio
 import org.eclipse.collections.api.collection.primitive.Mutable<name>Collection;
 import org.eclipse.collections.impl.collection.mutable.primitive.Abstract<name>IterableTestCase;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Abstract JUnit test for {@link Immutable<name>Collection}s.

diff --git a/...src/main/resources/test/collection/mutable/abstractMutablePrimitiveCollectionTestCase.stg b/...src/main/resources/test/collection/mutable/abstractMutablePrimitiveCollectionTestCase.stg
@@ -27,13 +27,13 @@ import org.eclipse.collections.impl.block.factory.primitive.<name>Predicates;
 import org.eclipse.collections.impl.list.mutable.primitive.<name>ArrayList;
 import org.eclipse.collections.impl.test.Verify;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNotSame;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 /**
  * Abstract JUnit test for {@link Mutable<name>Collection}s