Enforce mutual exclusivity among view, materialized view, and schema …

…in BigQuery table config

mmv1/third_party/terraform/tests/resource_bigquery_table_test.go

@@ -367,8 +367,37 @@ func TestAccBigQueryTable_WithViewAndSchema(t *testing.T) {
 		CheckDestroy:             testAccCheckBigQueryTableDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
+<<<<<<< HEAD
+<<<<<<< HEAD
 				Config:      testAccBigQueryTableWithViewAndSchema(datasetID, tableID, "table description"),
 				ExpectError: regexp.MustCompile("\"view\": conflicts with schema"),
+=======
+<<<<<<< HEAD
+				Config: testAccBigQueryTableWithViewAndSchema(datasetID, tableID, "table description1"),
+			},
+			{
+				ResourceName:            "google_bigquery_table.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"deletion_protection"},
+			},
+			{
+				Config: testAccBigQueryTableWithViewAndSchema(datasetID, tableID, "table description2"),
+			},
+			{
+				ResourceName:            "google_bigquery_table.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"deletion_protection"},
+=======
+				Config:      testAccBigQueryTableWithViewAndSchema(datasetID, tableID, "table description"),
+				ExpectError: regexp.MustCompile("\"view\": conflicts with schema"),
+>>>>>>> 5471308bd (add ConflictsWith to resource_bigquery_table)
+>>>>>>> 5a902d280 (Enforce mutual exclusivity among view, materialized view, and schema in BigQuery table config)
+=======
+				Config:      testAccBigQueryTableWithViewAndSchema(datasetID, tableID, "table description"),
+				ExpectError: regexp.MustCompile("\"view\": conflicts with schema"),
+>>>>>>> b56cb632b (fix merge conflict)
 			},
 		},
 	})
@@ -473,6 +502,14 @@ func TestAccBigQueryTable_MaterializedView_DailyTimePartioning_Update(t *testing
 	})
 }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 5a902d280 (Enforce mutual exclusivity among view, materialized view, and schema in BigQuery table config)
+=======
+>>>>>>> b56cb632b (fix merge conflict)
 func TestAccBigQueryTable_MaterializedView_WithSchema(t *testing.T) {
 	t.Parallel()
 
@@ -515,6 +552,13 @@ func TestAccBigQueryTable_MaterializedView_WithView(t *testing.T) {
 	})
 }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 5471308bd (add ConflictsWith to resource_bigquery_table)
+>>>>>>> 5a902d280 (Enforce mutual exclusivity among view, materialized view, and schema in BigQuery table config)
+=======
+>>>>>>> b56cb632b (fix merge conflict)
 func TestAccBigQueryExternalDataTable_parquet(t *testing.T) {
 	t.Parallel()