Formatting fixes.

zeroc-ice · May 8, 2024 · 70a5699 · 70a5699
1 parent 9e9f235
commit 70a5699
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 24 deletions.
diff --git a/cpp/test/Ice/logger/log.txt b/cpp/test/Ice/logger/log.txt
@@ -0,0 +1 @@
+-- 05/08/24 16:59:34115 aplicación: info: XXX
diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp
@@ -203,8 +203,7 @@ InitialI::opMyInterfaceProxyAsync(
 void
 InitialI::opOneOptionalAsync(
     shared_ptr<Test::OneOptional> p1,
-    function<void(const shared_ptr<Test::OneOptional>&, const shared_ptr<Test::OneOptional>&)>
-        response,
+    function<void(const shared_ptr<Test::OneOptional>&, const shared_ptr<Test::OneOptional>&)> response,
     function<void(exception_ptr)>,
     const Ice::Current&)
 {

diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h
@@ -121,9 +121,7 @@ class InitialI final : public Test::Initial
 
     void opOneOptionalAsync(
         std::shared_ptr<Test::OneOptional>,
-        std::function<void(
-            const std::shared_ptr<Test::OneOptional>&,
-            const std::shared_ptr<Test::OneOptional>&)>,
+        std::function<void(const std::shared_ptr<Test::OneOptional>&, const std::shared_ptr<Test::OneOptional>&)>,
         std::function<void(std::exception_ptr)>,
         const Ice::Current&) final;
 

diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h
@@ -15,20 +15,11 @@ class InitialI : public Test::Initial
     virtual void shutdown(const Ice::Current&);
     virtual PingPongMarshaledResult pingPong(Ice::ValuePtr, const Ice::Current&);
 
-    virtual void opOptionalException(
-        std::optional<std::int32_t>,
-        std::optional<std::string>,
-        const Ice::Current&);
+    virtual void opOptionalException(std::optional<std::int32_t>, std::optional<std::string>, const Ice::Current&);
 
-    virtual void opDerivedException(
-        std::optional<std::int32_t>,
-        std::optional<std::string>,
-        const Ice::Current&);
+    virtual void opDerivedException(std::optional<std::int32_t>, std::optional<std::string>, const Ice::Current&);
 
-    virtual void opRequiredException(
-        std::optional<std::int32_t>,
-        std::optional<std::string>,
-        const Ice::Current&);
+    virtual void opRequiredException(std::optional<std::int32_t>, std::optional<std::string>, const Ice::Current&);
 
     virtual std::optional<std::uint8_t>
     opByte(std::optional<std::uint8_t>, std::optional<std::uint8_t>&, const Ice::Current&);
@@ -66,8 +57,7 @@ class InitialI : public Test::Initial
     virtual std::optional<Test::MyInterfacePrx>
     opMyInterfaceProxy(std::optional<Test::MyInterfacePrx>, std::optional<Test::MyInterfacePrx>&, const Ice::Current&);
 
-    virtual Test::OneOptionalPtr
-    opOneOptional(Test::OneOptionalPtr, Test::OneOptionalPtr&, const Ice::Current&);
+    virtual Test::OneOptionalPtr opOneOptional(Test::OneOptionalPtr, Test::OneOptionalPtr&, const Ice::Current&);
 
     virtual std::optional<::Test::ByteSeq> opByteSeq(
         std::optional<std::pair<const std::byte*, const std::byte*>>,

diff --git a/java/test/src/main/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java
@@ -1067,14 +1067,14 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) {
         os.writeValue(p1);
         os.endEncapsulation();
         inEncaps = os.finished();
-        inv = initial.ice_invoke("opOneOptionalReq", OperationMode.Normal, inEncaps);
+        inv = initial.ice_invoke("opOneOptional", OperationMode.Normal, inEncaps);
         in = new InputStream(communicator, inv.outParams);
         in.startEncapsulation();
         Wrapper<OneOptional> p2cb = new Wrapper<>();
         in.readValue(v -> p2cb.value = v, OneOptional.class);
         Wrapper<OneOptional> p3cb = new Wrapper<>();
         in.readValue(v -> p3cb.value = v, OneOptional.class);
-        os.endEncapsulation();
+        in.endEncapsulation();
         test(p2cb.value.getA() == 58 && p3cb.value.getA() == 58);
       }
     }

diff --git a/swift/test/Ice/optional/AllTests.swift b/swift/test/Ice/optional/AllTests.swift
@@ -130,7 +130,7 @@ class FValueReader: Ice.Value {
     istr.startValue()
     _ = try istr.startSlice()
     // Don't read fsf on purpose
-    // in.read(1, _f.fsf);
+    // in.read(1, _f.fsf)
     try istr.endSlice()
     _ = try istr.startSlice()
     self._f.fse = try istr.read()
@@ -1845,12 +1845,12 @@ func allTests(_ helper: TestHelper) throws -> InitialPrx {
     let ostr = Ice.OutputStream(communicator: communicator)
     ostr.startEncapsulation()
     ostr.write(p1)
-    ostr.endEncapsulation();
+    ostr.endEncapsulation()
     let inEncaps = ostr.finished()
     let result = try initial.ice_invoke(
       operation: "opOneOptional", mode: .Normal, inEncaps: inEncaps)
     var istr = Ice.InputStream(communicator: communicator, bytes: result.outEncaps)
-    _ = try istr.startEncapsulation();
+    _ = try istr.startEncapsulation()
     var v1: OneOptional?
     try istr.read { v1 = $0 }
     var v2: OneOptional?