Merge branch 'renovate/com.google.cloud-native-image-shared-config-1.x' of https://github.com/renovate-bot/google-http-java-client into renovate/com.google.cloud-native-image-shared-config-1.x

Author: diegomarquezp

google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java

@@ -14,12 +14,17 @@
 
 package com.google.api.client.json.jackson2;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
 import com.google.api.client.test.json.AbstractJsonFactoryTest;
 import com.google.api.client.util.StringUtils;
 import java.io.IOException;
 import java.util.ArrayList;
+import org.junit.Test;
 
 /**
  * Tests {@link JacksonFactory}.
@@ -28,38 +33,41 @@
  */
 public class JacksonFactoryTest extends AbstractJsonFactoryTest {
 
-  private static final String JSON_ENTRY_PRETTY =
-      "{" + StringUtils.LINE_SEPARATOR + "  \"title\" : \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
-  private static final String JSON_FEED_PRETTY =
-      "{"
-          + StringUtils.LINE_SEPARATOR
-          + "  \"entries\" : [ {"
-          + StringUtils.LINE_SEPARATOR
-          + "    \"title\" : \"foo\""
-          + StringUtils.LINE_SEPARATOR
-          + "  }, {"
-          + StringUtils.LINE_SEPARATOR
-          + "    \"title\" : \"bar\""
-          + StringUtils.LINE_SEPARATOR
-          + "  } ]"
-          + StringUtils.LINE_SEPARATOR
-          + "}";
+  private static final String JSON_ENTRY_PRETTY;
+  private static final String JSON_FEED_PRETTY;
 
-  public JacksonFactoryTest(String name) {
-    super(name);
+  static {
+    JSON_ENTRY_PRETTY =
+        "{" + StringUtils.LINE_SEPARATOR + "  \"title\" : \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
+    JSON_FEED_PRETTY =
+        "{"
+            + StringUtils.LINE_SEPARATOR
+            + "  \"entries\" : [ {"
+            + StringUtils.LINE_SEPARATOR
+            + "    \"title\" : \"foo\""
+            + StringUtils.LINE_SEPARATOR
+            + "  }, {"
+            + StringUtils.LINE_SEPARATOR
+            + "    \"title\" : \"bar\""
+            + StringUtils.LINE_SEPARATOR
+            + "  } ]"
+            + StringUtils.LINE_SEPARATOR
+            + "}";
   }
 
   @Override
   protected JsonFactory newFactory() {
     return new JacksonFactory();
   }
 
+  @Test
   public final void testToPrettyString_entry() throws Exception {
     Entry entry = new Entry();
     entry.title = "foo";
     assertEquals(JSON_ENTRY_PRETTY, newFactory().toPrettyString(entry));
   }
 
+  @Test
   public final void testToPrettyString_Feed() throws Exception {
     Feed feed = new Feed();
     Entry entryFoo = new Entry();
@@ -72,11 +80,13 @@ public final void testToPrettyString_Feed() throws Exception {
     assertEquals(JSON_FEED_PRETTY, newFactory().toPrettyString(feed));
   }
 
+  @Test
   public final void testParse_directValue() throws Exception {
     JsonParser parser = newFactory().createJsonParser("123");
     assertEquals(123, parser.parse(Integer.class, true));
   }
 
+  @Test
   public final void testGetByteValue() throws IOException {
     JsonParser parser = newFactory().createJsonParser("123");
 

google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonGeneratorTest.java

@@ -21,7 +21,11 @@
 
 public class JacksonGeneratorTest extends AbstractJsonGeneratorTest {
 
-  private static final JacksonFactory FACTORY = new JacksonFactory();
+  private static final JacksonFactory FACTORY;
+
+  static {
+    FACTORY = new JacksonFactory();
+  }
 
   @Override
   protected JsonGenerator newGenerator(Writer writer) throws IOException {