From 80ec0c120bb133b3d3747406be7e4c543b9e0446 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 6 Jun 2017 13:56:55 -0700 Subject: Move internal & common & trace to the new package io.opencensus (#339) --- .../test/java/io/opencensus/trace/TraceIdTest.java | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 api/src/test/java/io/opencensus/trace/TraceIdTest.java (limited to 'api/src/test/java/io/opencensus/trace/TraceIdTest.java') diff --git a/api/src/test/java/io/opencensus/trace/TraceIdTest.java b/api/src/test/java/io/opencensus/trace/TraceIdTest.java new file mode 100644 index 00000000..cd1b7c24 --- /dev/null +++ b/api/src/test/java/io/opencensus/trace/TraceIdTest.java @@ -0,0 +1,75 @@ +/* + * Copyright 2016, Google Inc. + * Licensed 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. + */ + +package io.opencensus.trace; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.common.testing.EqualsTester; +import java.util.Arrays; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link TraceId}. */ +@RunWith(JUnit4.class) +public class TraceIdTest { + private static final byte[] firstBytes = + new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'a'}; + private static final byte[] secondBytes = + new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'A'}; + private static final TraceId first = TraceId.fromBytes(firstBytes); + private static final TraceId second = TraceId.fromBytes(secondBytes); + + @Test + public void invalidTraceId() { + assertThat(TraceId.INVALID.getBytes()).isEqualTo(new byte[16]); + } + + @Test + public void isValid() { + assertThat(TraceId.INVALID.isValid()).isFalse(); + assertThat(first.isValid()).isTrue(); + assertThat(second.isValid()).isTrue(); + } + + @Test + public void getBytes() { + assertThat(first.getBytes()).isEqualTo(firstBytes); + assertThat(second.getBytes()).isEqualTo(secondBytes); + } + + @Test + public void traceId_CompareTo() { + assertThat(first.compareTo(second)).isGreaterThan(0); + assertThat(second.compareTo(first)).isLessThan(0); + assertThat(first.compareTo(TraceId.fromBytes(firstBytes))).isEqualTo(0); + } + + @Test + public void traceId_EqualsAndHashCode() { + EqualsTester tester = new EqualsTester(); + tester.addEqualityGroup(TraceId.INVALID, TraceId.INVALID); + tester.addEqualityGroup(first, TraceId.fromBytes(Arrays.copyOf(firstBytes, firstBytes.length))); + tester.addEqualityGroup( + second, TraceId.fromBytes(Arrays.copyOf(secondBytes, secondBytes.length))); + tester.testEquals(); + } + + @Test + public void traceId_ToString() { + assertThat(TraceId.INVALID.toString()).contains("00000000000000000000000000000000"); + assertThat(first.toString()).contains("00000000000000000000000000000061"); + assertThat(second.toString()).contains("00000000000000000000000000000041"); + } +} -- cgit v1.2.3 From ddcf44bdec4fa1dea15513c8949280457292e3e7 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 8 Jun 2017 13:57:45 -0700 Subject: Move all base types into a different package called base. (#342) --- .../test/java/io/opencensus/trace/TraceIdTest.java | 75 ---------------------- 1 file changed, 75 deletions(-) delete mode 100644 api/src/test/java/io/opencensus/trace/TraceIdTest.java (limited to 'api/src/test/java/io/opencensus/trace/TraceIdTest.java') diff --git a/api/src/test/java/io/opencensus/trace/TraceIdTest.java b/api/src/test/java/io/opencensus/trace/TraceIdTest.java deleted file mode 100644 index cd1b7c24..00000000 --- a/api/src/test/java/io/opencensus/trace/TraceIdTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2016, Google Inc. - * Licensed 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. - */ - -package io.opencensus.trace; - -import static com.google.common.truth.Truth.assertThat; - -import com.google.common.testing.EqualsTester; -import java.util.Arrays; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Unit tests for {@link TraceId}. */ -@RunWith(JUnit4.class) -public class TraceIdTest { - private static final byte[] firstBytes = - new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'a'}; - private static final byte[] secondBytes = - new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'A'}; - private static final TraceId first = TraceId.fromBytes(firstBytes); - private static final TraceId second = TraceId.fromBytes(secondBytes); - - @Test - public void invalidTraceId() { - assertThat(TraceId.INVALID.getBytes()).isEqualTo(new byte[16]); - } - - @Test - public void isValid() { - assertThat(TraceId.INVALID.isValid()).isFalse(); - assertThat(first.isValid()).isTrue(); - assertThat(second.isValid()).isTrue(); - } - - @Test - public void getBytes() { - assertThat(first.getBytes()).isEqualTo(firstBytes); - assertThat(second.getBytes()).isEqualTo(secondBytes); - } - - @Test - public void traceId_CompareTo() { - assertThat(first.compareTo(second)).isGreaterThan(0); - assertThat(second.compareTo(first)).isLessThan(0); - assertThat(first.compareTo(TraceId.fromBytes(firstBytes))).isEqualTo(0); - } - - @Test - public void traceId_EqualsAndHashCode() { - EqualsTester tester = new EqualsTester(); - tester.addEqualityGroup(TraceId.INVALID, TraceId.INVALID); - tester.addEqualityGroup(first, TraceId.fromBytes(Arrays.copyOf(firstBytes, firstBytes.length))); - tester.addEqualityGroup( - second, TraceId.fromBytes(Arrays.copyOf(secondBytes, secondBytes.length))); - tester.testEquals(); - } - - @Test - public void traceId_ToString() { - assertThat(TraceId.INVALID.toString()).contains("00000000000000000000000000000000"); - assertThat(first.toString()).contains("00000000000000000000000000000061"); - assertThat(second.toString()).contains("00000000000000000000000000000041"); - } -} -- cgit v1.2.3 From d51699ee80ba3d19cda27ce269c56b486e795521 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 6 Jul 2017 08:12:08 -0700 Subject: Get rid of base directory and move everything on level up. (#417) * Get rid of base directory and move everything on level up. * Remove unused imports in tests. --- .../test/java/io/opencensus/trace/TraceIdTest.java | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 api/src/test/java/io/opencensus/trace/TraceIdTest.java (limited to 'api/src/test/java/io/opencensus/trace/TraceIdTest.java') diff --git a/api/src/test/java/io/opencensus/trace/TraceIdTest.java b/api/src/test/java/io/opencensus/trace/TraceIdTest.java new file mode 100644 index 00000000..cd1b7c24 --- /dev/null +++ b/api/src/test/java/io/opencensus/trace/TraceIdTest.java @@ -0,0 +1,75 @@ +/* + * Copyright 2016, Google Inc. + * Licensed 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. + */ + +package io.opencensus.trace; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.common.testing.EqualsTester; +import java.util.Arrays; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link TraceId}. */ +@RunWith(JUnit4.class) +public class TraceIdTest { + private static final byte[] firstBytes = + new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'a'}; + private static final byte[] secondBytes = + new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'A'}; + private static final TraceId first = TraceId.fromBytes(firstBytes); + private static final TraceId second = TraceId.fromBytes(secondBytes); + + @Test + public void invalidTraceId() { + assertThat(TraceId.INVALID.getBytes()).isEqualTo(new byte[16]); + } + + @Test + public void isValid() { + assertThat(TraceId.INVALID.isValid()).isFalse(); + assertThat(first.isValid()).isTrue(); + assertThat(second.isValid()).isTrue(); + } + + @Test + public void getBytes() { + assertThat(first.getBytes()).isEqualTo(firstBytes); + assertThat(second.getBytes()).isEqualTo(secondBytes); + } + + @Test + public void traceId_CompareTo() { + assertThat(first.compareTo(second)).isGreaterThan(0); + assertThat(second.compareTo(first)).isLessThan(0); + assertThat(first.compareTo(TraceId.fromBytes(firstBytes))).isEqualTo(0); + } + + @Test + public void traceId_EqualsAndHashCode() { + EqualsTester tester = new EqualsTester(); + tester.addEqualityGroup(TraceId.INVALID, TraceId.INVALID); + tester.addEqualityGroup(first, TraceId.fromBytes(Arrays.copyOf(firstBytes, firstBytes.length))); + tester.addEqualityGroup( + second, TraceId.fromBytes(Arrays.copyOf(secondBytes, secondBytes.length))); + tester.testEquals(); + } + + @Test + public void traceId_ToString() { + assertThat(TraceId.INVALID.toString()).contains("00000000000000000000000000000000"); + assertThat(first.toString()).contains("00000000000000000000000000000061"); + assertThat(second.toString()).contains("00000000000000000000000000000041"); + } +} -- cgit v1.2.3 From b2f48c5d608c154d75ae7616c660e053f6e5c5f7 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 23 Aug 2017 09:52:48 -0700 Subject: Change the licence to OpenCensus authors. (#539) --- api/src/test/java/io/opencensus/trace/TraceIdTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'api/src/test/java/io/opencensus/trace/TraceIdTest.java') diff --git a/api/src/test/java/io/opencensus/trace/TraceIdTest.java b/api/src/test/java/io/opencensus/trace/TraceIdTest.java index cd1b7c24..8c1a1004 100644 --- a/api/src/test/java/io/opencensus/trace/TraceIdTest.java +++ b/api/src/test/java/io/opencensus/trace/TraceIdTest.java @@ -1,9 +1,12 @@ /* - * Copyright 2016, Google Inc. + * Copyright 2016-17, OpenCensus Authors + * * Licensed 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. -- cgit v1.2.3 From 381e11c5168e5d31e09ec92840f908b42be647e6 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 11 Dec 2017 16:12:53 -0800 Subject: Add initial support for b3-propagation headers. (#889) * Add initial support for b3-propagation headers. * Update tests and throw exception when missing span_id or trace_id. * Cleanup and add more tests. * Update comments. Update tests. --- .../test/java/io/opencensus/trace/TraceIdTest.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'api/src/test/java/io/opencensus/trace/TraceIdTest.java') diff --git a/api/src/test/java/io/opencensus/trace/TraceIdTest.java b/api/src/test/java/io/opencensus/trace/TraceIdTest.java index 8c1a1004..c8b5dc8f 100644 --- a/api/src/test/java/io/opencensus/trace/TraceIdTest.java +++ b/api/src/test/java/io/opencensus/trace/TraceIdTest.java @@ -30,7 +30,7 @@ public class TraceIdTest { private static final byte[] firstBytes = new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'a'}; private static final byte[] secondBytes = - new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'A'}; + new byte[] {(byte) 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'A'}; private static final TraceId first = TraceId.fromBytes(firstBytes); private static final TraceId second = TraceId.fromBytes(secondBytes); @@ -52,6 +52,21 @@ public class TraceIdTest { assertThat(second.getBytes()).isEqualTo(secondBytes); } + @Test + public void fromLowerBase16() { + assertThat(TraceId.fromLowerBase16("00000000000000000000000000000000")) + .isEqualTo(TraceId.INVALID); + assertThat(TraceId.fromLowerBase16("00000000000000000000000000000061")).isEqualTo(first); + assertThat(TraceId.fromLowerBase16("ff000000000000000000000000000041")).isEqualTo(second); + } + + @Test + public void toLowerBase16() { + assertThat(TraceId.INVALID.toLowerBase16()).isEqualTo("00000000000000000000000000000000"); + assertThat(first.toLowerBase16()).isEqualTo("00000000000000000000000000000061"); + assertThat(second.toLowerBase16()).isEqualTo("ff000000000000000000000000000041"); + } + @Test public void traceId_CompareTo() { assertThat(first.compareTo(second)).isGreaterThan(0); @@ -73,6 +88,6 @@ public class TraceIdTest { public void traceId_ToString() { assertThat(TraceId.INVALID.toString()).contains("00000000000000000000000000000000"); assertThat(first.toString()).contains("00000000000000000000000000000061"); - assertThat(second.toString()).contains("00000000000000000000000000000041"); + assertThat(second.toString()).contains("ff000000000000000000000000000041"); } } -- cgit v1.2.3