Fix more tests

Author: AdrienVannson

betterproto2/tests/inputs/invalid_field/test_invalid_field.py

@@ -2,7 +2,7 @@
 
 
 def test_invalid_field():
-    from tests.output_betterproto.invalid_field import Test
+    from tests.outputs.invalid_field.invalid_field import Test
 
     with pytest.raises(TypeError):
         Test(unknown_field=12)
@@ -11,7 +11,7 @@ def test_invalid_field():
 def test_invalid_field_pydantic():
     from pydantic import ValidationError
 
-    from tests.output_betterproto_pydantic.invalid_field import Test
+    from tests.outputs.invalid_field_pydantic.invalid_field import Test
 
     with pytest.raises(ValidationError):
         Test(unknown_field=12)

betterproto2/tests/inputs/rpc_empty_input_message/test_rpc_empty_input_message.py

@@ -4,7 +4,7 @@
 
 @pytest.mark.asyncio
 async def test_rpc_input_message():
-    from tests.output_betterproto.rpc_empty_input_message import (
+    from tests.outputs.rpc_empty_input_message.rpc_empty_input_message import (
         Response,
         ServiceBase,
         ServiceStub,

betterproto2/tests/oneof_pattern_matching.py

@@ -2,7 +2,7 @@
 
 
 def test_oneof_pattern_matching():
-    from tests.output_betterproto.features import IntMsg, OneofMsg
+    from tests.outputs.features.features import IntMsg, OneofMsg
 
     msg = OneofMsg(y="test1", b="test2")
 

betterproto2/tests/test_all_definition.py

@@ -4,8 +4,8 @@ def test_all_definition():
 
     These modules have been chosen since they contain messages, services and enums.
     """
-    import tests.output_betterproto.enum as enum
-    import tests.output_betterproto.service as service
+    import tests.outputs.enum.enum as enum
+    import tests.outputs.service.service as service
 
     assert service.__all__ == (
         "DoThingRequest",

betterproto2/tests/test_encoding_decoding.py

@@ -1,6 +1,6 @@
 def test_int_overflow():
     """Make sure that overflows in encoded values are handled correctly."""
-    from tests.output_betterproto_pydantic.encoding_decoding import Overflow32, Overflow64
+    from tests.outputs.encoding_decoding.encoding_decoding import Overflow32, Overflow64
 
     b = bytes(Overflow64(uint=2**50 + 42))
     msg = Overflow32.parse(b)

betterproto2/tests/test_manual_validation.py

@@ -3,7 +3,7 @@
 
 
 def test_manual_validation():
-    from tests.output_betterproto_pydantic.manual_validation import Msg
+    from tests.outputs.manual_validation_pydantic.manual_validation import Msg
 
     msg = Msg()
 
@@ -16,7 +16,7 @@ def test_manual_validation():
 
 
 def test_manual_validation_non_pydantic():
-    from tests.output_betterproto.manual_validation import Msg
+    from tests.outputs.manual_validation.manual_validation import Msg
 
     # Validation is not available for non-pydantic messages
     with pytest.raises(TypeError):

betterproto2/tests/test_message_wraping.py

@@ -2,7 +2,7 @@
 
 
 def test_message_wrapping_map():
-    from tests.output_betterproto.message_wrapping import MapMessage
+    from tests.outputs.message_wrapping.message_wrapping import MapMessage
 
     msg = MapMessage(map1={"key": 12.0}, map2={"key": datetime.timedelta(seconds=1)})
 

betterproto2/tests/test_pickling.py

@@ -46,7 +46,7 @@ def test_pickling_complex_message():
 
 
 def test_recursive_message_defaults():
-    from tests.output_betterproto.recursivemessage import Intermediate, Test as RecursiveMessage
+    from tests.outputs.recursivemessage.recursivemessage import Intermediate, Test as RecursiveMessage
 
     msg = RecursiveMessage(name="bob", intermediate=Intermediate(42))
     msg = unpickled(msg)

betterproto2/tests/test_unwrap.py

@@ -3,7 +3,7 @@
 
 def test_unwrap() -> None:
     from betterproto2 import unwrap
-    from tests.output_betterproto.unwrap import Message, NestedMessage
+    from tests.outputs.unwrap.unwrap import Message, NestedMessage
 
     with pytest.raises(ValueError):
         unwrap(Message().x)

betterproto2_compiler/tests/generate.py

@@ -94,6 +94,7 @@ async def main_async():
         generate_test("casing_inner_class", semaphore),
         generate_test("deprecated", semaphore),
         generate_test("documentation", semaphore),
+        generate_test("encoding_decoding", semaphore),
         generate_test("enum", semaphore),
         generate_test("example_service", semaphore),
         generate_test("features", semaphore),
@@ -108,8 +109,13 @@ async def main_async():
         generate_test("import_cousin_package_same_name", semaphore),
         generate_test("import_cousin_package_same_name", semaphore, descriptors=True),
         generate_test("import_service_input_message", semaphore),
+        generate_test("invalid_field", semaphore),
+        generate_test("invalid_field", semaphore, pydantic=True),
+        generate_test("manual_validation", semaphore),
+        generate_test("manual_validation", semaphore, pydantic=True),
         generate_test("map", semaphore),
         generate_test("mapmessage", semaphore),
+        generate_test("message_wrapping", semaphore),
         generate_test("nestedtwice", semaphore),
         generate_test("nested", semaphore),
         generate_test("oneof", semaphore),
@@ -125,11 +131,13 @@ async def main_async():
         generate_test("repeated", semaphore),
         generate_test("repeatedpacked", semaphore),
         generate_test("repeated_duration_timestamp", semaphore),
+        generate_test("rpc_empty_input_message", semaphore),
         generate_test("service", semaphore),
         generate_test("service_uppercase", semaphore),
         generate_test("simple_service", semaphore),
         generate_test("stream_stream", semaphore),
         generate_test("timestamp_dict_encode", semaphore),
+        generate_test("unwrap", semaphore),
         generate_test("validation", semaphore, pydantic=True),
     ]
     await asyncio.gather(*tasks)