From b4ded1aa1f2d5bad16fe136eefc5ceca145095e1 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Tue, 11 Apr 2023 08:59:12 +0900
Subject: [PATCH] refactor: move src/tests/ to tests/

---
 sdks/rust/src/lib.rs                         |  2 --
 sdks/rust/src/tests/mod.rs                   | 21 -------------------
 sdks/rust/{src => }/tests/coders_test.rs     |  2 +-
 sdks/rust/{src => }/tests/primitives_test.rs | 22 ++++++++++----------
 sdks/rust/{src => }/tests/worker_test.rs     |  6 +++---
 5 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 sdks/rust/src/tests/mod.rs
 rename sdks/rust/{src => }/tests/coders_test.rs (99%)
 rename sdks/rust/{src => }/tests/primitives_test.rs (86%)
 rename sdks/rust/{src => }/tests/worker_test.rs (97%)

diff --git a/sdks/rust/src/lib.rs b/sdks/rust/src/lib.rs
index c5c6e5fcad83d..56da856ab39e0 100644
--- a/sdks/rust/src/lib.rs
+++ b/sdks/rust/src/lib.rs
@@ -24,7 +24,5 @@ pub mod runners;
 pub mod transforms;
 pub mod worker;
 
-mod tests;
-
 #[macro_use]
 extern crate strum_macros;
diff --git a/sdks/rust/src/tests/mod.rs b/sdks/rust/src/tests/mod.rs
deleted file mode 100644
index 0e0aa1e629a40..0000000000000
--- a/sdks/rust/src/tests/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-pub mod coders_test;
-pub mod primitives_test;
-pub mod worker_test;
diff --git a/sdks/rust/src/tests/coders_test.rs b/sdks/rust/tests/coders_test.rs
similarity index 99%
rename from sdks/rust/src/tests/coders_test.rs
rename to sdks/rust/tests/coders_test.rs
index dad9af3f88326..7914cfcad434d 100644
--- a/sdks/rust/src/tests/coders_test.rs
+++ b/sdks/rust/tests/coders_test.rs
@@ -18,7 +18,7 @@
 
 #[cfg(test)]
 mod tests {
-    use crate::{
+    use apache_beam::{
         coders::{
             coder_resolver::{
                 BytesCoderResolverDefault, CoderResolver, StrUtf8CoderResolverDefault,
diff --git a/sdks/rust/src/tests/primitives_test.rs b/sdks/rust/tests/primitives_test.rs
similarity index 86%
rename from sdks/rust/src/tests/primitives_test.rs
rename to sdks/rust/tests/primitives_test.rs
index 313a41cfa33c2..f44e7751b9fe8 100644
--- a/sdks/rust/src/tests/primitives_test.rs
+++ b/sdks/rust/tests/primitives_test.rs
@@ -20,17 +20,17 @@
 mod tests {
     use std::sync::Arc;
 
-    use crate::elem_types::kv::KV;
-    use crate::internals::pipeline::Pipeline;
-    use crate::internals::pvalue::{PType, PValue};
-    use crate::runners::direct_runner::DirectRunner;
-    use crate::runners::runner::RunnerI;
-    use crate::transforms::create::Create;
-    use crate::transforms::flatten::Flatten;
-    use crate::transforms::group_by_key::GroupByKey;
-    use crate::transforms::impulse::Impulse;
-    use crate::transforms::pardo::ParDo;
-    use crate::transforms::testing::AssertEqualUnordered;
+    use apache_beam::elem_types::kv::KV;
+    use apache_beam::internals::pipeline::Pipeline;
+    use apache_beam::internals::pvalue::{PType, PValue};
+    use apache_beam::runners::direct_runner::DirectRunner;
+    use apache_beam::runners::runner::RunnerI;
+    use apache_beam::transforms::create::Create;
+    use apache_beam::transforms::flatten::Flatten;
+    use apache_beam::transforms::group_by_key::GroupByKey;
+    use apache_beam::transforms::impulse::Impulse;
+    use apache_beam::transforms::pardo::ParDo;
+    use apache_beam::transforms::testing::AssertEqualUnordered;
 
     #[tokio::test]
     async fn run_direct_runner() {
diff --git a/sdks/rust/src/tests/worker_test.rs b/sdks/rust/tests/worker_test.rs
similarity index 97%
rename from sdks/rust/src/tests/worker_test.rs
rename to sdks/rust/tests/worker_test.rs
index b345dd02d74ff..14daddad89eaf 100644
--- a/sdks/rust/src/tests/worker_test.rs
+++ b/sdks/rust/tests/worker_test.rs
@@ -22,13 +22,13 @@ mod tests {
 
     use serde_json;
 
-    use crate::internals::urns;
-    use crate::proto::beam_api::{
+    use apache_beam::internals::urns;
+    use apache_beam::proto::beam_api::{
         fn_execution::ProcessBundleDescriptor,
         pipeline::{FunctionSpec, PTransform},
     };
 
-    use crate::{
+    use apache_beam::{
         worker::sdk_worker::BundleProcessor,
         worker::test_utils::{reset_log, RECORDING_OPERATOR_LOGS},
     };