Index: third_party/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs |
diff --git a/third_party/protobuf/src/google/protobuf/io/coded_stream_inl.h b/third_party/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs |
similarity index 54% |
copy from third_party/protobuf/src/google/protobuf/io/coded_stream_inl.h |
copy to third_party/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs |
index 144f44f0635304bd7acc72ae628eab2d0a1998d3..a669baba17bfd1f629a4c8816e5373da6ea9219f 100644 |
--- a/third_party/protobuf/src/google/protobuf/io/coded_stream_inl.h |
+++ b/third_party/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs |
@@ -1,6 +1,7 @@ |
+#region Copyright notice and license |
// Protocol Buffers - Google's data interchange format |
-// Copyright 2008 Google Inc. All rights reserved. |
-// http://code.google.com/p/protobuf/ |
+// Copyright 2015 Google Inc. All rights reserved. |
+// https://developers.google.com/protocol-buffers/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -27,42 +28,37 @@ |
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+#endregion |
-// Author: jasonh@google.com (Jason Hsueh) |
-// |
-// Implements methods of coded_stream.h that need to be inlined for performance |
-// reasons, but should not be defined in a public header. |
- |
-#ifndef GOOGLE_PROTOBUF_IO_CODED_STREAM_INL_H__ |
-#define GOOGLE_PROTOBUF_IO_CODED_STREAM_INL_H__ |
- |
-#include <google/protobuf/io/coded_stream.h> |
-#include <string> |
-#include <google/protobuf/stubs/stl_util.h> |
+using System; |
+using NUnit.Framework; |
-namespace google { |
-namespace protobuf { |
-namespace io { |
+namespace Google.Protobuf |
+{ |
+ /// <summary> |
+ /// Helper methods when testing equality. NUnit's Assert.AreEqual and |
+ /// Assert.AreNotEqual methods try to be clever with collections, which can |
+ /// be annoying... |
+ /// </summary> |
+ internal static class EqualityTester |
+ { |
+ public static void AssertEquality<T>(T first, T second) where T : IEquatable<T> |
+ { |
+ Assert.IsTrue(first.Equals(second)); |
+ Assert.IsTrue(first.Equals((object) second)); |
+ Assert.AreEqual(first.GetHashCode(), second.GetHashCode()); |
+ } |
-inline bool CodedInputStream::InternalReadStringInline(string* buffer, |
- int size) { |
- if (size < 0) return false; // security: size is often user-supplied |
- |
- if (BufferSize() >= size) { |
- STLStringResizeUninitialized(buffer, size); |
- // When buffer is empty, string_as_array(buffer) will return NULL but memcpy |
- // requires non-NULL pointers even when size is 0. Hench this check. |
- if (size > 0) { |
- memcpy(string_as_array(buffer), buffer_, size); |
- Advance(size); |
+ public static void AssertInequality<T>(T first, T second) where T : IEquatable<T> |
+ { |
+ Assert.IsFalse(first.Equals(second)); |
+ Assert.IsFalse(first.Equals((object) second)); |
+ // While this isn't a requirement, the chances of this test failing due to |
+ // coincidence rather than a bug are very small. |
+ if (first != null && second != null) |
+ { |
+ Assert.AreNotEqual(first.GetHashCode(), second.GetHashCode()); |
+ } |
+ } |
} |
- return true; |
- } |
- |
- return ReadStringFallback(buffer, size); |
} |
- |
-} // namespace io |
-} // namespace protobuf |
-} // namespace google |
-#endif // GOOGLE_PROTOBUF_IO_CODED_STREAM_INL_H__ |