[logging-log4j2] branch release-2.x updated: LOG4J2-3004 Revert TypeConverterRegistryTest breaking LoggersPluginTest and ValidatingPluginWithFailoverTest.

[vy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new ede7b7a  LOG4J2-3004 Revert TypeConverterRegistryTest breaking LoggersPluginTest and ValidatingPluginWithFailoverTest.
ede7b7a is described below

commit ede7b7aaeb92341cb69c910ea1fec11d9ce3a03f
Author: Volkan Yazici <vo...@gmail.com>
AuthorDate: Mon Apr 5 22:06:06 2021 +0200

    LOG4J2-3004 Revert TypeConverterRegistryTest breaking LoggersPluginTest and ValidatingPluginWithFailoverTest.
---
 .../plugins/convert/TypeConverterRegistryTest.java | 78 ----------------------
 1 file changed, 78 deletions(-)

diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistryTest.java
index e00ce11..6f03074 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistryTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistryTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.logging.log4j.core.config.plugins.convert;
 
-import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.instanceOf;
@@ -79,81 +78,4 @@ public class TypeConverterRegistryTest {
         assertEquals(Foo.THE, fooTypeConverter.convert("THE"));
     }
 
-    public static final class CustomTestClass1 {
-
-        private CustomTestClass1() {}
-
-    }
-
-    @Plugin(name = "CustomTestClass1Converter1", category = TypeConverters.CATEGORY)
-    public static final class CustomTestClass1Converter1
-            implements TypeConverter<CustomTestClass1> {
-
-        @Override
-        public CustomTestClass1 convert(final String ignored) {
-            return new CustomTestClass1();
-        }
-
-    }
-
-    @Plugin(name = "CustomTestClass1Converter2", category = TypeConverters.CATEGORY)
-    public static final class CustomTestClass1Converter2
-            implements TypeConverter<CustomTestClass1>, Comparable<Object> {
-
-        @Override
-        public CustomTestClass1 convert(final String ignored) {
-            return new CustomTestClass1();
-        }
-
-        @Override
-        public int compareTo(@SuppressWarnings("NullableProblems") final Object converter) {
-            return -1;
-        }
-
-    }
-
-    @Test
-    public void testMultipleComparableConverters() {
-        final TypeConverter<?> converter = TypeConverterRegistry
-                .getInstance()
-                .findCompatibleConverter(CustomTestClass1.class);
-        assertThat(converter, instanceOf(CustomTestClass1Converter2.class));
-    }
-
-    public static final class CustomTestClass2 {
-
-        private CustomTestClass2() {}
-
-    }
-
-    @Plugin(name = "CustomTestClass2Converter1", category = TypeConverters.CATEGORY)
-    public static final class CustomTestClass2Converter1
-            implements TypeConverter<CustomTestClass2> {
-
-        @Override
-        public CustomTestClass2 convert(final String ignored) {
-            return new CustomTestClass2();
-        }
-
-    }
-
-    @Plugin(name = "CustomTestClass2Converter2", category = TypeConverters.CATEGORY)
-    public static final class CustomTestClass2Converter2
-            implements TypeConverter<CustomTestClass2> {
-
-        @Override
-        public CustomTestClass2 convert(final String ignored) {
-            return new CustomTestClass2();
-        }
-
-    }
-
-    @Test
-    public void testMultipleIncomparableConverters() {
-        final TypeConverter<?> converter = TypeConverterRegistry
-                .getInstance()
-                .findCompatibleConverter(CustomTestClass2.class);
-        assertThat(converter, instanceOf(CustomTestClass2Converter1.class));
-    }
-
 }