Skip to content

Commit

Permalink
Bump assertj-core from 3.18.1 to 3.19.0 (#136)
Browse files Browse the repository at this point in the history
* Bump assertj-core from 3.18.1 to 3.19.0

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](assertj/assertj@assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Michał Chmielarz <michal.chmielarz@gmail.com>
  • Loading branch information
dependabot[bot] and mchmielarz authored Jan 29, 2021
1 parent 0d51c05 commit a648d11
Show file tree
Hide file tree
Showing 84 changed files with 130 additions and 1,071 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.18.1</version>
<version>3.19.0</version>
</dependency>
<dependency>
<groupId>io.vavr</groupId>
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/AbstractEitherAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
<p>
http://www.apache.org/licenses/LICENSE-2.0
<p>
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
<p>
Copyright 2012-2019 the original author or authors.
*/

import io.vavr.control.Either;
import org.assertj.core.api.Assertions;
import org.assertj.core.internal.ComparatorBasedComparisonStrategy;
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/AbstractMapAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.collection.Map;
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/AbstractOptionAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
<p>
http://www.apache.org/licenses/LICENSE-2.0
<p>
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
<p>
Copyright 2012-2017 the original author or authors.
*/

import io.vavr.control.Option;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.Condition;
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/AbstractSeqAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
<p>
http://www.apache.org/licenses/LICENSE-2.0
<p>
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
<p>
Copyright 2012-2019 the original author or authors.
*/

import io.vavr.collection.Seq;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.Condition;
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/AbstractTryAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
<p>
http://www.apache.org/licenses/LICENSE-2.0
<p>
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
<p>
Copyright 2012-2017 the original author or authors.
*/

import io.vavr.control.Try;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.Condition;
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/AbstractValidationAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
<p>
http://www.apache.org/licenses/LICENSE-2.0
<p>
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
<p>
Copyright 2012-2019 the original author or authors.
*/

import io.vavr.control.Validation;
import org.assertj.core.api.Assertions;
import org.assertj.core.internal.ComparatorBasedComparisonStrategy;
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/EitherShouldContain.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.control.Either;
import org.assertj.core.error.BasicErrorMessageFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.control.Either;
import org.assertj.core.error.BasicErrorMessageFactory;

Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/OptionShouldContain.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2017 the original author or authors.
*/

import io.vavr.control.Option;
import org.assertj.core.error.BasicErrorMessageFactory;

Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/TryShouldContain.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2017 the original author or authors.
*/

import io.vavr.control.Try;
import org.assertj.core.error.BasicErrorMessageFactory;

Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/assertj/vavr/api/ValidationShouldContain.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.control.Validation;
import org.assertj.core.error.BasicErrorMessageFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.control.Validation;
import org.assertj.core.error.BasicErrorMessageFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void should_fail_if_consumer_fails() {
() -> assertThat(actual).hasLeftValueSatisfying(it -> assertThat(it).isEqualTo(24))
)
.isInstanceOf(AssertionError.class)
.hasMessage(format("%nExpecting:%n <42>%nto be equal to:%n <24>%nbut was not."));
.hasMessage(format("%nexpected: 24%nbut was : 42"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void should_fail_if_consumer_fails() {
() -> assertThat(actual).hasRightValueSatisfying(it -> assertThat(it).isEqualTo("something else"))
)
.isInstanceOf(AssertionError.class)
.hasMessage(format("%nExpecting:%n <\"something\">%nto be equal to:%n <\"something else\">%nbut was not."));
.hasMessage(format("%nexpected: \"something else\"%nbut was : \"something\""));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.collection.HashMap;
import io.vavr.collection.Map;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -84,6 +71,6 @@ void should_fail_if_all_Map_entries_do_not_satisfy_consumer() {
})
)
.isInstanceOf(AssertionError.class)
.hasMessage("\nExpecting:\n <\"key2\">\nto be equal to:\n <\"key1\">\nbut was not.");
.hasMessage("\nexpected: \"key1\"\nbut was : \"key2\"");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.collection.HashMap;
Expand Down Expand Up @@ -100,6 +87,6 @@ void should_fail_if_Map_does_not_contain_all_entries() {
() -> assertThat(actual).containsAllEntriesOf(List.of(ENTRY1, ENTRY2))
)
.isInstanceOf(AssertionError.class)
.hasMessage("\nExpecting HashMap:\n <HashMap((key1, value1), (key3, value3))>\nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find the following element(s):\n <HashSet((key2, value2))>\n");
.hasMessage("\nExpecting HashMap:\n HashMap((key1, value1), (key3, value3))\nto contain:\n [(key1, value1), (key2, value2)]\nbut could not find the following element(s):\n HashSet((key2, value2))\n");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
package org.assertj.vavr.api;

/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
* <p>
* Copyright 2012-2019 the original author or authors.
*/

import io.vavr.collection.HashMap;
import io.vavr.collection.Map;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -62,6 +49,6 @@ void should_fail_if_Map_does_not_contain_the_given_entry() {
() -> assertThat(actual).containsEntry("key2", "value2")
)
.isInstanceOf(AssertionError.class)
.hasMessage("\nExpecting HashMap:\n <HashMap((key1, value1), (key3, value3))>\nto contain:\n <[(key2, value2)]>\nbut could not find the following element(s):\n <HashSet((key2, value2))>\n");
.hasMessage("\nExpecting HashMap:\n HashMap((key1, value1), (key3, value3))\nto contain:\n [(key2, value2)]\nbut could not find the following element(s):\n HashSet((key2, value2))\n");
}
}
Loading

0 comments on commit a648d11

Please sign in to comment.