Home
last modified time | relevance | path

Searched refs:merge (Results 1 – 25 of 61) sorted by relevance

123

/libcore/ojluni/src/test/java/util/StringJoiner/
DMergeTest.java74 sj.merge(null); in testNull()
84 sj.merge(other); in testSimple()
95 sj.merge(other); in testEmptyOther()
99 sj.merge(other); in testEmptyOther()
110 sj.merge(other); in testEmptyThis()
115 sj.merge(other); in testEmptyThis()
125 sj.merge(other); in testEmptyBoth()
129 sj.merge(other); in testEmptyBoth()
134 sj.merge(other); in testEmptyBoth()
145 o1.merge(o2); in testCascadeEmpty()
[all …]
/libcore/tools/expected_upstream/
Dojluni_merge_package.sh26 -t|--tag - the upstream tag to merge to; default: ${DEFAULT_TAG} or
138 function merge-class
157 function do-merge
186 function ojluni-merge-package
202 merge-class modify "${package}.${class_name}" "${version}"
204 merge-class add "${package}.${class_name}" "${version}"
218 merge-class add "${package}.${class_name}" "${version}"
221 do-merge "${package}" "${bug}"
226 function ojluni-merge-class
235 merge-class modify "${package}.${class}" "${version}"
[all …]
DREADME.md13 `git merge` from an OpenJDK branch. However, each file in `ojluni/` can come
15 storing the OpenJDK version of each file. Thus, we can use `git merge` when
17 automatically merge the file if no merge conflict.
47 `ojluni_merge_to_main` will `git-merge` from the upstream branch.
48 If you see any merge conflicts, please resolve the merge conflicts as usual,
55 # -a imports more files into the last merge commit instead of a new commit
76 # -a imports more files into the last merge commit instead of a new commit
89 # Upload the merge commit to the main branch
111 import the file from the upstream. Later, you can merge the file and
116 3. Revert the merge commit on `aosp/main` from `expected_upstream`
[all …]
/libcore/luni/src/test/java/libcore/java/util/
DStringJoinerTest.java87 assertEquals("[Hello world FooBar a!b]", sj1.merge(sj2).merge(sj3).toString()); in testMerge()
93 assertEquals("", sj1.merge(sj2).toString()); in testMergeEmpty()
98 assertEquals("|Hello world Hello world|", sj.merge(sj).toString()); in testMergeSelf()
103 new StringJoiner(" ").merge(null); in testMergeNull()
DMapDefaultMethodTester.java407 assertEquals(10.0, m.merge(1, 10.0, (v1, v2) -> v2)); in test_merge()
412 assertEquals(25.0, m.merge(1, 15.0, (v1, v2) -> v1 + v2)); in test_merge()
417 m.merge(1, 10.0, (k, v) -> null); in test_merge()
422 m.merge(1, 5.0, null); in test_merge()
428 assertEquals(15.0, m.merge(null, 15.0, (v1, v2) -> v2)); in test_merge()
432 m.merge(null, 15.0, (v1, v2) -> v2); in test_merge()
DCollectionsTest.java594 Collections.unmodifiableMap(new HashMap<>()).merge(1, 2.0, (k, v) -> 1.0); in test_unmodifiableMap_merge()
603 Collections.unmodifiableMap(m).merge(1, 2.0, (k, v) -> 1.0); in test_unmodifiableMap_merge()
929 assertThrowsUoe(() -> { map.merge(absentKey, absentValue, (k, v) -> absentValue); }); in check_unmodifiableOrderedMap_defaultMethods()
941 assertThrowsUoe(() -> { map.merge(sampleKey, sampleValue, (k, v) -> absentValue); }); in check_unmodifiableOrderedMap_defaultMethods()
1049 assertThrowsCce(() -> { map.merge(new Object(), presentValue, (v1, v2) -> presentValue); }); in check_map_isChecked()
1050 assertThrowsCce(() -> { map.merge(presentKey, presentValue, (v1, v2) -> new Object()); }); in check_map_isChecked()
1053 map.merge(absentKey, absentValue, (v1, v2) -> new Object()); in check_map_isChecked()
1276 Collections.emptyMap().merge(1, 5.0, (k, v) -> 5.0); in test_EmptyMap_merge()
1353 Collections.singletonMap(1, 11.0).merge(1, 5.0, (k, v) -> 5.0); in test_SingletonMap_merge()
1622 checkedMap2.merge(1, A_STRING, (v1, v2) -> NOT_A_STRING); in test_CheckedMap_merge()
/libcore/luni/
Dbouncycastle-license.txt7 without limitation the rights to use, copy, modify, merge, publish,
Dunicode-license.txt26 rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
/libcore/tools/upstream/
Dmerge-from-upstream165 def merge(self, branch): member in Repo
301 if self.repo.merge('ojluni'):
/libcore/ojluni/annotations/hiddenapi/sun/misc/
DJarIndex.java95 public void merge(sun.misc.JarIndex toIndex, java.lang.String path) { in merge() method in JarIndex
/libcore/ojluni/src/main/java/java/util/
DStringJoiner.java231 public StringJoiner merge(StringJoiner other) { in merge() method in StringJoiner
/libcore/ojluni/src/test/java/util/Collections/
DDelegatingIteratorForEachRemaining.java148 …@Override public V merge(K key, V value, BiFunction<? super V, ? super V, ? extends V> remappingFu… in merge() method in DelegatingIteratorForEachRemaining.ForwardingMap
/libcore/ojluni/annotations/flagged_api/java/util/
DHashMap.annotated.java80 public V merge(K key, V value, java.util.function.BiFunction<? super V,? super V,? extends V> remap… in merge() method in HashMap
DTreeMap.annotated.java73 public V merge(K key, V value, java.util.function.BiFunction<? super V,? super V,? extends V> remap… in merge() method in TreeMap
/libcore/
DNOTICE42 without limitation the rights to use, copy, modify, merge, publish,
77 without limitation the rights to use, copy, modify, merge, publish,
/libcore/ojluni/src/main/java/java/util/concurrent/
DConcurrentMap.java475 default V merge(K key, V value, in merge() method
/libcore/ojluni/src/main/java/sun/security/provider/certpath/
DConstraintsChecker.java208 prevNC.merge(newConstraints); in mergeNameConstraints()
DBuilder.java330 constraints.merge(ncExt); in targetDistance()
/libcore/ojluni/src/main/java/jdk/internal/util/jar/
DJarIndex.java322 public void merge(JarIndex toIndex, String path) { in merge() method in JarIndex
/libcore/ojluni/src/main/java/java/util/stream/
DCollectors.java413 StringJoiner::add, StringJoiner::merge,
433 m1.merge(e.getKey(), e.getValue(), mergeFunction);
1674 = (map, element) -> map.merge(keyMapper.apply(element),
1838 = (map, element) -> map.merge(keyMapper.apply(element),
DWhileOps.java1260 result = merge();
1270 Node<P_OUT> merge() {
1387 Node<P_OUT> result = merge();
1394 private Node<P_OUT> merge() {
/libcore/luni/src/test/java/libcore/java/lang/
DSystemTest.java183 System.getProperties().merge("user.dir", "meh", (s1, s2) -> s2.toString() + s1); in testSystemProperties_immutable()
/libcore/ojluni/annotations/mmodule/java/security/
DProvider.annotated.java81 public synchronized java.lang.Object merge(java.lang.Object key, java.lang.Object value, java.util.… in merge() method in Provider
/libcore/ojluni/annotations/flagged_api/java/util/concurrent/
DConcurrentSkipListMap.annotated.java76 public V merge(K key, V value, java.util.function.BiFunction<? super V,? super V,? extends V> remap… in merge() method in ConcurrentSkipListMap
/libcore/ojluni/annotations/sdk/nullability/java/util/
DHashMap.annotated.java81 @libcore.util.Nullable public V merge(@libcore.util.NullFromTypeParam K key, @libcore.util.NonNull … in merge() method in HashMap

123