add helper method to create comparison expression

neozwu · neozwu · commit ca560c7ceb62 · 2017-06-14T11:58:01.000-07:00
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
@@ -77,6 +77,11 @@ public abstract class BaseSystemTest {
    */
   protected abstract String formatForTest(String resourceName);
 
+  /**
+   * Creates a comparison expression for logging filter.
+   */
+  protected abstract <V> String createComparisonExpression(String name, String op, V value);
+
   @Test
   public void testCreateGetUpdateAndDeleteSink() {
     String name = formatForTest("test-create-get-update-sink");
@@ -356,7 +361,7 @@ public void testWriteAndListLogEntries() throws InterruptedException {
         .build();
     logging().write(ImmutableList.of(firstEntry));
     logging().write(ImmutableList.of(secondEntry));
-    String filter = "logName = " + logName.toString();
+    String filter = createComparisonExpression("logName", "=", logName);
     EntryListOption[] options = {EntryListOption.filter(filter), EntryListOption.pageSize(1)};
     Page<LogEntry> page = logging().listLogEntries(options);
     while (Iterators.size(page.iterateAll().iterator()) < 2) {
@@ -416,7 +421,7 @@ public void testWriteAndListLogEntriesAsync() throws InterruptedException, Execu
         WriteOption.resource(MonitoredResource.newBuilder("global").build()),
         WriteOption.logName(logId));
     logging().flush();
-    String filter = "logName = " + logName.toString();
+    String filter = createComparisonExpression("logName", "=", logName);
     EntryListOption[] options = {EntryListOption.filter(filter), EntryListOption.pageSize(1)};
     AsyncPage<LogEntry> page = logging().listLogEntriesAsync(options).get();
     while (Iterators.size(page.iterateAll().iterator()) < 2) {
@@ -457,7 +462,7 @@ public void testDeleteNonExistingLog() {
 
   @Test
   public void testDeleteNonExistingLogAsync() throws ExecutionException, InterruptedException {
-    String logId= formatForTest("test-delete-non-existing-log-async");
+    String logId = formatForTest("test-delete-non-existing-log-async");
     assertFalse(logging().deleteLogAsync(logId).get());
   }
 
@@ -472,7 +477,7 @@ public void testLoggingHandler() throws InterruptedException {
     logger.addHandler(handler);
     logger.setLevel(Level.INFO);
     logger.info("Message");
-    String filter = "logName = " + logName.toString();
+    String filter = createComparisonExpression("logName", "=", logName);
     Iterator<LogEntry> iterator =
         logging().listLogEntries(EntryListOption.filter(filter)).iterateAll().iterator();
     while (!iterator.hasNext()) {
@@ -516,7 +521,7 @@ public void testSyncLoggingHandler() throws InterruptedException {
     logger.addHandler(handler);
     logger.setLevel(Level.WARNING);
     logger.warning("Message");
-    String filter = "logName = " + logName.toString();
+    String filter = createComparisonExpression("logName", "=", logName);
     Iterator<LogEntry> iterator =
         logging().listLogEntries(EntryListOption.filter(filter)).iterateAll().iterator();
     while (!iterator.hasNext()) {
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java
@@ -52,4 +52,16 @@ protected Logging logging() {
   protected String formatForTest(String resourceName) {
     return RemoteLoggingHelper.formatForTest(resourceName);
   }
+
+  /**
+   * Creates a comparison expression for logging filter.
+   * comparison = name OP value OP = "<=" | "<" * | ">=" | ">" | "!=" | "=" | ":"
+   *
+   * @see <a href="https://cloud.google.com/logging/docs/view/advanced_filters">Advanced Logs
+   *     Filters Documentation</a>
+   */
+  @Override
+  protected <V> String createComparisonExpression(String name, String op, V value) {
+    return name + " "  + op + " " + "\"" + value.toString() + "\"";
+  }
 }
