Revert "Issue676 author last (#13625)" (#14123)

This reverts commit 72d9c1d.

Author: Siedlerchr

jablib/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java

@@ -46,7 +46,7 @@
  * <code>2017_Kitsune_123</code> when expanded using the BibTeX entry <code>@Article{ authors = {O. Kitsune}, year = {2017},
  * pages={123-6}}</code>.
  * <p>
- * The embedding in JabRef is explained at <a href="https://docs.jabref.org/setup/citationkeypatterns">Customize the citation key generator</a>.
+ * The embedding in JabRef is explained at <a href="https://docs.jabref.org/setup/citationkeypattern">Customize the citation key generator</a>.
  * </p>
  */
 public class BracketedPattern {
@@ -807,8 +807,7 @@ private static String firstAuthorVonAndLast(AuthorList authorList) {
      * @param authorList an {@link AuthorList}
      * @return the surname of an author/editor
      */
-    @VisibleForTesting
-    static String lastAuthor(AuthorList authorList) {
+    private static String lastAuthor(AuthorList authorList) {
         if (authorList.isEmpty()) {
             return "";
         }
@@ -1222,7 +1221,7 @@ protected static List<String> parseFieldAndModifiers(String arg) {
 
     /**
      * <p>
-     * An author or editor may be an institution not a person. In that case the key generator builds very long keys,
+     * An author or editor may be and institution not a person. In that case the key generator builds very long keys,
      * e.g.: for &ldquo;The Attributed Graph Grammar System (AGG)&rdquo; -> &ldquo;TheAttributedGraphGrammarSystemAGG&rdquo;.
      * </p>
      *

jablib/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java

@@ -179,8 +179,8 @@ static Stream<Arguments> authShort() {
 
     @ParameterizedTest
     @MethodSource
-    void authShort(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authShort(list));
+    void authIni1(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 1));
     }
 
     static Stream<Arguments> authIni1() {
@@ -204,8 +204,8 @@ static Stream<Arguments> authIni1() {
 
     @ParameterizedTest
     @MethodSource
-    void authIni1(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authIniN(list, 1));
+    void authIni2(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 2));
     }
 
     static Stream<Arguments> authIni2() {
@@ -230,8 +230,8 @@ static Stream<Arguments> authIni2() {
 
     @ParameterizedTest
     @MethodSource
-    void authIni2(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authIniN(list, 2));
+    void authIni3(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 3));
     }
 
     static Stream<Arguments> authIni3() {
@@ -256,8 +256,8 @@ static Stream<Arguments> authIni3() {
 
     @ParameterizedTest
     @MethodSource
-    void authIni3(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authIniN(list, 3));
+    void authIni4(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 4));
     }
 
     static Stream<Arguments> authIni4() {
@@ -281,8 +281,8 @@ static Stream<Arguments> authIni4() {
 
     @ParameterizedTest
     @MethodSource
-    void authIni4(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authIniN(list, 4));
+    void authEtAlDotDotEal(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authEtal(list, ".", ".etal"));
     }
 
     static Stream<Arguments> authEtAlDotDotEal() {
@@ -306,8 +306,8 @@ static Stream<Arguments> authEtAlDotDotEal() {
 
     @ParameterizedTest
     @MethodSource
-    void authEtAlDotDotEal(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authEtal(list, ".", ".etal"));
+    void authAuthEa(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authAuthEa(list));
     }
 
     static Stream<Arguments> authAuthEa() {
@@ -331,26 +331,8 @@ static Stream<Arguments> authAuthEa() {
 
     @ParameterizedTest
     @MethodSource
-    void authAuthEa(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.authAuthEa(list));
-    }
-
-    @ParameterizedTest
-    @CsvSource({
-            "'Newton', 'Isaac Newton'",
-            "'Maxwell', 'Isaac Newton and James Maxwell'",
-            "'Einstein', 'Isaac Newton and James Maxwell and Albert Einstein'",
-            "'Bohr', 'Isaac Newton and James Maxwell and Albert Einstein and N. Bohr'",
-            "'Aachen', 'Aachen'",
-            "'Berlin', 'Aachen and Berlin'",
-            "'Chemnitz', 'Aachen and Berlin and Chemnitz'",
-            "'Düsseldorf', 'Aachen and Berlin and Chemnitz and Düsseldorf'",
-            "'Essen', 'Aachen and Berlin and Chemnitz and Düsseldorf and Essen'",
-            "'Aalst', 'Wil van der Aalst",
-            "'Lessen', 'Wil van der Aalst and Tammo van Lessen'"
-    })
-    void authLast(String expected, AuthorList list) {
-        assertEquals(expected, BracketedPattern.lastAuthor(list));
+    void authShort(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authShort(list));
     }
 
     @ParameterizedTest