[#1396][#1401] update RELEASE-NOTES, fix failing tests

remkop · Feb 10, 2022 · dc4dc7f · dc4dc7f
1 parent 98f2647
commit dc4dc7f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,35 @@
 # picocli Release Notes
 
+# <a name="4.7.0"></a> Picocli 4.7.0 (UNRELEASED)
+The picocli community is pleased to announce picocli 4.7.0.
+
+This release includes bugfixes and enhancements.
+
+
+This is the seventy-nineth public release.
+Picocli follows [semantic versioning](http://semver.org/).
+Artifacts in this release are signed by Remko Popma (6601 E5C0 8DCC BB96).
+
+## <a name="4.7.0-toc"></a> Table of Contents
+* [New and noteworthy](#4.7.0-new)
+* [Fixed issues](#4.7.0-fixes)
+* [Deprecations](#4.7.0-deprecated)
+* [Potential breaking changes](#4.7.0-breaking-changes)
+
+## <a name="4.7.0-new"></a> New and Noteworthy
+
+
+## <a name="4.7.0-fixes"></a> Fixed issues
+[#1396][#1401] API: Support generic types in containers (e.g. List, Map). Thanks to [Michał Górniewski](https://github.com/mgorniew) for the pull request.
+
+
+
+## <a name="4.7.0-deprecated"></a> Deprecations
+No features were deprecated in this release.
+
+## <a name="4.7.0-breaking-changes"></a> Potential breaking changes
+This release has no breaking changes.
+
 
 # <a name="4.6.3"></a> Picocli 4.6.3
 The picocli community is pleased to announce picocli 4.6.3.

diff --git a/src/test/java/picocli/GenericTest.java b/src/test/java/picocli/GenericTest.java
@@ -8,8 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 import static picocli.CommandLine.ITypeConverter;
 import static picocli.CommandLine.Parameters;
 
@@ -35,7 +34,6 @@ public String toString() {
     }
 
     static final class GenericValueConverter implements ITypeConverter<GenericValue<?>> {
-
         public GenericValue<?> convert(String value) throws Exception {
             if (value.startsWith("s")) {
                 return new GenericValue<String>(value);
@@ -68,7 +66,9 @@ class NoConverterApp {
             CommandLine.populateCommand(new NoConverterApp(), "sOne", "15");
             fail("Expected exception");
         } catch (MissingTypeConverterException ex) {
-            assertEquals("No TypeConverter registered for picocli.GenericTest$GenericValue of field java.util.List<picocli.GenericTest$GenericValue<?>> picocli.GenericTest$1NoConverterApp.values", ex.getMessage());
+            String j8errMsg = "No TypeConverter registered for picocli.GenericTest$GenericValue of field java.util.List<picocli.GenericTest.picocli.GenericTest$GenericValue<?>> picocli.GenericTest$1NoConverterApp.values";
+            String j11errMsg = "No TypeConverter registered for picocli.GenericTest$GenericValue of field java.util.List<picocli.GenericTest$GenericValue<?>> picocli.GenericTest$1NoConverterApp.values";
+            assertTrue(ex.getMessage(),j8errMsg.equals(ex.getMessage()) || j11errMsg.equals(ex.getMessage()));
         }
     }
 
@@ -80,8 +80,6 @@ class NoConverterApp {
         }
         @SuppressWarnings("rawtypes")
         class GenericConverter implements ITypeConverter<GenericValue> {
-
-            @Override
             public GenericValue convert(String value) throws Exception {
                 return new GenericValue("abc");
             }

diff --git a/src/test/java/picocli/ModelTypedMemberTest.java b/src/test/java/picocli/ModelTypedMemberTest.java
@@ -1,5 +1,6 @@
 package picocli;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ProvideSystemProperty;
@@ -21,6 +22,7 @@ public class ModelTypedMemberTest {
     @Rule
     public final ProvideSystemProperty ansiOFF = new ProvideSystemProperty("picocli.ansi", "false");
 
+    @Ignore("No longer expected to fail after [#1396][#1401]")
     @Test
     public void testInferTypes() {
         class App {