Skip to content

Commit 70417fc

Browse files
author
Praful Makani
authored
refactor(samples): add logs and remove redundant code (#716)
* refactor(samples): add logs and remove redundant code * refactor(samples): fix npe for tablename
1 parent b75b95b commit 70417fc

File tree

116 files changed

+1230
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1230
-489
lines changed

samples/snippets/src/test/java/com/example/bigquery/UpdateTableRequirePartitionFilter.java renamed to samples/snippets/src/main/java/com/example/bigquery/UpdateTableRequirePartitionFilter.java

File renamed without changes.

‎samples/snippets/src/test/java/com/example/bigquery/AddColumnLoadAppendIT.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.util.ArrayList;
2727
import java.util.List;
2828
import java.util.UUID;
29+
import java.util.logging.Level;
30+
import java.util.logging.Logger;
2931
import org.junit.After;
3032
import org.junit.Assert;
3133
import org.junit.Before;
@@ -34,10 +36,12 @@
3436

3537
public class AddColumnLoadAppendIT {
3638

39+
private final Logger log = Logger.getLogger(this.getClass().getName());
3740
private String tableName;
3841
private Schema schema;
3942
private ByteArrayOutputStream bout;
4043
private PrintStream out;
44+
private PrintStream originalPrintStream;
4145

4246
private static final String BIGQUERY_DATASET_NAME = requireEnvVar("BIGQUERY_DATASET_NAME");
4347

@@ -58,6 +62,7 @@ public static void checkRequirements() {
5862
public void setUp() {
5963
bout = new ByteArrayOutputStream();
6064
out = new PrintStream(bout);
65+
originalPrintStream = System.out;
6166
System.setOut(out);
6267

6368
// create a test table.
@@ -69,17 +74,16 @@ public void setUp() {
6974
.build());
7075

7176
CreateTable.createTable(BIGQUERY_DATASET_NAME, tableName, schema);
72-
73-
bout = new ByteArrayOutputStream();
74-
out = new PrintStream(bout);
75-
System.setOut(out);
7677
}
7778

7879
@After
7980
public void tearDown() {
8081
// Clean up
8182
DeleteTable.deleteTable(BIGQUERY_DATASET_NAME, tableName);
82-
System.setOut(null);
83+
// restores print statements in the original method
84+
System.out.flush();
85+
System.setOut(originalPrintStream);
86+
log.log(Level.INFO, "\n" + bout.toString());
8387
}
8488

8589
@Test

‎samples/snippets/src/test/java/com/example/bigquery/AddEmptyColumnIT.java‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@
2525
import java.io.ByteArrayOutputStream;
2626
import java.io.PrintStream;
2727
import java.util.UUID;
28+
import java.util.logging.Level;
29+
import java.util.logging.Logger;
2830
import org.junit.After;
2931
import org.junit.Before;
3032
import org.junit.BeforeClass;
3133
import org.junit.Test;
3234

3335
public class AddEmptyColumnIT {
36+
37+
private final Logger log = Logger.getLogger(this.getClass().getName());
38+
private String tableName;
3439
private ByteArrayOutputStream bout;
3540
private PrintStream out;
41+
private PrintStream originalPrintStream;
3642

3743
private static final String BIGQUERY_DATASET_NAME = System.getenv("BIGQUERY_DATASET_NAME");
3844

@@ -48,28 +54,34 @@ public static void checkRequirements() {
4854
}
4955

5056
@Before
51-
public void setUp() throws Exception {
57+
public void setUp() {
5258
bout = new ByteArrayOutputStream();
5359
out = new PrintStream(bout);
60+
originalPrintStream = System.out;
5461
System.setOut(out);
55-
}
56-
57-
@After
58-
public void tearDown() {
59-
System.setOut(null);
60-
}
6162

62-
@Test
63-
public void addEmptyColumn() {
64-
String tableName = "AddEmptyColumnTestTable_" + UUID.randomUUID().toString().replace('-', '_');
63+
tableName = "AddEmptyColumnTestTable_" + UUID.randomUUID().toString().replace('-', '_');
6564
Schema schema =
6665
Schema.of(
6766
Field.of("booleanField", LegacySQLTypeName.BOOLEAN),
6867
Field.of("numericField", LegacySQLTypeName.NUMERIC));
6968

7069
// Create table in dataset for testing
7170
CreateTable.createTable(BIGQUERY_DATASET_NAME, tableName, schema);
71+
}
7272

73+
@After
74+
public void tearDown() {
75+
// clean up
76+
DeleteTable.deleteTable(BIGQUERY_DATASET_NAME, tableName);
77+
// restores print statements in the original method
78+
System.out.flush();
79+
System.setOut(originalPrintStream);
80+
log.log(Level.INFO, "\n" + bout.toString());
81+
}
82+
83+
@Test
84+
public void addEmptyColumn() {
7385
String randomColumnName = "new_" + UUID.randomUUID().toString().replace('-', '_');
7486
AddEmptyColumn.addEmptyColumn(randomColumnName, BIGQUERY_DATASET_NAME, tableName);
7587
assertThat(bout.toString()).contains("Empty column successfully added to table");

‎samples/snippets/src/test/java/com/example/bigquery/AuthDriveScopeIT.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,33 @@
2121
import java.io.ByteArrayOutputStream;
2222
import java.io.IOException;
2323
import java.io.PrintStream;
24+
import java.util.logging.Level;
25+
import java.util.logging.Logger;
2426
import org.junit.After;
2527
import org.junit.Before;
2628
import org.junit.Test;
2729

2830
public class AuthDriveScopeIT {
31+
32+
private final Logger log = Logger.getLogger(this.getClass().getName());
2933
private ByteArrayOutputStream bout;
3034
private PrintStream out;
35+
private PrintStream originalPrintStream;
3136

3237
@Before
33-
public void setUp() throws Exception {
38+
public void setUp() {
3439
bout = new ByteArrayOutputStream();
3540
out = new PrintStream(bout);
41+
originalPrintStream = System.out;
3642
System.setOut(out);
3743
}
3844

3945
@After
4046
public void tearDown() {
41-
System.setOut(null);
47+
// restores print statements in the original method
48+
System.out.flush();
49+
System.setOut(originalPrintStream);
50+
log.log(Level.INFO, "\n" + bout.toString());
4251
}
4352

4453
@Test

‎samples/snippets/src/test/java/com/example/bigquery/AuthSnippetsIT.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
import java.io.ByteArrayOutputStream;
2222
import java.io.PrintStream;
23+
import java.util.logging.Level;
24+
import java.util.logging.Logger;
2325
import org.junit.After;
2426
import org.junit.Before;
2527
import org.junit.Test;
@@ -30,19 +32,26 @@
3032
@RunWith(JUnit4.class)
3133
@SuppressWarnings("checkstyle:abbreviationaswordinname")
3234
public class AuthSnippetsIT {
35+
36+
private final Logger log = Logger.getLogger(this.getClass().getName());
3337
private ByteArrayOutputStream bout;
3438
private PrintStream out;
39+
private PrintStream originalPrintStream;
3540

3641
@Before
3742
public void setUp() {
3843
bout = new ByteArrayOutputStream();
3944
out = new PrintStream(bout);
45+
originalPrintStream = System.out;
4046
System.setOut(out);
4147
}
4248

4349
@After
4450
public void tearDown() {
45-
System.setOut(null);
51+
// restores print statements in the original method
52+
System.out.flush();
53+
System.setOut(originalPrintStream);
54+
log.log(Level.INFO, "\n" + bout.toString());
4655
}
4756

4857
@Test

‎samples/snippets/src/test/java/com/example/bigquery/AuthorizedViewTutorialIT.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,23 @@
2222
import java.io.ByteArrayOutputStream;
2323
import java.io.PrintStream;
2424
import java.util.UUID;
25+
import java.util.logging.Level;
26+
import java.util.logging.Logger;
2527
import org.junit.After;
2628
import org.junit.Before;
2729
import org.junit.BeforeClass;
2830
import org.junit.Test;
2931

3032
public class AuthorizedViewTutorialIT {
3133

34+
private final Logger log = Logger.getLogger(this.getClass().getName());
3235
private String sourceDatasetId;
3336
private String sourceTableId;
3437
private String sharedDatasetId;
3538
private String sharedViewId;
3639
private ByteArrayOutputStream bout;
3740
private PrintStream out;
41+
private PrintStream originalPrintStream;
3842

3943
private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
4044

@@ -60,6 +64,7 @@ public void setUp() {
6064

6165
bout = new ByteArrayOutputStream();
6266
out = new PrintStream(bout);
67+
originalPrintStream = System.out;
6368
System.setOut(out);
6469
}
6570

@@ -68,7 +73,10 @@ public void tearDown() {
6873
// Clean up
6974
DeleteDataset.deleteDataset(PROJECT_ID, sourceDatasetId);
7075
DeleteDataset.deleteDataset(PROJECT_ID, sharedDatasetId);
71-
System.setOut(null);
76+
// restores print statements in the original method
77+
System.out.flush();
78+
System.setOut(originalPrintStream);
79+
log.log(Level.INFO, "\n" + bout.toString());
7280
}
7381

7482
@Test

‎samples/snippets/src/test/java/com/example/bigquery/BrowseTableIT.java‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@
2525
import java.io.ByteArrayOutputStream;
2626
import java.io.PrintStream;
2727
import java.util.UUID;
28+
import java.util.logging.Level;
29+
import java.util.logging.Logger;
2830
import org.junit.After;
2931
import org.junit.Before;
3032
import org.junit.BeforeClass;
3133
import org.junit.Test;
3234

3335
public class BrowseTableIT {
36+
37+
private final Logger log = Logger.getLogger(this.getClass().getName());
38+
private String tableName;
3439
private ByteArrayOutputStream bout;
3540
private PrintStream out;
41+
private PrintStream originalPrintStream;
3642

3743
private static final String BIGQUERY_DATASET_NAME = System.getenv("BIGQUERY_DATASET_NAME");
3844

@@ -51,30 +57,31 @@ public static void checkRequirements() {
5157
public void setUp() {
5258
bout = new ByteArrayOutputStream();
5359
out = new PrintStream(bout);
60+
originalPrintStream = System.out;
5461
System.setOut(out);
55-
}
56-
57-
@After
58-
public void tearDown() {
59-
System.setOut(null);
60-
}
61-
62-
@Test
63-
public void testBrowseTable() {
64-
String tableName = "MY_TABLE_NAME_" + UUID.randomUUID().toString().replace("-", "_");
6562

63+
tableName = "MY_TABLE_NAME_" + UUID.randomUUID().toString().replace("-", "_");
6664
Schema schema =
6765
Schema.of(
6866
Field.of("stringField", StandardSQLTypeName.STRING),
6967
Field.of("booleanField", StandardSQLTypeName.BOOL));
7068

7169
CreateTable.createTable(BIGQUERY_DATASET_NAME, tableName, schema);
70+
}
7271

73-
BrowseTable.browseTable(BIGQUERY_DATASET_NAME, tableName);
74-
75-
assertThat(bout.toString()).contains("Query ran successfully");
76-
72+
@After
73+
public void tearDown() {
7774
// Clean up
7875
DeleteTable.deleteTable(BIGQUERY_DATASET_NAME, tableName);
76+
// restores print statements in the original method
77+
System.out.flush();
78+
System.setOut(originalPrintStream);
79+
log.log(Level.INFO, "\n" + bout.toString());
80+
}
81+
82+
@Test
83+
public void testBrowseTable() {
84+
BrowseTable.browseTable(BIGQUERY_DATASET_NAME, tableName);
85+
assertThat(bout.toString()).contains("Query ran successfully");
7986
}
8087
}

‎samples/snippets/src/test/java/com/example/bigquery/CancelJobIT.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,33 @@
2020

2121
import java.io.ByteArrayOutputStream;
2222
import java.io.PrintStream;
23+
import java.util.logging.Level;
24+
import java.util.logging.Logger;
2325
import org.junit.After;
2426
import org.junit.Before;
2527
import org.junit.Test;
2628

2729
public class CancelJobIT {
2830

31+
private final Logger log = Logger.getLogger(this.getClass().getName());
2932
private ByteArrayOutputStream bout;
3033
private PrintStream out;
34+
private PrintStream originalPrintStream;
3135

3236
@Before
3337
public void setUp() {
3438
bout = new ByteArrayOutputStream();
3539
out = new PrintStream(bout);
40+
originalPrintStream = System.out;
3641
System.setOut(out);
3742
}
3843

3944
@After
4045
public void tearDown() {
41-
System.setOut(null);
46+
// restores print statements in the original method
47+
System.out.flush();
48+
System.setOut(originalPrintStream);
49+
log.log(Level.INFO, "\n" + bout.toString());
4250
}
4351

4452
@Test

0 commit comments

Comments
 (0)