Skip to content

Commit

Permalink
Fix repository name references after renaming
Browse files Browse the repository at this point in the history
See #2424.
  • Loading branch information
scordio committed Aug 23, 2022
1 parent 57b8416 commit 62435d0
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
sonar:
name: Sonar code analysis
runs-on: ubuntu-latest
if: github.repository == 'assertj/assertj-core' && github.event_name == 'push'
if: github.repository == 'assertj/assertj' && github.event_name == 'push'

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* Fixes #??? (ignore if not applicable)
* Unit tests : YES / NO / NA
* Javadoc with a code example (on API only) : YES / NO / NA
* PR meets the [contributing guidelines](https://github.com/assertj/assertj-core/blob/main/CONTRIBUTING.md)
* PR meets the [contributing guidelines](https://github.com/assertj/assertj/blob/main/CONTRIBUTING.md)

Following the [contributing guidelines](https://github.com/assertj/assertj-core/blob/main/CONTRIBUTING.md) will make it easier for us to review and accept your PR.
Following the [contributing guidelines](https://github.com/assertj/assertj/blob/main/CONTRIBUTING.md) will make it easier for us to review and accept your PR.
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# AssertJ - Fluent Assertions for Java [![Maven Central](https://img.shields.io/maven-central/v/org.assertj/assertj-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22org.assertj%22%20AND%20a:%22assertj-core%22) [![Javadocs](http://www.javadoc.io/badge/org.assertj/assertj-core.svg)](http://www.javadoc.io/doc/org.assertj/assertj-core)

[![CI](https://github.com/assertj/assertj-core/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/assertj/assertj-core/actions/workflows/main.yml?query=branch%3Amain)
[![Cross-Version](https://github.com/assertj/assertj-core/actions/workflows/cross-version.yml/badge.svg?branch=main)](https://github.com/assertj/assertj-core/actions/workflows/cross-version.yml?query=branch%3Amain)
[![Binary Compatibility](https://github.com/assertj/assertj-core/actions/workflows/binary-compatibility.yml/badge.svg?branch=main)](https://github.com/assertj/assertj-core/actions/workflows/binary-compatibility.yml?query=branch%3Amain)
[![CI](https://github.com/assertj/assertj/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/assertj/assertj/actions/workflows/main.yml?query=branch%3Amain)
[![Cross-Version](https://github.com/assertj/assertj/actions/workflows/cross-version.yml/badge.svg?branch=main)](https://github.com/assertj/assertj/actions/workflows/cross-version.yml?query=branch%3Amain)
[![Binary Compatibility](https://github.com/assertj/assertj/actions/workflows/binary-compatibility.yml/badge.svg?branch=main)](https://github.com/assertj/assertj/actions/workflows/binary-compatibility.yml?query=branch%3Amain)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=joel-costigliola_assertj-core&metric=alert_status)](https://sonarcloud.io/dashboard?id=joel-costigliola_assertj-core)

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)
Expand All @@ -25,7 +25,7 @@ The idea is that disposal assertions should be specific to the type of the objec

AssertJ's assertions are super easy to use: just type **`assertThat(underTest).`** and use code completion to show you all assertions available.

Assertion missing? Please [create an issue](https://github.com/assertj/assertj-core/issues) to discuss it and even better [contribute to the project](https://github.com/assertj/assertj-core/blob/main/CONTRIBUTING.md)!
Assertion missing? Please [create an issue](https://github.com/assertj/assertj/issues) to discuss it and even better [contribute to the project](https://github.com/assertj/assertj/blob/main/CONTRIBUTING.md)!


AssertJ is composed of several modules:
Expand All @@ -36,10 +36,8 @@ AssertJ is composed of several modules:
* A **[DB module](https://github.com/assertj/assertj-db#readme)** to provide assertions for relational database types (`Table`, `Row`, `Column`...) - see [AssertJ DB documentation](https://assertj.github.io/doc/#assertj-db) and [javadoc](https://www.javadoc.io/doc/org.assertj/assertj-db/latest/index.html).
* A **[Swing module](https://github.com/assertj/assertj-swing#readme)** provides a simple and intuitive API for functional testing of Swing user interfaces - see [AssertJ Swing documentation](http://joel-costigliola.github.io/assertj/assertj-swing.html) and [javadoc](https://www.javadoc.io/doc/org.assertj/assertj-swing/latest/index.html).



## <a name="contributing"/>Want to contribute?</a>

You are encouraged to contribute any missing useful assertions.

Please read the [contributing section](https://github.com/assertj/assertj-core/blob/main/CONTRIBUTING.md) and raise a PR!
Please read the [contributing section](https://github.com/assertj/assertj/blob/main/CONTRIBUTING.md) and raise a PR!
2 changes: 1 addition & 1 deletion assertj-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@
<configuration>
<!-- Explicitly set Javadoc locale to English -->
<locale>en_US</locale>
<!-- needed to fix javadoc on java 11+ https://github.com/assertj/assertj-core/issues/1403 -->
<!-- needed to fix javadoc on java 11+ https://github.com/assertj/assertj/issues/1403 -->
<source>8</source>
<!-- (1) CSS file location -->
<stylesheetfile>${project.build.directory}/javadoc-stylesheet/assertj-javadoc-min.css</stylesheetfile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
*/
public abstract class AbstractAssert<SELF extends AbstractAssert<SELF, ACTUAL>, ACTUAL> implements Assert<SELF, ACTUAL> {

// https://github.com/assertj/assertj-core/issues/1128
// https://github.com/assertj/assertj/issues/1128
public static boolean throwUnsupportedExceptionOnEquals = true;

private static final String ORG_ASSERTJ = "org.assert";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ public void assertContainsIgnoringCase(AssertionInfo info, CharSequence actual,
throw failures.failure(info, shouldContainIgnoringCase(actual, sequence));
}

// CS427 Issue link: https://github.com/assertj/assertj-core/issues/2060
// CS427 Issue link: https://github.com/assertj/assertj/issues/2060
/**
* Verifies the given {@code CharSequence} has the strings, ignoring newlines.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -946,12 +946,12 @@ void withAssertions_assertThat_doublePredicate_Test() {

@Test
void withAssertions_assertThat_url_Test() throws MalformedURLException {
assertThat(new URL("https://github.com/assertj/assertj-core")).hasHost("github.com");
assertThat(new URL("https://github.com/assertj/assertj")).hasHost("github.com");
}

@Test
void withAssertions_assertThat_uri_Test() {
assertThat(java.net.URI.create("https://github.com/assertj/assertj-core")).hasHost("github.com");
assertThat(java.net.URI.create("https://github.com/assertj/assertj")).hasHost("github.com");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void should_ignore_test_for_failing_assumption_extracting_and_narrowing_an_Atomi
.isNull());
}

// https://github.com/assertj/assertj-core/issues/2349
// https://github.com/assertj/assertj/issues/2349
@Test
void should_ignore_test_for_failing_assumption_extracting_and_narrowing_a_BigDecimal() {
expectAssumptionNotMetException(() -> assumeThat(data).extracting(TestData::bigDecimal, as(BIG_DECIMAL)).isZero());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ void raw_set_assertions_mixed_with_inherited_methods() {
.contains("Key1", atIndex(0));
}

// https://github.com/assertj/assertj/issues/485
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
void test_bug_485() {
// https://github.com/assertj/assertj-core/issues/485
Set set = new java.util.HashSet<>();
set.add("Key1");
set.add("Key2");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ void raw_list_assertions_mixed_with_inherited_methods() {
.contains("Key1", atIndex(0));
}

// https://github.com/assertj/assertj/issues/485
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
void test_bug_485() {
// https://github.com/assertj/assertj-core/issues/485
List list = new java.util.ArrayList<>();
list.add("Key1");
list.add("Key2");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ void raw_map_mixing_assertions_from_AbstractAssert_and_AbstractMapAssert() {
.containsOnlyKeys("Key1", "Key2");
}

// https://github.com/assertj/assertj/issues/485
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
void test_bug_485() {
// https://github.com/assertj/assertj-core/issues/485
Map map1 = new java.util.HashMap<>();
map1.put("Key1", "Value1");
map1.put("Key2", "Value2");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void should_allow_assertions_on_more_than_five_extracted_values_from_given_itera
tuple("Boromir", 37, MAN, "Boromir", 37, MAN));
}

// https://github.com/assertj/assertj-core/issues/880
// https://github.com/assertj/assertj/issues/880
@Test
void should_be_able_to_extract_values_returned_from_default_methods_from_given_iterable_elements() {
List<Person> people = asList(new Person());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public void should_fail_when_actual_differs_from_expected_on_compared_fields_ind
diff("deleted", staff.deleted, staffWithLessFields.deleted));
}

// https://github.com/assertj/assertj-core/issues/2610
// https://github.com/assertj/assertj/issues/2610
static class A1 {
final int a, b;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ void should_report_unmatched_duplicate_elements_even_if_the_first_was_matched()
then(assertionError).hasMessageContaining(format("The following expected elements were not matched in the actual ArrayList:%n [bbb]"));
}

// https://github.com/assertj/assertj-core/issues/2279
// https://github.com/assertj/assertj/issues/2279
@Test
void should_not_throw_UnknownFormatConversionException_when_unmatched_elements_have_percent_in_their_description() {
// GIVEN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ void should_fail_if_actual_contains_any_non_digit_character() {
.withMessage(shouldContainOnlyDigits("10$", '$', 2).create());
}

/**
* See <a href="https://github.com/assertj/assertj-core/pull/342">discussion on failing the assertion for empty CharSequence</a>
*/

// See https://github.com/assertj/assertj/pull/342 - discussion on failing the assertion for empty CharSequence
@Test
void should_fail_if_actual_is_empty() {
assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> strings.assertContainsOnlyDigits(someInfo(), ""))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void should_only_consider_root_object_for_cycles() {
then(formatted).isEqualTo("[[1, 2, 3], [1, 2, 3]]");
}

// see https://github.com/assertj/assertj-core/issues/1990
// https://github.com/assertj/assertj/issues/1990
@Test
public void should_use_overridden_toString_over_iterable_representation() {
// GIVEN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
import org.junit.jupiter.api.Timeout;

/**
* See https://github.com/assertj/assertj-core/issues/1718.
* <p>
* This test ensures assertThat(list_of_1m_elements).containsOnly(...) is an O(N) rather than O(N^2)
* These tests ensure assertThat(list_of_1m_elements).containsOnly(...) is an O(N) rather than O(N^2)
* operation. Given that the list has 1 million elements, O(N^2) is O(1000 billion), which should
* take from several dozens to several thousands seconds, given that the constant in the actual
* complexity is low (which indeed is, in case of ArrayList, where the main contributor to the time
Expand All @@ -36,6 +34,8 @@
* Therefore, 5 seconds (the limit used in the tests below) seems to be a good threshold that would
* clearly distinguish .containsOnly(...) being O(N) or O(N^2) on any test agent, thus preventing
* a regression of .containsOnly(...) back to O(N^2) complexity.
*
* @see <a href="https://github.com/assertj/assertj/issues/1718">assertj/assertj#1718</a>
*/
class ContainsOnlyPerfTest {

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@
</modules>

<scm>
<developerConnection>scm:git:https://github.com/assertj/assertj-core.git</developerConnection>
<connection>scm:git:https://github.com/assertj/assertj-core.git</connection>
<url>https://github.com/assertj/assertj-core</url>
<developerConnection>scm:git:https://github.com/assertj/assertj.git</developerConnection>
<connection>scm:git:https://github.com/assertj/assertj.git</connection>
<url>https://github.com/assertj/assertj</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/assertj/assertj-core/issues</url>
<url>https://github.com/assertj/assertj/issues</url>
</issueManagement>
<distributionManagement>
<repository>
Expand Down

0 comments on commit 62435d0

Please sign in to comment.