[geode] branch develop updated: GEODE-5686 Remove LocalizedStrings

[bschuchardt]

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

bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new ce32de9  GEODE-5686 Remove LocalizedStrings
ce32de9 is described below

commit ce32de93964649dc590735d93f7005f1c103050e
Author: Bruce Schuchardt <bschucha...@pivotal.io>
AuthorDate: Fri Nov 2 12:36:59 2018 -0700

    GEODE-5686 Remove LocalizedStrings
    
    Fixing two tests to expect exception text that has been slightly
    changed.
---
 .../execute/PRClientServerRegionFunctionExecutionDUnitTest.java   | 4 ++--
 .../cli/commands/CreateAsyncEventQueueCommandDUnitTest.java       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 60b0910..4eeaea6 100755
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -1483,7 +1483,7 @@ public class 
PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     try {
       cache.getLogger()
           .info("<ExpectedException action=add>"
-              + "Could not create an instance of  
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"
+              + "Could not create an instance of 
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"
               + "</ExpectedException>");
       dataSet.withFilter(testKeysSet).setArguments(new UnDeserializable())
           .execute(new FunctionAdapter() {
@@ -1507,7 +1507,7 @@ public class 
PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
           });
     } catch (Exception expected) {
       if (!expected.getCause().getMessage().contains(
-          "Could not create an instance of  
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"))
 {
+          "Could not create an instance of 
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"))
 {
         throw expected;
       } ;
     } finally {
diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
index 28a491b..13b2523 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
@@ -82,15 +82,15 @@ public class CreateAsyncEventQueueCommandDUnitTest {
         .tableHasRowWithValues("Member", "Status", "Message", "server-2", 
"OK", "Success");
 
     IgnoredException
-        .addIgnoredException("java.lang.IllegalStateException: A GatewaySender 
with id  "
-            + "AsyncEventQueue_queue  is already defined in this cache.");
+        .addIgnoredException("java.lang.IllegalStateException: A GatewaySender 
with id "
+            + "AsyncEventQueue_queue is already defined in this cache.");
     // create a queue with the same id would result in failure
     gfsh.executeAndAssertThat(VALID_COMMAND + " --id=queue").statusIsError()
         .tableHasRowCount("Member", 2)
         .tableHasColumnWithExactValuesInAnyOrder("Status", "ERROR", "ERROR")
         .tableHasColumnWithExactValuesInAnyOrder("Message",
-            " java.lang.IllegalStateException: A GatewaySender with id  
AsyncEventQueue_queue  is already defined in this cache.",
-            " java.lang.IllegalStateException: A GatewaySender with id  
AsyncEventQueue_queue  is already defined in this cache.");
+            " java.lang.IllegalStateException: A GatewaySender with id 
AsyncEventQueue_queue is already defined in this cache.",
+            " java.lang.IllegalStateException: A GatewaySender with id 
AsyncEventQueue_queue is already defined in this cache.");
 
     gfsh.executeAndAssertThat("create disk-store --name=diskStore2 
--dir=diskstore");
     locator.waitUntilDiskStoreIsReadyOnExactlyThisManyServers("diskStore2", 2);