summary() should never be longer than a line.

neo4j · Oct 24, 2016 · 524264c · 524264c
1 parent aea196c
commit 524264c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/community/command-line/src/main/java/org/neo4j/commandline/admin/Usage.java b/community/command-line/src/main/java/org/neo4j/commandline/admin/Usage.java
@@ -63,10 +63,7 @@ public void print( Consumer<String> output )
             String arguments = command.arguments().map( ( s ) -> " " + s ).orElse( "" );
             output.accept( format( "%s %s%s", scriptName, command.name(), arguments ) );
             output.accept( "" );
-            for ( String line : splitLongLine( command.summary(), 80 ) )
+            output.accept( "    " + command.summary() );
-            {
-                output.accept( "    " + line );
-            }
             output.accept( "" );
         }
     }

diff --git a/community/command-line/src/test/java/org/neo4j/commandline/admin/UsageTest.java b/community/command-line/src/test/java/org/neo4j/commandline/admin/UsageTest.java
@@ -49,7 +49,7 @@ public void shouldPrintUsageForAllCommands()
                         new StubProvider( "restore",
                                 Optional.of( "---from <backup-directory> --database=<database-name> [--force]" ),
                                 "Restores a database backed up using the neo4j-backup tool." ),
-                        new StubProvider( "bam", Optional.empty(), "Some description" )
+                        new StubProvider( "bam", Optional.empty(), "A summary" )
                 };
         final Usage usage = new Usage( "neo4j-admin", new CannedLocator( commands ) );
         usage.print( out );
@@ -64,21 +64,21 @@ public void shouldPrintUsageForAllCommands()
         ordered.verify( out ).accept( "" );
         ordered.verify( out ).accept( "neo4j-admin bam" );
         ordered.verify( out ).accept( "" );
-        ordered.verify( out ).accept( "    Some description" );
+        ordered.verify( out ).accept( "    A summary" );
         ordered.verify( out ).accept( "" );
         ordered.verifyNoMoreInteractions();
     }
 
     private static class StubProvider extends AdminCommand.Provider
     {
         private final Optional<String> arguments;
-        private final String description;
+        private final String summary;
 
-        public StubProvider( String name, Optional<String> arguments, String description )
+        public StubProvider( String name, Optional<String> arguments, String summary )
         {
             super( name );
             this.arguments = arguments;
-            this.description = description;
+            this.summary = summary;
         }
 
         @Override
@@ -90,13 +90,13 @@ public Optional<String> arguments()
         @Override
         public String description()
         {
-            return description;
+            return "";
         }
 
         @Override
         public String summary()
         {
-            return description;
+            return summary;
         }
 
         @Override