From a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 13 Jun 2017 20:46:46 +0200 Subject: Revert "Copyright header" --- .../binaryprefix/BinaryScaledAmountTestCase.java | 2 +- .../test/java/com/yahoo/cache/CacheTestCase.java | 2 +- .../test/java/com/yahoo/cache/CalcTestCase.java | 2 +- .../com/yahoo/collections/ArraySetTestCase.java | 2 +- .../com/yahoo/collections/BobHashTestCase.java | 2 +- .../collections/ByteArrayComparatorTestCase.java | 2 +- .../collections/CollectionComparatorTestCase.java | 2 +- .../com/yahoo/collections/CollectionUtilTest.java | 2 +- .../yahoo/collections/CollectionsBenchMark.java | 2 +- .../collections/CopyOnWriteHashMapTestCase.java | 2 +- .../collections/FreezableArrayListListener.java | 2 +- .../com/yahoo/collections/HashletTestCase.java | 2 +- .../collections/IntArrayComparatorTestCase.java | 2 +- .../java/com/yahoo/collections/LazyMapTest.java | 2 +- .../java/com/yahoo/collections/LazySetTest.java | 2 +- .../com/yahoo/collections/ListMapTestCase.java | 2 +- .../collections/ListenableArrayListTestCase.java | 2 +- .../java/com/yahoo/collections/MD5TestCase.java | 2 +- .../yahoo/collections/PredicateSplitTestCase.java | 2 +- .../yahoo/collections/TinyIdentitySetTestCase.java | 2 +- .../java/com/yahoo/collections/TupleTestCase.java | 2 +- .../com/yahoo/compress/IntegerCompressorTest.java | 2 +- .../java/com/yahoo/compress/LZ4CompressorTest.java | 2 +- .../yahoo/concurrent/CopyOnWriteHashMapTest.java | 2 +- .../com/yahoo/concurrent/EventBarrierTestCase.java | 336 ++++++++++----------- .../com/yahoo/concurrent/ExecutorsTestCase.java | 2 +- .../com/yahoo/concurrent/ReceiverTestCase.java | 2 +- .../yahoo/concurrent/ThreadFactoryFactoryTest.java | 2 +- .../concurrent/ThreadLocalDirectoryTestCase.java | 2 +- .../yahoo/concurrent/ThreadRobustListTestCase.java | 2 +- .../data/access/InspectorConformanceTestBase.java | 2 +- .../access/simple/SimpleConformanceTestCase.java | 2 +- .../access/slime/SlimeConformanceTestCase.java | 2 +- .../com/yahoo/geo/BoundingBoxParserTestCase.java | 2 +- .../java/com/yahoo/geo/DegreesParserTestCase.java | 2 +- .../test/java/com/yahoo/geo/ZCurveTestCase.java | 2 +- .../src/test/java/com/yahoo/io/BlobTestCase.java | 2 +- .../test/java/com/yahoo/io/ByteWriterTestCase.java | 2 +- .../com/yahoo/io/FatalErrorHandlerTestCase.java | 2 +- .../test/java/com/yahoo/io/FileReadTestCase.java | 6 +- .../io/GrowableBufferOutputStreamTestCase.java | 2 +- .../com/yahoo/io/GrowableByteBufferTestCase.java | 2 +- .../test/java/com/yahoo/io/HexDumpTestCase.java | 2 +- .../test/java/com/yahoo/io/IOUtilsTestCase.java | 2 +- .../test/java/com/yahoo/io/ListenerTestCase.java | 2 +- .../java/com/yahoo/io/SlowInflateTestCase.java | 2 +- .../test/java/com/yahoo/io/TeeInputStreamTest.java | 1 - .../com/yahoo/io/reader/NamedReaderTestCase.java | 2 +- .../test/java/com/yahoo/java7compat/UtilTest.java | 2 +- .../com/yahoo/javacc/FastCharStreamTestCase.java | 2 +- .../com/yahoo/javacc/UnicodeUtilitiesTestCase.java | 2 +- .../test/java/com/yahoo/net/HostNameTestCase.java | 2 +- .../src/test/java/com/yahoo/net/URITestCase.java | 2 +- .../test/java/com/yahoo/net/UriToolsTestCase.java | 2 +- .../src/test/java/com/yahoo/net/UrlTestCase.java | 2 +- .../test/java/com/yahoo/net/UrlTokenTestCase.java | 2 +- .../java/com/yahoo/net/UrlTokenizerTestCase.java | 2 +- .../src/test/java/com/yahoo/path/PathTest.java | 2 +- .../java/com/yahoo/protect/TestErrorMessage.java | 2 +- .../java/com/yahoo/protect/ValidatorTestCase.java | 2 +- .../java/com/yahoo/reflection/CastingTest.java | 2 +- .../java/com/yahoo/slime/BinaryFormatTestCase.java | 2 +- .../test/java/com/yahoo/slime/JsonBenchmark.java | 2 +- .../java/com/yahoo/slime/JsonFormatTestCase.java | 2 +- .../test/java/com/yahoo/slime/SlimeTestCase.java | 2 +- .../test/java/com/yahoo/slime/VisitorTestCase.java | 2 +- .../com/yahoo/stream/CustomCollectorsTest.java | 2 +- vespajlib/src/test/java/com/yahoo/system/Bar.java | 2 +- .../com/yahoo/system/CatchSigTermTestCase.java | 2 +- .../yahoo/system/CommandLineParserTestCase.java | 2 +- vespajlib/src/test/java/com/yahoo/system/Foo.java | 2 +- .../java/com/yahoo/system/ForceLoadTestCase.java | 2 +- .../com/yahoo/system/ProcessExecuterTestCase.java | 2 +- .../system/execution/ProcessExecutorTest.java | 2 +- .../com/yahoo/tensor/IndexedTensorTestCase.java | 1 - .../com/yahoo/tensor/MappedTensorTestCase.java | 2 +- .../com/yahoo/tensor/TensorFunctionBenchmark.java | 1 - .../test/java/com/yahoo/tensor/TensorTestCase.java | 1 - .../java/com/yahoo/tensor/TensorTypeTestCase.java | 2 +- .../com/yahoo/tensor/functions/ConcatTestCase.java | 3 +- .../com/yahoo/tensor/functions/JoinTestCase.java | 1 - .../tensor/functions/TensorFunctionTestCase.java | 1 - .../serialization/DenseBinaryFormatTestCase.java | 2 +- .../serialization/SparseBinaryFormatTestCase.java | 2 +- .../src/test/java/com/yahoo/text/AsciiTest.java | 2 +- .../src/test/java/com/yahoo/text/Benchmark.java | 2 +- .../java/com/yahoo/text/BooleanParserTestCase.java | 2 +- .../text/CaseInsensitiveIdentifierTestCase.java | 2 +- .../com/yahoo/text/DataTypeIdentifierTestCase.java | 2 +- .../com/yahoo/text/DoubleFormatterTestCase.java | 2 +- .../java/com/yahoo/text/DoubleParserTestCase.java | 2 +- .../com/yahoo/text/DoubleToStringBenchmark.java | 2 +- .../java/com/yahoo/text/ForwardWriterTestCase.java | 2 +- .../java/com/yahoo/text/GenericWriterTestCase.java | 2 +- .../src/test/java/com/yahoo/text/HTMLTestCase.java | 2 +- .../java/com/yahoo/text/IdentifierTestCase.java | 2 +- .../src/test/java/com/yahoo/text/JSONTest.java | 2 +- .../java/com/yahoo/text/JSONWriterTestCase.java | 2 +- .../com/yahoo/text/JsonMicroBenchmarkTestCase.java | 2 +- .../java/com/yahoo/text/LanguageHacksTestCase.java | 2 +- .../yahoo/text/LowercaseIdentifierTestCase.java | 2 +- .../java/com/yahoo/text/LowercaseTestCase.java | 2 +- .../com/yahoo/text/MapParserMicroBenchmark.java | 2 +- .../java/com/yahoo/text/MapParserTestCase.java | 2 +- .../yahoo/text/StringAppendMicroBenchmarkTest.java | 2 +- .../java/com/yahoo/text/StringUtilitiesTest.java | 2 +- .../java/com/yahoo/text/Utf8ArrayTestCase.java | 2 +- .../src/test/java/com/yahoo/text/Utf8TestCase.java | 2 +- .../src/test/java/com/yahoo/text/XMLTestCase.java | 2 +- .../java/com/yahoo/text/XMLWriterTestCase.java | 2 +- .../com/yahoo/time/WallClockSourceTestCase.java | 2 +- .../transaction/NestedTransactionTestCase.java | 2 +- .../java/com/yahoo/vespa/objects/BigIdClass.java | 2 +- .../com/yahoo/vespa/objects/FieldBaseTestCase.java | 2 +- .../com/yahoo/vespa/objects/FooBarIdClass.java | 2 +- .../yahoo/vespa/objects/ObjectDumperTestCase.java | 2 +- .../com/yahoo/vespa/objects/SerializeTestCase.java | 2 +- .../java/com/yahoo/vespa/objects/SomeIdClass.java | 2 +- 118 files changed, 281 insertions(+), 288 deletions(-) (limited to 'vespajlib/src/test') diff --git a/vespajlib/src/test/java/com/yahoo/binaryprefix/BinaryScaledAmountTestCase.java b/vespajlib/src/test/java/com/yahoo/binaryprefix/BinaryScaledAmountTestCase.java index bd5d176095e..bfb36ec80ce 100644 --- a/vespajlib/src/test/java/com/yahoo/binaryprefix/BinaryScaledAmountTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/binaryprefix/BinaryScaledAmountTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.binaryprefix; import junit.framework.TestCase; diff --git a/vespajlib/src/test/java/com/yahoo/cache/CacheTestCase.java b/vespajlib/src/test/java/com/yahoo/cache/CacheTestCase.java index 8f14016b542..992974eeb63 100644 --- a/vespajlib/src/test/java/com/yahoo/cache/CacheTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/cache/CacheTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.cache; import junit.framework.TestCase; diff --git a/vespajlib/src/test/java/com/yahoo/cache/CalcTestCase.java b/vespajlib/src/test/java/com/yahoo/cache/CalcTestCase.java index 002b1de9147..fbec483debb 100644 --- a/vespajlib/src/test/java/com/yahoo/cache/CalcTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/cache/CalcTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.cache; import java.util.ArrayList; diff --git a/vespajlib/src/test/java/com/yahoo/collections/ArraySetTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ArraySetTestCase.java index 1dc8e5fa62e..5bb15f57420 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/ArraySetTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/ArraySetTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import static org.junit.Assert.assertEquals; diff --git a/vespajlib/src/test/java/com/yahoo/collections/BobHashTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/BobHashTestCase.java index e1c7a01164e..820adffcfc5 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/BobHashTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/BobHashTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; diff --git a/vespajlib/src/test/java/com/yahoo/collections/ByteArrayComparatorTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ByteArrayComparatorTestCase.java index 60761b1e530..68b5812dd1e 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/ByteArrayComparatorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/ByteArrayComparatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java index ed24a8585b6..d77636b907f 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java index 1c580c34e65..c5a20a4684c 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java +++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Before; diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java index 3377bdd3eba..35a40b87c3b 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java +++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import java.util.*; import java.util.concurrent.ExecutorService; diff --git a/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java index 4c18ff6b3c4..a66d9c45893 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java b/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java index daaf7e8f470..5a6c331393f 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java +++ b/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/HashletTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/HashletTestCase.java index 6bf97baf985..1a198726994 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/HashletTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/HashletTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/IntArrayComparatorTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/IntArrayComparatorTestCase.java index 93cd55e961c..c4808a6605c 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/IntArrayComparatorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/IntArrayComparatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/LazyMapTest.java b/vespajlib/src/test/java/com/yahoo/collections/LazyMapTest.java index 59340491bb2..2890d73ebaf 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/LazyMapTest.java +++ b/vespajlib/src/test/java/com/yahoo/collections/LazyMapTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/LazySetTest.java b/vespajlib/src/test/java/com/yahoo/collections/LazySetTest.java index 0f10057e87a..d71e7ca6e26 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/LazySetTest.java +++ b/vespajlib/src/test/java/com/yahoo/collections/LazySetTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/ListMapTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ListMapTestCase.java index 9a44f8601b9..29668676222 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/ListMapTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/ListMapTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java index 0be9185ae71..0412d9fefe4 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/MD5TestCase.java b/vespajlib/src/test/java/com/yahoo/collections/MD5TestCase.java index 86166a1e874..a107b21abb1 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/MD5TestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/MD5TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; /** diff --git a/vespajlib/src/test/java/com/yahoo/collections/PredicateSplitTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/PredicateSplitTestCase.java index 05a719d6a4d..d1c040809de 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/PredicateSplitTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/PredicateSplitTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/collections/TinyIdentitySetTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/TinyIdentitySetTestCase.java index e579a0cad23..2ba7262530b 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/TinyIdentitySetTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/TinyIdentitySetTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import static org.junit.Assert.assertEquals; diff --git a/vespajlib/src/test/java/com/yahoo/collections/TupleTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/TupleTestCase.java index f277caba9fc..8c7d25431a2 100644 --- a/vespajlib/src/test/java/com/yahoo/collections/TupleTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/collections/TupleTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.collections; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java b/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java index 6676ecb6205..95f734ba5f8 100644 --- a/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java +++ b/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.compress; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/compress/LZ4CompressorTest.java b/vespajlib/src/test/java/com/yahoo/compress/LZ4CompressorTest.java index d5830fe7629..c33dabf04da 100644 --- a/vespajlib/src/test/java/com/yahoo/compress/LZ4CompressorTest.java +++ b/vespajlib/src/test/java/com/yahoo/compress/LZ4CompressorTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.compress; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java index f7dae5320f7..23d106a2790 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/EventBarrierTestCase.java b/vespajlib/src/test/java/com/yahoo/concurrent/EventBarrierTestCase.java index 6a91c502571..eae792effd4 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/EventBarrierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/EventBarrierTestCase.java @@ -1,168 +1,168 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.concurrent; - -import junit.framework.TestCase; - -/** - * @author Simon Thoresen - */ -public class EventBarrierTestCase extends TestCase { - - public void testEmpty() { - // waiting for an empty set of events - Barrier b = new Barrier(); - EventBarrier eb = new EventBarrier(); - - assertTrue(!eb.startBarrier(b)); - assertTrue(!b.done); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - - int token = eb.startEvent(); - eb.completeEvent(token); - - assertTrue(!eb.startBarrier(b)); - assertTrue(!b.done); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - } - - public void testSimple() { - // a single barrier waiting for a single event - Barrier b = new Barrier(); - EventBarrier eb = new EventBarrier(); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - - int token = eb.startEvent(); - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 0); - - assertTrue(eb.startBarrier(b)); - assertTrue(!b.done); - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 1); - - eb.completeEvent(token); - assertTrue(b.done); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - } - - public void testBarrierChain() { - // more than one barrier waiting for the same set of events - Barrier b1 = new Barrier(); - Barrier b2 = new Barrier(); - Barrier b3 = new Barrier(); - EventBarrier eb = new EventBarrier(); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - - int token = eb.startEvent(); - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 0); - - assertTrue(eb.startBarrier(b1)); - assertTrue(eb.startBarrier(b2)); - assertTrue(eb.startBarrier(b3)); - assertTrue(!b1.done); - assertTrue(!b2.done); - assertTrue(!b3.done); - - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 3); - - eb.completeEvent(token); - assertTrue(b1.done); - assertTrue(b2.done); - assertTrue(b3.done); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - } - - public void testEventAfter() { - // new events starting after the start of a barrier - Barrier b = new Barrier(); - EventBarrier eb = new EventBarrier(); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - - int token = eb.startEvent(); - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 0); - - assertTrue(eb.startBarrier(b)); - assertTrue(!b.done); - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 1); - - int t2 = eb.startEvent(); - assertTrue(!b.done); - assertEquals(eb.getNumEvents(), 2); - assertEquals(eb.getNumBarriers(), 1); - - eb.completeEvent(token); - assertTrue(b.done); - assertEquals(eb.getNumEvents(), 1); - assertEquals(eb.getNumBarriers(), 0); - - eb.completeEvent(t2); - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - } - - public void testReorder() { - // events completing in a different order than they started - Barrier b1 = new Barrier(); - Barrier b2 = new Barrier(); - Barrier b3 = new Barrier(); - EventBarrier eb = new EventBarrier(); - - int t1 = eb.startEvent(); - eb.startBarrier(b1); - int t2 = eb.startEvent(); - eb.startBarrier(b2); - int t3 = eb.startEvent(); - eb.startBarrier(b3); - int t4 = eb.startEvent(); - - assertEquals(eb.getNumEvents(), 4); - assertEquals(eb.getNumBarriers(), 3); - - assertTrue(!b1.done); - assertTrue(!b2.done); - assertTrue(!b3.done); - - eb.completeEvent(t4); - assertTrue(!b1.done); - assertTrue(!b2.done); - assertTrue(!b3.done); - - eb.completeEvent(t3); - assertTrue(!b1.done); - assertTrue(!b2.done); - assertTrue(!b3.done); - - eb.completeEvent(t1); - assertTrue(b1.done); - assertTrue(!b2.done); - assertTrue(!b3.done); - - eb.completeEvent(t2); - assertTrue(b1.done); - assertTrue(b2.done); - assertTrue(b3.done); - - assertEquals(eb.getNumEvents(), 0); - assertEquals(eb.getNumBarriers(), 0); - } - - private static class Barrier implements EventBarrier.BarrierWaiter { - boolean done = false; - - @Override - public void completeBarrier() { - done = true; - } - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.concurrent; + +import junit.framework.TestCase; + +/** + * @author Simon Thoresen + */ +public class EventBarrierTestCase extends TestCase { + + public void testEmpty() { + // waiting for an empty set of events + Barrier b = new Barrier(); + EventBarrier eb = new EventBarrier(); + + assertTrue(!eb.startBarrier(b)); + assertTrue(!b.done); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + + int token = eb.startEvent(); + eb.completeEvent(token); + + assertTrue(!eb.startBarrier(b)); + assertTrue(!b.done); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + } + + public void testSimple() { + // a single barrier waiting for a single event + Barrier b = new Barrier(); + EventBarrier eb = new EventBarrier(); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + + int token = eb.startEvent(); + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 0); + + assertTrue(eb.startBarrier(b)); + assertTrue(!b.done); + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 1); + + eb.completeEvent(token); + assertTrue(b.done); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + } + + public void testBarrierChain() { + // more than one barrier waiting for the same set of events + Barrier b1 = new Barrier(); + Barrier b2 = new Barrier(); + Barrier b3 = new Barrier(); + EventBarrier eb = new EventBarrier(); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + + int token = eb.startEvent(); + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 0); + + assertTrue(eb.startBarrier(b1)); + assertTrue(eb.startBarrier(b2)); + assertTrue(eb.startBarrier(b3)); + assertTrue(!b1.done); + assertTrue(!b2.done); + assertTrue(!b3.done); + + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 3); + + eb.completeEvent(token); + assertTrue(b1.done); + assertTrue(b2.done); + assertTrue(b3.done); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + } + + public void testEventAfter() { + // new events starting after the start of a barrier + Barrier b = new Barrier(); + EventBarrier eb = new EventBarrier(); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + + int token = eb.startEvent(); + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 0); + + assertTrue(eb.startBarrier(b)); + assertTrue(!b.done); + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 1); + + int t2 = eb.startEvent(); + assertTrue(!b.done); + assertEquals(eb.getNumEvents(), 2); + assertEquals(eb.getNumBarriers(), 1); + + eb.completeEvent(token); + assertTrue(b.done); + assertEquals(eb.getNumEvents(), 1); + assertEquals(eb.getNumBarriers(), 0); + + eb.completeEvent(t2); + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + } + + public void testReorder() { + // events completing in a different order than they started + Barrier b1 = new Barrier(); + Barrier b2 = new Barrier(); + Barrier b3 = new Barrier(); + EventBarrier eb = new EventBarrier(); + + int t1 = eb.startEvent(); + eb.startBarrier(b1); + int t2 = eb.startEvent(); + eb.startBarrier(b2); + int t3 = eb.startEvent(); + eb.startBarrier(b3); + int t4 = eb.startEvent(); + + assertEquals(eb.getNumEvents(), 4); + assertEquals(eb.getNumBarriers(), 3); + + assertTrue(!b1.done); + assertTrue(!b2.done); + assertTrue(!b3.done); + + eb.completeEvent(t4); + assertTrue(!b1.done); + assertTrue(!b2.done); + assertTrue(!b3.done); + + eb.completeEvent(t3); + assertTrue(!b1.done); + assertTrue(!b2.done); + assertTrue(!b3.done); + + eb.completeEvent(t1); + assertTrue(b1.done); + assertTrue(!b2.done); + assertTrue(!b3.done); + + eb.completeEvent(t2); + assertTrue(b1.done); + assertTrue(b2.done); + assertTrue(b3.done); + + assertEquals(eb.getNumEvents(), 0); + assertEquals(eb.getNumBarriers(), 0); + } + + private static class Barrier implements EventBarrier.BarrierWaiter { + boolean done = false; + + @Override + public void completeBarrier() { + done = true; + } + } +} diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ExecutorsTestCase.java b/vespajlib/src/test/java/com/yahoo/concurrent/ExecutorsTestCase.java index 787260f2e20..b8f2b0e5c58 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/ExecutorsTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/ExecutorsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; import static org.junit.Assert.assertEquals; diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ReceiverTestCase.java b/vespajlib/src/test/java/com/yahoo/concurrent/ReceiverTestCase.java index 206c98c53be..88d5283f46a 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/ReceiverTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/ReceiverTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java index da27ed3f7c2..b13e4a7af22 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadLocalDirectoryTestCase.java b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadLocalDirectoryTestCase.java index 42e2f4f5f7a..d813ae1e18d 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadLocalDirectoryTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadLocalDirectoryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadRobustListTestCase.java b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadRobustListTestCase.java index adeb8846993..88c7a962c95 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadRobustListTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadRobustListTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; import static org.junit.Assert.assertEquals; diff --git a/vespajlib/src/test/java/com/yahoo/data/access/InspectorConformanceTestBase.java b/vespajlib/src/test/java/com/yahoo/data/access/InspectorConformanceTestBase.java index c0c287ddfb9..4cf449fbf4f 100644 --- a/vespajlib/src/test/java/com/yahoo/data/access/InspectorConformanceTestBase.java +++ b/vespajlib/src/test/java/com/yahoo/data/access/InspectorConformanceTestBase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.data.access; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/data/access/simple/SimpleConformanceTestCase.java b/vespajlib/src/test/java/com/yahoo/data/access/simple/SimpleConformanceTestCase.java index daf62ca3ec1..4db5d0afde7 100644 --- a/vespajlib/src/test/java/com/yahoo/data/access/simple/SimpleConformanceTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/data/access/simple/SimpleConformanceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.data.access.simple; diff --git a/vespajlib/src/test/java/com/yahoo/data/access/slime/SlimeConformanceTestCase.java b/vespajlib/src/test/java/com/yahoo/data/access/slime/SlimeConformanceTestCase.java index 57842e87e6c..ff6e98cfa37 100644 --- a/vespajlib/src/test/java/com/yahoo/data/access/slime/SlimeConformanceTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/data/access/slime/SlimeConformanceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.data.access.slime; diff --git a/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java b/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java index 54b0bc49294..b09296389b8 100644 --- a/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/geo/BoundingBoxParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.geo; /** diff --git a/vespajlib/src/test/java/com/yahoo/geo/DegreesParserTestCase.java b/vespajlib/src/test/java/com/yahoo/geo/DegreesParserTestCase.java index 79ce71071d5..ed6fed5cbc7 100644 --- a/vespajlib/src/test/java/com/yahoo/geo/DegreesParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/geo/DegreesParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.geo; /** diff --git a/vespajlib/src/test/java/com/yahoo/geo/ZCurveTestCase.java b/vespajlib/src/test/java/com/yahoo/geo/ZCurveTestCase.java index 2abbfa2f68a..b5536fca510 100644 --- a/vespajlib/src/test/java/com/yahoo/geo/ZCurveTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/geo/ZCurveTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.geo; /** diff --git a/vespajlib/src/test/java/com/yahoo/io/BlobTestCase.java b/vespajlib/src/test/java/com/yahoo/io/BlobTestCase.java index 5b03c63de54..9643d70ba5e 100644 --- a/vespajlib/src/test/java/com/yahoo/io/BlobTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/BlobTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import java.nio.ByteBuffer; diff --git a/vespajlib/src/test/java/com/yahoo/io/ByteWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/io/ByteWriterTestCase.java index b34a0e4a2f9..d5025dd03aa 100644 --- a/vespajlib/src/test/java/com/yahoo/io/ByteWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/ByteWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import static org.junit.Assert.assertArrayEquals; diff --git a/vespajlib/src/test/java/com/yahoo/io/FatalErrorHandlerTestCase.java b/vespajlib/src/test/java/com/yahoo/io/FatalErrorHandlerTestCase.java index eee151b4b57..d4889c1fa96 100644 --- a/vespajlib/src/test/java/com/yahoo/io/FatalErrorHandlerTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/FatalErrorHandlerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/io/FileReadTestCase.java b/vespajlib/src/test/java/com/yahoo/io/FileReadTestCase.java index f03944ff6f8..5ebdeeb797e 100644 --- a/vespajlib/src/test/java/com/yahoo/io/FileReadTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/FileReadTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import org.junit.Test; @@ -15,14 +15,14 @@ public class FileReadTestCase extends junit.framework.TestCase { public void testReadByteArray() throws IOException { byte[] thisFile = IOUtils.readFileBytes(new File("src/test/java/com/yahoo/io/FileReadTestCase.java")); String str = new String(thisFile, Charset.forName("US-ASCII")); - assertTrue(str.startsWith("// Copyright 2017 Yahoo Holdings.")); + assertTrue(str.startsWith("// Copyright 2016 Yahoo Inc.")); assertTrue(str.endsWith("// Yeppers\n")); } @Test public void testReadString() throws IOException { String str = IOUtils.readFile(new File("src/test/java/com/yahoo/io/FileReadTestCase.java")); - assertTrue(str.startsWith("// Copyright 2017 Yahoo Holdings.")); + assertTrue(str.startsWith("// Copyright 2016 Yahoo Inc.")); assertTrue(str.endsWith("// Yeppers\n")); } diff --git a/vespajlib/src/test/java/com/yahoo/io/GrowableBufferOutputStreamTestCase.java b/vespajlib/src/test/java/com/yahoo/io/GrowableBufferOutputStreamTestCase.java index 70e21cef62a..71568a3cfbc 100644 --- a/vespajlib/src/test/java/com/yahoo/io/GrowableBufferOutputStreamTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/GrowableBufferOutputStreamTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import java.nio.channels.WritableByteChannel; diff --git a/vespajlib/src/test/java/com/yahoo/io/GrowableByteBufferTestCase.java b/vespajlib/src/test/java/com/yahoo/io/GrowableByteBufferTestCase.java index 5e7c2e30816..ffc3d6dfe64 100644 --- a/vespajlib/src/test/java/com/yahoo/io/GrowableByteBufferTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/GrowableByteBufferTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import java.nio.ByteBuffer; diff --git a/vespajlib/src/test/java/com/yahoo/io/HexDumpTestCase.java b/vespajlib/src/test/java/com/yahoo/io/HexDumpTestCase.java index 2be0271cdb8..940f0150540 100644 --- a/vespajlib/src/test/java/com/yahoo/io/HexDumpTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/HexDumpTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java b/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java index 3a8b0dde1c1..d4df3478da8 100644 --- a/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import java.io.*; diff --git a/vespajlib/src/test/java/com/yahoo/io/ListenerTestCase.java b/vespajlib/src/test/java/com/yahoo/io/ListenerTestCase.java index 173197ae27c..e2049017076 100644 --- a/vespajlib/src/test/java/com/yahoo/io/ListenerTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/ListenerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/io/SlowInflateTestCase.java b/vespajlib/src/test/java/com/yahoo/io/SlowInflateTestCase.java index 7726cd7ea68..48d8e8cdffe 100644 --- a/vespajlib/src/test/java/com/yahoo/io/SlowInflateTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/SlowInflateTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/io/TeeInputStreamTest.java b/vespajlib/src/test/java/com/yahoo/io/TeeInputStreamTest.java index 14e56c46912..ac438d8645b 100644 --- a/vespajlib/src/test/java/com/yahoo/io/TeeInputStreamTest.java +++ b/vespajlib/src/test/java/com/yahoo/io/TeeInputStreamTest.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io; import java.io.*; diff --git a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java index 3926a08a03c..4d6954ca9a8 100644 --- a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.io.reader; import java.io.IOException; diff --git a/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java b/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java index b2be19494bf..aebf081f496 100644 --- a/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java +++ b/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.java7compat; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java b/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java index bdafc4bfaf9..ab444b29486 100644 --- a/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.javacc; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/javacc/UnicodeUtilitiesTestCase.java b/vespajlib/src/test/java/com/yahoo/javacc/UnicodeUtilitiesTestCase.java index fe8100190aa..81329e06308 100644 --- a/vespajlib/src/test/java/com/yahoo/javacc/UnicodeUtilitiesTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/javacc/UnicodeUtilitiesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.javacc; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/net/HostNameTestCase.java b/vespajlib/src/test/java/com/yahoo/net/HostNameTestCase.java index 2c7fb0a29f6..ddcd05c5366 100644 --- a/vespajlib/src/test/java/com/yahoo/net/HostNameTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/HostNameTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/net/URITestCase.java b/vespajlib/src/test/java/com/yahoo/net/URITestCase.java index e35a8aa481a..dc04f42e9d1 100644 --- a/vespajlib/src/test/java/com/yahoo/net/URITestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/URITestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; import java.util.List; diff --git a/vespajlib/src/test/java/com/yahoo/net/UriToolsTestCase.java b/vespajlib/src/test/java/com/yahoo/net/UriToolsTestCase.java index 3e4cd70a352..9a17fa341be 100644 --- a/vespajlib/src/test/java/com/yahoo/net/UriToolsTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/UriToolsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/net/UrlTestCase.java b/vespajlib/src/test/java/com/yahoo/net/UrlTestCase.java index 71835963ff8..7cf99cf2c5a 100644 --- a/vespajlib/src/test/java/com/yahoo/net/UrlTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/UrlTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/net/UrlTokenTestCase.java b/vespajlib/src/test/java/com/yahoo/net/UrlTokenTestCase.java index f7f1a0feb59..ca42a701655 100644 --- a/vespajlib/src/test/java/com/yahoo/net/UrlTokenTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/UrlTokenTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java b/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java index a1d80e789c6..d192c0901a6 100644 --- a/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.net; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/path/PathTest.java b/vespajlib/src/test/java/com/yahoo/path/PathTest.java index b3a7873b973..4d78df0f4e9 100644 --- a/vespajlib/src/test/java/com/yahoo/path/PathTest.java +++ b/vespajlib/src/test/java/com/yahoo/path/PathTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.path; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java b/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java index 3a923ebbb47..3e18df93e47 100644 --- a/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java +++ b/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.protect; /** diff --git a/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java b/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java index 42e9cd0298b..d5de37ef50f 100644 --- a/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.protect; /** diff --git a/vespajlib/src/test/java/com/yahoo/reflection/CastingTest.java b/vespajlib/src/test/java/com/yahoo/reflection/CastingTest.java index 1f23fc95357..32b506b206f 100644 --- a/vespajlib/src/test/java/com/yahoo/reflection/CastingTest.java +++ b/vespajlib/src/test/java/com/yahoo/reflection/CastingTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.reflection; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/slime/BinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/slime/BinaryFormatTestCase.java index e8ceab44c78..7b42d4e6bda 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/BinaryFormatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/slime/BinaryFormatTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java index 0f846c1a132..5963f5a8eca 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; import com.fasterxml.jackson.core.JsonFactory; diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java index d82cb61a08c..86fe40c7817 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; import com.yahoo.text.Utf8; diff --git a/vespajlib/src/test/java/com/yahoo/slime/SlimeTestCase.java b/vespajlib/src/test/java/com/yahoo/slime/SlimeTestCase.java index 731067975ce..371668d3821 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/SlimeTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/slime/SlimeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/slime/VisitorTestCase.java b/vespajlib/src/test/java/com/yahoo/slime/VisitorTestCase.java index 41b616bce95..949cb4eecf2 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/VisitorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/slime/VisitorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/stream/CustomCollectorsTest.java b/vespajlib/src/test/java/com/yahoo/stream/CustomCollectorsTest.java index d9d53d59be6..08a7a22b8c4 100644 --- a/vespajlib/src/test/java/com/yahoo/stream/CustomCollectorsTest.java +++ b/vespajlib/src/test/java/com/yahoo/stream/CustomCollectorsTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.stream; import com.google.common.collect.Lists; diff --git a/vespajlib/src/test/java/com/yahoo/system/Bar.java b/vespajlib/src/test/java/com/yahoo/system/Bar.java index 30f43817802..747b19edaee 100644 --- a/vespajlib/src/test/java/com/yahoo/system/Bar.java +++ b/vespajlib/src/test/java/com/yahoo/system/Bar.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system; /** diff --git a/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java b/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java index d13889f8e30..dfe508eb2d6 100644 --- a/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system; import com.yahoo.system.CatchSigTerm; diff --git a/vespajlib/src/test/java/com/yahoo/system/CommandLineParserTestCase.java b/vespajlib/src/test/java/com/yahoo/system/CommandLineParserTestCase.java index e9f5c7a9e11..a2a086e4c65 100644 --- a/vespajlib/src/test/java/com/yahoo/system/CommandLineParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/system/CommandLineParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system; import junit.framework.TestCase; diff --git a/vespajlib/src/test/java/com/yahoo/system/Foo.java b/vespajlib/src/test/java/com/yahoo/system/Foo.java index 18e108fa909..ea51a80caaa 100644 --- a/vespajlib/src/test/java/com/yahoo/system/Foo.java +++ b/vespajlib/src/test/java/com/yahoo/system/Foo.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system; /** diff --git a/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java b/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java index f385ea5beec..078142014cd 100644 --- a/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system; public class ForceLoadTestCase extends junit.framework.TestCase { diff --git a/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java b/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java index dba6047b0c6..97be79c069a 100644 --- a/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system; import com.yahoo.collections.Pair; diff --git a/vespajlib/src/test/java/com/yahoo/system/execution/ProcessExecutorTest.java b/vespajlib/src/test/java/com/yahoo/system/execution/ProcessExecutorTest.java index 82da255182d..b12d66853fe 100644 --- a/vespajlib/src/test/java/com/yahoo/system/execution/ProcessExecutorTest.java +++ b/vespajlib/src/test/java/com/yahoo/system/execution/ProcessExecutorTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.system.execution; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java index c94a735149a..51d2de6c11f 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor; import junit.framework.TestCase; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java index 164412fe76d..5c2c3b9db32 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor; import com.google.common.collect.Sets; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java index 32b19ecf44f..e2baa1d5ac3 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor; import com.yahoo.tensor.evaluation.MapEvaluationContext; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java index f0b800bea7f..b7884207f49 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor; import com.google.common.collect.ImmutableList; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java index ef973d03ccb..012b1839d2e 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/ConcatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/ConcatTestCase.java index a653ef97734..ace911409bc 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/functions/ConcatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/ConcatTestCase.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; import com.yahoo.tensor.Tensor; @@ -68,4 +67,4 @@ public class ConcatTestCase { assertEquals(Tensor.from("tensor(x[2],y[4]):{{x:0,y:0}:1.0,{x:0,y:1}:3.0,{x:0,y:2}:5.0,{x:0,y:3}:6.0,{x:1,y:0}:2.0,{x:1,y:1}:4.0,{x:1,y:2}:5.0,{x:1,y:3}:6.0}"), a.concat(b, "y")); } -} +} \ No newline at end of file diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java index fab53218b2c..bc2d1f21717 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; import com.yahoo.tensor.Tensor; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java index 8a58cb0bbed..02aebbacd7f 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; import com.yahoo.tensor.TensorType; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java index 349309a5052..9cf48bd0fdf 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.serialization; import com.google.common.collect.Sets; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java index d17148cf8dc..79c4c7938c1 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.serialization; import com.google.common.collect.Sets; diff --git a/vespajlib/src/test/java/com/yahoo/text/AsciiTest.java b/vespajlib/src/test/java/com/yahoo/text/AsciiTest.java index 7a0647ba531..4d598e7b1bb 100644 --- a/vespajlib/src/test/java/com/yahoo/text/AsciiTest.java +++ b/vespajlib/src/test/java/com/yahoo/text/AsciiTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/Benchmark.java b/vespajlib/src/test/java/com/yahoo/text/Benchmark.java index b32927c2f5d..caa4b57c099 100644 --- a/vespajlib/src/test/java/com/yahoo/text/Benchmark.java +++ b/vespajlib/src/test/java/com/yahoo/text/Benchmark.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; // import com.google.common.base.Preconditions; diff --git a/vespajlib/src/test/java/com/yahoo/text/BooleanParserTestCase.java b/vespajlib/src/test/java/com/yahoo/text/BooleanParserTestCase.java index 7e59eb21650..756d0cd23ff 100644 --- a/vespajlib/src/test/java/com/yahoo/text/BooleanParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/BooleanParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import static org.junit.Assert.assertFalse; diff --git a/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java index 1f6e9538290..57eb86dc092 100644 --- a/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; diff --git a/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java index 7380b2976f2..75a5b7b277a 100644 --- a/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/DoubleFormatterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/DoubleFormatterTestCase.java index 9299c96d902..21be58e5fd2 100644 --- a/vespajlib/src/test/java/com/yahoo/text/DoubleFormatterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/DoubleFormatterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/DoubleParserTestCase.java b/vespajlib/src/test/java/com/yahoo/text/DoubleParserTestCase.java index 7f20b9b89ec..88e253e3425 100644 --- a/vespajlib/src/test/java/com/yahoo/text/DoubleParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/DoubleParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/DoubleToStringBenchmark.java b/vespajlib/src/test/java/com/yahoo/text/DoubleToStringBenchmark.java index ec3eae50aa7..2e0af153fc7 100644 --- a/vespajlib/src/test/java/com/yahoo/text/DoubleToStringBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/text/DoubleToStringBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Ignore; diff --git a/vespajlib/src/test/java/com/yahoo/text/ForwardWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/ForwardWriterTestCase.java index b3f7d234c59..6984c2ec6a8 100644 --- a/vespajlib/src/test/java/com/yahoo/text/ForwardWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/ForwardWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import static org.junit.Assert.assertEquals; diff --git a/vespajlib/src/test/java/com/yahoo/text/GenericWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/GenericWriterTestCase.java index 8d5f310fe73..619065ff7bf 100644 --- a/vespajlib/src/test/java/com/yahoo/text/GenericWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/GenericWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/text/HTMLTestCase.java b/vespajlib/src/test/java/com/yahoo/text/HTMLTestCase.java index 1799c4ccba9..2eab7d42aed 100644 --- a/vespajlib/src/test/java/com/yahoo/text/HTMLTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/HTMLTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java index 59de6521b5c..126cc10f5bc 100644 --- a/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/JSONTest.java b/vespajlib/src/test/java/com/yahoo/text/JSONTest.java index 22174761571..2e7e1da65f0 100644 --- a/vespajlib/src/test/java/com/yahoo/text/JSONTest.java +++ b/vespajlib/src/test/java/com/yahoo/text/JSONTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java index a7fe7cd880b..cbb0c37cdd9 100644 --- a/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/JsonMicroBenchmarkTestCase.java b/vespajlib/src/test/java/com/yahoo/text/JsonMicroBenchmarkTestCase.java index 8c8d2f78245..c2c1774ca1d 100644 --- a/vespajlib/src/test/java/com/yahoo/text/JsonMicroBenchmarkTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/JsonMicroBenchmarkTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/text/LanguageHacksTestCase.java b/vespajlib/src/test/java/com/yahoo/text/LanguageHacksTestCase.java index 4231c6ede02..7b322e44583 100644 --- a/vespajlib/src/test/java/com/yahoo/text/LanguageHacksTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/LanguageHacksTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java index 1bf1c9646b0..00f4010bdf4 100644 --- a/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/LowercaseTestCase.java b/vespajlib/src/test/java/com/yahoo/text/LowercaseTestCase.java index 8a3e6ed134d..420d058892b 100644 --- a/vespajlib/src/test/java/com/yahoo/text/LowercaseTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/LowercaseTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Ignore; diff --git a/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java b/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java index f5f3f3fcc92..5b4456f14f4 100644 --- a/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import java.util.HashMap; diff --git a/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java b/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java index 65cfd57abf7..f846c6263d1 100644 --- a/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java b/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java index 912c5513f2e..7e62180d88e 100644 --- a/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java +++ b/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/StringUtilitiesTest.java b/vespajlib/src/test/java/com/yahoo/text/StringUtilitiesTest.java index aa38689d35b..bebee69e7e5 100644 --- a/vespajlib/src/test/java/com/yahoo/text/StringUtilitiesTest.java +++ b/vespajlib/src/test/java/com/yahoo/text/StringUtilitiesTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import java.util.Arrays; diff --git a/vespajlib/src/test/java/com/yahoo/text/Utf8ArrayTestCase.java b/vespajlib/src/test/java/com/yahoo/text/Utf8ArrayTestCase.java index dcc9774d8b7..4195113e2e1 100644 --- a/vespajlib/src/test/java/com/yahoo/text/Utf8ArrayTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/Utf8ArrayTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import static org.junit.Assert.*; diff --git a/vespajlib/src/test/java/com/yahoo/text/Utf8TestCase.java b/vespajlib/src/test/java/com/yahoo/text/Utf8TestCase.java index 79437af30b9..53ee1bb004a 100644 --- a/vespajlib/src/test/java/com/yahoo/text/Utf8TestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/Utf8TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Ignore; diff --git a/vespajlib/src/test/java/com/yahoo/text/XMLTestCase.java b/vespajlib/src/test/java/com/yahoo/text/XMLTestCase.java index a495a685cfa..6320efc2f11 100644 --- a/vespajlib/src/test/java/com/yahoo/text/XMLTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/XMLTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java index d6cab8e7faa..75f6bf64734 100644 --- a/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text; import org.junit.After; diff --git a/vespajlib/src/test/java/com/yahoo/time/WallClockSourceTestCase.java b/vespajlib/src/test/java/com/yahoo/time/WallClockSourceTestCase.java index 4c181235a38..e26591c9c64 100644 --- a/vespajlib/src/test/java/com/yahoo/time/WallClockSourceTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/time/WallClockSourceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.time; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/transaction/NestedTransactionTestCase.java b/vespajlib/src/test/java/com/yahoo/transaction/NestedTransactionTestCase.java index 4feb0869aa0..887c3909f73 100644 --- a/vespajlib/src/test/java/com/yahoo/transaction/NestedTransactionTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/transaction/NestedTransactionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.transaction; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/vespa/objects/BigIdClass.java b/vespajlib/src/test/java/com/yahoo/vespa/objects/BigIdClass.java index 35bfbbc2078..3c1065369ca 100644 --- a/vespajlib/src/test/java/com/yahoo/vespa/objects/BigIdClass.java +++ b/vespajlib/src/test/java/com/yahoo/vespa/objects/BigIdClass.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.objects; import java.nio.ByteBuffer; diff --git a/vespajlib/src/test/java/com/yahoo/vespa/objects/FieldBaseTestCase.java b/vespajlib/src/test/java/com/yahoo/vespa/objects/FieldBaseTestCase.java index 7a6a53ceeec..d60184c5616 100644 --- a/vespajlib/src/test/java/com/yahoo/vespa/objects/FieldBaseTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/vespa/objects/FieldBaseTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.objects; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/vespa/objects/FooBarIdClass.java b/vespajlib/src/test/java/com/yahoo/vespa/objects/FooBarIdClass.java index 23a570b80fb..9aa5716d4ee 100644 --- a/vespajlib/src/test/java/com/yahoo/vespa/objects/FooBarIdClass.java +++ b/vespajlib/src/test/java/com/yahoo/vespa/objects/FooBarIdClass.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.objects; import java.util.List; diff --git a/vespajlib/src/test/java/com/yahoo/vespa/objects/ObjectDumperTestCase.java b/vespajlib/src/test/java/com/yahoo/vespa/objects/ObjectDumperTestCase.java index 991f50f4633..03a03ba063f 100644 --- a/vespajlib/src/test/java/com/yahoo/vespa/objects/ObjectDumperTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/vespa/objects/ObjectDumperTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.objects; import org.junit.Test; diff --git a/vespajlib/src/test/java/com/yahoo/vespa/objects/SerializeTestCase.java b/vespajlib/src/test/java/com/yahoo/vespa/objects/SerializeTestCase.java index 154e7d27bcc..122cdf24a89 100644 --- a/vespajlib/src/test/java/com/yahoo/vespa/objects/SerializeTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/vespa/objects/SerializeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.objects; import com.yahoo.io.GrowableByteBuffer; diff --git a/vespajlib/src/test/java/com/yahoo/vespa/objects/SomeIdClass.java b/vespajlib/src/test/java/com/yahoo/vespa/objects/SomeIdClass.java index 31e3668ca6f..6c24ba1367d 100644 --- a/vespajlib/src/test/java/com/yahoo/vespa/objects/SomeIdClass.java +++ b/vespajlib/src/test/java/com/yahoo/vespa/objects/SomeIdClass.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.objects; public class SomeIdClass extends Identifiable -- cgit v1.2.3