Skip to content

Commit fd9b20e

Browse files
committed
test(logging): introduce class-local formatForTest wrapper in ITSinkTest
Replaces static import of RemoteLoggingHelper.formatForTest with a class-local helper method that automatically prepends TEST_SINK_PREFIX, ensuring a standardized log entry and test sink prefix across all test cases within ITSinkTest. BUG=b/482174880 TAG=agy CONV=d4a74f94-579a-4c3f-96c3-f90fcbc6c699
1 parent 3b405ad commit fd9b20e

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

  • java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/it

java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITSinkTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.logging.it;
1818

19-
import static com.google.cloud.logging.testing.RemoteLoggingHelper.formatForTest;
2019
import static org.junit.Assert.assertEquals;
2120
import static org.junit.Assert.assertFalse;
2221
import static org.junit.Assert.assertNotNull;
@@ -30,6 +29,7 @@
3029
import com.google.cloud.logging.LoggingException;
3130
import com.google.cloud.logging.Sink;
3231
import com.google.cloud.logging.SinkInfo;
32+
import com.google.cloud.logging.testing.RemoteLoggingHelper;
3333
import com.google.common.collect.Sets;
3434
import java.util.Iterator;
3535
import java.util.Set;
@@ -40,6 +40,10 @@ public class ITSinkTest extends BaseSystemTest {
4040

4141
private static final String TEST_SINK_PREFIX = "test-";
4242

43+
private static String formatForTest(String name) {
44+
return RemoteLoggingHelper.formatForTest(TEST_SINK_PREFIX + name);
45+
}
46+
4347
@BeforeClass
4448
public static void setUp() {
4549
// Cleanup all stucked sinks if any
@@ -61,7 +65,7 @@ public static void setUp() {
6165

6266
@Test
6367
public void testCreateGetUpdateAndDeleteSink() {
64-
String name = formatForTest("test-create-get-update-sink");
68+
String name = formatForTest("create-get-update-sink");
6569
SinkInfo sinkInfo =
6670
SinkInfo.newBuilder(name, SinkInfo.Destination.DatasetDestination.of("dataset"))
6771
.setFilter("severity>=ERROR")
@@ -89,7 +93,7 @@ public void testCreateGetUpdateAndDeleteSink() {
8993

9094
@Test
9195
public void testUpdateNonExistingSink() {
92-
String name = formatForTest("test-update-non-existing-sink");
96+
String name = formatForTest("update-non-existing-sink");
9397
SinkInfo sinkInfo =
9498
SinkInfo.newBuilder(name, SinkInfo.Destination.DatasetDestination.of("dataset"))
9599
.setFilter("severity>=ERROR")
@@ -106,8 +110,8 @@ public void testUpdateNonExistingSink() {
106110

107111
@Test
108112
public void testListSinks() throws InterruptedException {
109-
String firstName = formatForTest("test-list-sinks-1");
110-
String secondName = formatForTest("test-list-sinks-2");
113+
String firstName = formatForTest("list-sinks-1");
114+
String secondName = formatForTest("list-sinks-2");
111115
Sink firstSink =
112116
logging.create(
113117
SinkInfo.of(firstName, SinkInfo.Destination.DatasetDestination.of("dataset")));

0 commit comments

Comments
 (0)