You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/21 19:03:39 UTC

[commons-bsf] branch master updated: Use a String instead of building one.

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bsf.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a62aaa  Use a String instead of building one.
5a62aaa is described below

commit 5a62aaa29dd21cb43848d2c8998ae98d3900242f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 14:03:33 2020 -0500

    Use a String instead of building one.
---
 .../java/org/apache/bsf/util/EngineUtilsTest.java  |  6 +--
 src/test/java/org/apache/bsf/util/IOUtilsTest.java |  4 +-
 .../java/org/apache/bsf/util/StringUtilsTest.java  | 56 +++++++++++-----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/test/java/org/apache/bsf/util/EngineUtilsTest.java b/src/test/java/org/apache/bsf/util/EngineUtilsTest.java
index 26a1158..629e0fa 100644
--- a/src/test/java/org/apache/bsf/util/EngineUtilsTest.java
+++ b/src/test/java/org/apache/bsf/util/EngineUtilsTest.java
@@ -44,7 +44,7 @@ public class EngineUtilsTest extends TestCase {
 
     public void testCallBeanMethod() {
 
-        Object[] args = new Object[]{new String("MoreConfirmation")};
+        Object[] args = new Object[]{"MoreConfirmation"};
         final TestBean bean = new TestBean("TestBean");
 
         try {
@@ -65,7 +65,7 @@ public class EngineUtilsTest extends TestCase {
 
         assertEquals("MoreConfirmation",bean.getStringValue());
 
-        args = new Object[]{new String("aString"),new Integer(1)};
+        args = new Object[]{"aString",new Integer(1)};
 
         try {
             EngineUtils.callBeanMethod(bean,"setValue",args);
@@ -90,7 +90,7 @@ public class EngineUtilsTest extends TestCase {
 
     public void testCreateBean() throws BSFException {
 
-        final Object args[] = new Object[]{ new String("test") };
+        final Object args[] = new Object[]{ "test" };
 
         try {
             result = EngineUtils.createBean("org.apache.bsf.util.TestBean", args);
diff --git a/src/test/java/org/apache/bsf/util/IOUtilsTest.java b/src/test/java/org/apache/bsf/util/IOUtilsTest.java
index c4d7d32..0d00a20 100644
--- a/src/test/java/org/apache/bsf/util/IOUtilsTest.java
+++ b/src/test/java/org/apache/bsf/util/IOUtilsTest.java
@@ -95,7 +95,7 @@ public class IOUtilsTest extends TestCase {
         final StringReader sr = new StringReader(sw.toString());
         result = IOUtils.getStringFromReader(sr);
 
-        assertTrue(result.equals(new String("IOUtilsTest" + lineSeparator)));
+        assertTrue(result.equals(("IOUtilsTest" + lineSeparator)));
 
         final File myFile = File.createTempFile("Test", "txt");
 
@@ -107,7 +107,7 @@ public class IOUtilsTest extends TestCase {
         final FileReader fr = new FileReader(myFile);
         result = IOUtils.getStringFromReader(fr);
 
-        assertTrue(result.equals(new String("file name : Test.txt" +
+        assertTrue(result.equals(("file name : Test.txt" +
                                             lineSeparator)));
     }
 }
diff --git a/src/test/java/org/apache/bsf/util/StringUtilsTest.java b/src/test/java/org/apache/bsf/util/StringUtilsTest.java
index bd16592..6c5bbc2 100644
--- a/src/test/java/org/apache/bsf/util/StringUtilsTest.java
+++ b/src/test/java/org/apache/bsf/util/StringUtilsTest.java
@@ -90,8 +90,8 @@ public class StringUtilsTest extends TestCase {
 
     public void testClassNameToVarName() {
 
-        assertTrue((StringUtils.classNameToVarName("int")).equals(new String("int")));
-        assertTrue((StringUtils.classNameToVarName("int[][][]")).equals(new String("int_3D")));
+        assertTrue((StringUtils.classNameToVarName("int")).equals("int"));
+        assertTrue((StringUtils.classNameToVarName("int[][][]")).equals("int_3D"));
         assertNull((StringUtils.classNameToVarName("")));
     }
 
@@ -118,16 +118,16 @@ public class StringUtilsTest extends TestCase {
         String result;
 
         result = StringUtils.getChars(1, 'a');
-        assertTrue(result.equals(new String("a")));
+        assertTrue(result.equals("a"));
 
         result = StringUtils.getChars(1, ' ');
-        assertTrue(result.equals(new String(" ")));
+        assertTrue(result.equals(" "));
 
         result = StringUtils.getChars(10, ' ');
-        assertTrue(result.equals(new String("          ")));
+        assertTrue(result.equals("          "));
 
         result = StringUtils.getChars(-1, 'a');
-        assertTrue(result.equals(new String("")));
+        assertTrue(result.equals(""));
 
     }
 
@@ -135,16 +135,16 @@ public class StringUtilsTest extends TestCase {
         String result;
 
         result = StringUtils.getClassName((new Byte("0")).getClass());
-        assertTrue(result.equals(new String("java.lang.Byte")));
+        assertTrue(result.equals("java.lang.Byte"));
 
         result = StringUtils.getClassName((new Byte[0][0][0]).getClass());
-        assertTrue(result.equals(new String("java.lang.Byte[][][]")));
+        assertTrue(result.equals("java.lang.Byte[][][]"));
 
-        result = StringUtils.getClassName((new String("")).getClass());
-        assertTrue(result.equals(new String("java.lang.String")));
+        result = StringUtils.getClassName(("").getClass());
+        assertTrue(result.equals("java.lang.String"));
 
         result = StringUtils.getClassName((new String[0][0][0]).getClass());
-        assertTrue(result.equals(new String("java.lang.String[][][]")));
+        assertTrue(result.equals("java.lang.String[][][]"));
 
     }
 
@@ -157,10 +157,10 @@ public class StringUtilsTest extends TestCase {
         vector.add(new Character('b'));
 
         result = StringUtils.getCommaListFromVector(vector);
-        assertTrue(result.equals(new String("a, b")));
+        assertTrue(result.equals("a, b"));
 
         result = StringUtils.getCommaListFromVector(new Vector());
-        assertTrue(result.equals(new String("")));
+        assertTrue(result.equals(""));
 
     }
 
@@ -179,7 +179,7 @@ public class StringUtilsTest extends TestCase {
             reader = StringUtils.getContentAsReader(myFile.toURL());
             final BufferedReader bf = new BufferedReader(reader);
             assertTrue(bf.readLine().equals(
-                                            new String("file name : Test.txt")));
+                                            "file name : Test.txt"));
 
         }
 
@@ -195,7 +195,7 @@ public class StringUtilsTest extends TestCase {
         pw.flush();
 
         result = StringUtils.getContentAsString(myFile.toURL());
-        assertTrue(result.equals(new String("file name : Test.txt" +
+        assertTrue(result.equals(("file name : Test.txt" +
                                             lineSeparator)));
 
     }
@@ -204,27 +204,27 @@ public class StringUtilsTest extends TestCase {
         String result;
 
         result = StringUtils.getSafeString("test-string");
-        assertTrue(result.equals(new String("\"test-string\"" +
+        assertTrue(result.equals(("\"test-string\"" +
                                             lineSeparator)));
         //checks for an empty string ..
         result = StringUtils.getSafeString("");
-        assertTrue(result.equals(new String("\"\"" +
+        assertTrue(result.equals(("\"\"" +
                                             lineSeparator)));
 
         result = StringUtils.getSafeString("\n");
-        assertTrue(result.equals(new String("\"\"" +
+        assertTrue(result.equals(("\"\"" +
                                             lineSeparator)));
 
         result = StringUtils.getSafeString("\r");
-        assertTrue(result.equals(new String("\"\"" +
+        assertTrue(result.equals(("\"\"" +
                                             lineSeparator)));
 
         result = StringUtils.getSafeString("\\n");
-        assertTrue(result.equals(new String("\"\\\\n\"" +
+        assertTrue(result.equals(("\"\\\\n\"" +
                                             lineSeparator)));
 
         result = StringUtils.getSafeString("\\r");
-        assertTrue(result.equals(new String("\"\\\\r\"" +
+        assertTrue(result.equals(("\"\\\\r\"" +
                                             lineSeparator)));
 
     }
@@ -232,25 +232,25 @@ public class StringUtilsTest extends TestCase {
     public void testGetValidIdentifierName(){
 
         assertTrue((StringUtils.getValidIdentifierName("identifier")).equals(
-                                                                             new String("identifier")));
+                                                                             "identifier"));
 
         assertTrue((StringUtils.getValidIdentifierName("0identifier")).equals(
-                                                                              new String("_identifier")));
+                                                                              "_identifier"));
 
         assertTrue((StringUtils.getValidIdentifierName("i0dentifier")).equals(
-                                                                              new String("i0dentifier")));
+                                                                              "i0dentifier"));
 
         assertTrue((StringUtils.getValidIdentifierName("$identifier")).equals(
-                                                                              new String("$identifier")));
+                                                                              "$identifier"));
 
         assertTrue((StringUtils.getValidIdentifierName("identi$fier")).equals(
-                                                                              new String("identi$fier")));
+                                                                              "identi$fier"));
 
         assertTrue((StringUtils.getValidIdentifierName(" identifier")).equals(
-                                                                              new String("_identifier")));
+                                                                              "_identifier"));
 
         assertTrue((StringUtils.getValidIdentifierName("identi fier")).equals(
-                                                                              new String("identi_fier")));
+                                                                              "identi_fier"));
 
         // checks for a empty string which should return null
         assertNull(StringUtils.getValidIdentifierName(""));