summaryrefslogtreecommitdiff
path: root/csharp/test
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test')
-rw-r--r--csharp/test/Ice/binding/AllTests.cs4
-rw-r--r--csharp/test/Ice/optional/AllTests.cs18
-rw-r--r--csharp/test/Ice/stream/AllTests.cs4
-rw-r--r--csharp/test/IceSSL/configuration/CertificateVerifierI.cs24
-rw-r--r--csharp/test/IceSSL/configuration/PasswordCallbackI.cs8
-rw-r--r--csharp/test/IceSSL/configuration/TestI.cs18
-rw-r--r--csharp/test/Slice/keyword/Client.cs10
7 files changed, 43 insertions, 43 deletions
diff --git a/csharp/test/Ice/binding/AllTests.cs b/csharp/test/Ice/binding/AllTests.cs
index 510cecec622..de76daa74f8 100644
--- a/csharp/test/Ice/binding/AllTests.cs
+++ b/csharp/test/Ice/binding/AllTests.cs
@@ -45,7 +45,7 @@ public class AllTests : TestCommon.TestApp
{
for (int i = 0; i < array.Count - 1; ++i)
{
- int r = rand_.Next(array.Count - i) + i;
+ int r = _rand.Next(array.Count - i) + i;
Debug.Assert(r >= i && r < array.Count);
if (r != i)
{
@@ -949,5 +949,5 @@ public class AllTests : TestCommon.TestApp
com.shutdown();
}
- private static System.Random rand_ = new System.Random(unchecked((int)System.DateTime.Now.Ticks));
+ private static System.Random _rand = new System.Random(unchecked((int)System.DateTime.Now.Ticks));
}
diff --git a/csharp/test/Ice/optional/AllTests.cs b/csharp/test/Ice/optional/AllTests.cs
index 522d0ad9900..b012684c7d3 100644
--- a/csharp/test/Ice/optional/AllTests.cs
+++ b/csharp/test/Ice/optional/AllTests.cs
@@ -1021,7 +1021,7 @@ public class AllTests : TestCommon.TestApp
os.startEncapsulation();
os.writeOptional(2, Ice.OptionalFormat.VSize);
os.writeSize(1);
- p1.Value.write__(os);
+ p1.Value.iceWrite(os);
os.endEncapsulation();
inEncaps = os.finished();
initial.ice_invoke("opSmallStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
@@ -1030,11 +1030,11 @@ public class AllTests : TestCommon.TestApp
test(@in.readOptional(1, Ice.OptionalFormat.VSize));
@in.skipSize();
Test.SmallStruct f = new Test.SmallStruct();
- f.read__(@in);
+ f.iceRead(@in);
test(f.m == (byte)56);
test(@in.readOptional(3, Ice.OptionalFormat.VSize));
@in.skipSize();
- f.read__(@in);
+ f.iceRead(@in);
test(f.m == (byte)56);
@in.endEncapsulation();
@@ -1070,7 +1070,7 @@ public class AllTests : TestCommon.TestApp
os.startEncapsulation();
os.writeOptional(2, Ice.OptionalFormat.VSize);
os.writeSize(4);
- p1.Value.write__(os);
+ p1.Value.iceWrite(os);
os.endEncapsulation();
inEncaps = os.finished();
initial.ice_invoke("opFixedStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
@@ -1079,11 +1079,11 @@ public class AllTests : TestCommon.TestApp
test(@in.readOptional(1, Ice.OptionalFormat.VSize));
@in.skipSize();
Test.FixedStruct f = new Test.FixedStruct();
- f.read__(@in);
+ f.iceRead(@in);
test(f.m == 56);
test(@in.readOptional(3, Ice.OptionalFormat.VSize));
@in.skipSize();
- f.read__(@in);
+ f.iceRead(@in);
test(f.m == 56);
@in.endEncapsulation();
@@ -1124,7 +1124,7 @@ public class AllTests : TestCommon.TestApp
os.startEncapsulation();
os.writeOptional(2, Ice.OptionalFormat.FSize);
int pos = os.startSize();
- p1.Value.write__(os);
+ p1.Value.iceWrite(os);
os.endSize(pos);
os.endEncapsulation();
inEncaps = os.finished();
@@ -1134,11 +1134,11 @@ public class AllTests : TestCommon.TestApp
test(@in.readOptional(1, Ice.OptionalFormat.FSize));
@in.skip(4);
Test.VarStruct v = new Test.VarStruct();
- v.read__(@in);
+ v.iceRead(@in);
test(v.m.Equals("test"));
test(@in.readOptional(3, Ice.OptionalFormat.FSize));
@in.skip(4);
- v.read__(@in);
+ v.iceRead(@in);
test(v.m.Equals("test"));
@in.endEncapsulation();
diff --git a/csharp/test/Ice/stream/AllTests.cs b/csharp/test/Ice/stream/AllTests.cs
index e7aba7107df..19eef43c41d 100644
--- a/csharp/test/Ice/stream/AllTests.cs
+++ b/csharp/test/Ice/stream/AllTests.cs
@@ -69,7 +69,7 @@ public class AllTests : TestCommon.TestApp
public override void write(Ice.OutputStream outS)
{
- obj.write__(outS);
+ obj.iceWrite(outS);
called = true;
}
@@ -82,7 +82,7 @@ public class AllTests : TestCommon.TestApp
public override void read(Ice.InputStream inS)
{
obj = new MyClass();
- obj.read__(inS);
+ obj.iceRead(inS);
called = true;
}
diff --git a/csharp/test/IceSSL/configuration/CertificateVerifierI.cs b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
index d571566636d..13c25af56b9 100644
--- a/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
+++ b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
@@ -18,34 +18,34 @@ public class CertificateVerifierI : IceSSL.CertificateVerifier
public bool verify(IceSSL.NativeConnectionInfo info)
{
- hadCert_ = info.nativeCerts != null;
- invoked_ = true;
- return returnValue_;
+ _hadCert = info.nativeCerts != null;
+ _invoked = true;
+ return _returnValue;
}
internal void reset()
{
- returnValue_ = true;
- invoked_ = false;
- hadCert_ = false;
+ _returnValue = true;
+ _invoked = false;
+ _hadCert = false;
}
internal void returnValue(bool b)
{
- returnValue_ = b;
+ _returnValue = b;
}
internal bool invoked()
{
- return invoked_;
+ return _invoked;
}
internal bool hadCert()
{
- return hadCert_;
+ return _hadCert;
}
- private bool returnValue_;
- private bool invoked_;
- private bool hadCert_;
+ private bool _returnValue;
+ private bool _invoked;
+ private bool _hadCert;
}
diff --git a/csharp/test/IceSSL/configuration/PasswordCallbackI.cs b/csharp/test/IceSSL/configuration/PasswordCallbackI.cs
index aafde7fe3e3..e88c97a0fbf 100644
--- a/csharp/test/IceSSL/configuration/PasswordCallbackI.cs
+++ b/csharp/test/IceSSL/configuration/PasswordCallbackI.cs
@@ -15,17 +15,17 @@ public class PasswordCallbackI : IceSSL.PasswordCallback
{
public PasswordCallbackI()
{
- password_ = createSecureString("password");
+ _password = createSecureString("password");
}
public PasswordCallbackI(string password)
{
- password_ = createSecureString(password);
+ _password = createSecureString(password);
}
public SecureString getPassword(string file)
{
- return password_;
+ return _password;
}
public SecureString getImportPassword(string file)
@@ -44,5 +44,5 @@ public class PasswordCallbackI : IceSSL.PasswordCallback
return result;
}
- private SecureString password_;
+ private SecureString _password;
}
diff --git a/csharp/test/IceSSL/configuration/TestI.cs b/csharp/test/IceSSL/configuration/TestI.cs
index b144dc0af9d..c3d66c08450 100644
--- a/csharp/test/IceSSL/configuration/TestI.cs
+++ b/csharp/test/IceSSL/configuration/TestI.cs
@@ -16,7 +16,7 @@ internal sealed class ServerI : ServerDisp_
{
internal ServerI(Ice.Communicator communicator)
{
- communicator_ = communicator;
+ _communicator = communicator;
}
public override void
@@ -66,7 +66,7 @@ internal sealed class ServerI : ServerDisp_
internal void destroy()
{
- communicator_.destroy();
+ _communicator.destroy();
}
private static void test(bool b)
@@ -77,7 +77,7 @@ internal sealed class ServerI : ServerDisp_
}
}
- private Ice.Communicator communicator_;
+ private Ice.Communicator _communicator;
}
internal sealed class ServerFactoryI : ServerFactoryDisp_
@@ -103,7 +103,7 @@ internal sealed class ServerFactoryI : ServerFactoryDisp_
Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("ServerAdapter", "ssl");
ServerI server = new ServerI(communicator);
Ice.ObjectPrx obj = adapter.addWithUUID(server);
- servers_[obj.ice_getIdentity()] = server;
+ _servers[obj.ice_getIdentity()] = server;
adapter.activate();
return ServerPrxHelper.uncheckedCast(obj);
}
@@ -111,19 +111,19 @@ internal sealed class ServerFactoryI : ServerFactoryDisp_
public override void destroyServer(ServerPrx srv, Ice.Current current)
{
Ice.Identity key = srv.ice_getIdentity();
- if(servers_.Contains(key))
+ if(_servers.Contains(key))
{
- ServerI server = servers_[key] as ServerI;
+ ServerI server = _servers[key] as ServerI;
server.destroy();
- servers_.Remove(key);
+ _servers.Remove(key);
}
}
public override void shutdown(Ice.Current current)
{
- test(servers_.Count == 0);
+ test(_servers.Count == 0);
current.adapter.getCommunicator().shutdown();
}
- private Hashtable servers_ = new Hashtable();
+ private Hashtable _servers = new Hashtable();
}
diff --git a/csharp/test/Slice/keyword/Client.cs b/csharp/test/Slice/keyword/Client.cs
index e2835a837ba..79cef005fb7 100644
--- a/csharp/test/Slice/keyword/Client.cs
+++ b/csharp/test/Slice/keyword/Client.cs
@@ -24,7 +24,7 @@ public class Client
public sealed class caseI : @abstract.caseDisp_
{
public override Task<int>
- catchAsync(int @checked, Ice.Current current__)
+ catchAsync(int @checked, Ice.Current current)
{
return Task<int>.FromResult(0);
}
@@ -32,14 +32,14 @@ public class Client
public sealed class decimalI : @abstract.decimalDisp_
{
- public override void @default(Ice.Current current__)
+ public override void @default(Ice.Current current)
{
}
}
public sealed class delegateI : @abstract.delegateDisp_
{
- public override void foo(@abstract.casePrx @else, out int @event, Ice.Current current__)
+ public override void foo(@abstract.casePrx @else, out int @event, Ice.Current current)
{
@event = 0;
}
@@ -48,7 +48,7 @@ public class Client
public sealed class explicitI : @abstract.explicitDisp_
{
public override Task<int>
- catchAsync(int @checked, Ice.Current current__)
+ catchAsync(int @checked, Ice.Current current)
{
return Task<int>.FromResult(0);
}
@@ -58,7 +58,7 @@ public class Client
test(current.operation == "default");
}
- public override void foo(@abstract.casePrx @else, out int @event, Ice.Current current__)
+ public override void foo(@abstract.casePrx @else, out int @event, Ice.Current current)
{
@event = 0;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 22:50:09 +0000