SubmoduleSubscriptionsIT: fix line length formatting
Change-Id: I114306b163e4d443849661fe7768d4f8d06dd180 Signed-off-by: Stefan Beller <sbeller@google.com>
This commit is contained in:
		| @@ -43,9 +43,11 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|     TestRepository<?> superRepo = createProjectWithPush("super-project"); |     TestRepository<?> superRepo = createProjectWithPush("super-project"); | ||||||
|     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project"); |     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project"); | ||||||
|  |  | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     assertThat(hasSubmodule(superRepo, "master", "subscribed-to-project")).isFalse(); |     assertThat(hasSubmodule(superRepo, "master", | ||||||
|  |         "subscribed-to-project")).isFalse(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   @Test |   @Test | ||||||
| @@ -55,7 +57,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|     allowSubmoduleSubscription("subscribed-to-project", "refs/heads/master", |     allowSubmoduleSubscription("subscribed-to-project", "refs/heads/master", | ||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     ObjectId subHEAD = pushChangeTo(subRepo, "master"); |     ObjectId subHEAD = pushChangeTo(subRepo, "master"); | ||||||
|     expectToHaveSubmoduleState(superRepo, "master", |     expectToHaveSubmoduleState(superRepo, "master", | ||||||
| @@ -70,7 +73,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     ObjectId subHEAD = pushChangeTo(subRepo, "master"); |     ObjectId subHEAD = pushChangeTo(subRepo, "master"); | ||||||
|     expectToHaveSubmoduleState(superRepo, "master", |     expectToHaveSubmoduleState(superRepo, "master", | ||||||
|         "subscribed-to-project", subHEAD); |         "subscribed-to-project", subHEAD); | ||||||
| @@ -87,8 +91,10 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|     pushChangeTo(superRepo, "branch"); |     pushChangeTo(superRepo, "branch"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|     createSubmoduleSubscription(superRepo, "branch", "subscribed-to-project", "master"); |         "subscribed-to-project", "master"); | ||||||
|  |     createSubmoduleSubscription(superRepo, "branch", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|  |  | ||||||
|     ObjectId subHEAD = pushChangeTo(subRepo, "master"); |     ObjectId subHEAD = pushChangeTo(subRepo, "master"); | ||||||
|  |  | ||||||
| @@ -111,8 +117,10 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|     pushChangeTo(subRepo, "branch"); |     pushChangeTo(subRepo, "branch"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|     createSubmoduleSubscription(superRepo, "branch", "subscribed-to-project", "branch"); |         "subscribed-to-project", "master"); | ||||||
|  |     createSubmoduleSubscription(superRepo, "branch", | ||||||
|  |         "subscribed-to-project", "branch"); | ||||||
|  |  | ||||||
|     ObjectId subHEAD1 = pushChangeTo(subRepo, "master"); |     ObjectId subHEAD1 = pushChangeTo(subRepo, "master"); | ||||||
|     ObjectId subHEAD2 = pushChangeTo(subRepo, "branch"); |     ObjectId subHEAD2 = pushChangeTo(subRepo, "branch"); | ||||||
| @@ -123,7 +131,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "subscribed-to-project", subHEAD2); |         "subscribed-to-project", subHEAD2); | ||||||
|  |  | ||||||
|     // Now test that cross subscriptions do not work: |     // Now test that cross subscriptions do not work: | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "branch"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "branch"); | ||||||
|     ObjectId subHEAD3 = pushChangeTo(subRepo, "branch"); |     ObjectId subHEAD3 = pushChangeTo(subRepo, "branch"); | ||||||
|  |  | ||||||
|     expectToHaveSubmoduleState(superRepo, "master", |     expectToHaveSubmoduleState(superRepo, "master", | ||||||
| @@ -141,7 +150,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|  |  | ||||||
|     // The first update doesn't include any commit messages |     // The first update doesn't include any commit messages | ||||||
|     ObjectId subRepoId = pushChangeTo(subRepo, "master"); |     ObjectId subRepoId = pushChangeTo(subRepo, "master"); | ||||||
| @@ -166,7 +176,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     ObjectId subHEAD = pushChangeTo(subRepo, "master"); |     ObjectId subHEAD = pushChangeTo(subRepo, "master"); | ||||||
|  |  | ||||||
|     // The first update doesn't include the rev log |     // The first update doesn't include the rev log | ||||||
| @@ -196,7 +207,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     ObjectId subHEADbeforeUnsubscribing = pushChangeTo(subRepo, "master"); |     ObjectId subHEADbeforeUnsubscribing = pushChangeTo(subRepo, "master"); | ||||||
| @@ -214,14 +226,16 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   @Test |   @Test | ||||||
|   public void testSubscriptionUnsubscribeByDeletingGitModules() throws Exception { |   public void testSubscriptionUnsubscribeByDeletingGitModules() | ||||||
|  |       throws Exception { | ||||||
|     TestRepository<?> superRepo = createProjectWithPush("super-project"); |     TestRepository<?> superRepo = createProjectWithPush("super-project"); | ||||||
|     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project"); |     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project"); | ||||||
|     allowSubmoduleSubscription("subscribed-to-project", "refs/heads/master", |     allowSubmoduleSubscription("subscribed-to-project", "refs/heads/master", | ||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     ObjectId subHEADbeforeUnsubscribing = pushChangeTo(subRepo, "master"); |     ObjectId subHEADbeforeUnsubscribing = pushChangeTo(subRepo, "master"); | ||||||
| @@ -245,7 +259,8 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|     allowSubmoduleSubscription("subscribed-to-project", "refs/heads/foo", |     allowSubmoduleSubscription("subscribed-to-project", "refs/heads/foo", | ||||||
|         "super-project", "refs/heads/master"); |         "super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "foo"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "foo"); | ||||||
|     ObjectId subFoo = pushChangeTo(subRepo, "foo"); |     ObjectId subFoo = pushChangeTo(subRepo, "foo"); | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|  |  | ||||||
| @@ -264,14 +279,17 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     pushChangeTo(superRepo, "master"); |     pushChangeTo(superRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     createSubmoduleSubscription(subRepo, "master", "super-project", "master"); |     createSubmoduleSubscription(subRepo, "master", "super-project", "master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     pushChangeTo(superRepo, "master"); |     pushChangeTo(superRepo, "master"); | ||||||
|  |  | ||||||
|     assertThat(hasSubmodule(subRepo, "master", "super-project")).isFalse(); |     assertThat(hasSubmodule(subRepo, "master", | ||||||
|     assertThat(hasSubmodule(superRepo, "master", "subscribed-to-project")).isFalse(); |         "super-project")).isFalse(); | ||||||
|  |     assertThat(hasSubmodule(superRepo, "master", | ||||||
|  |         "subscribed-to-project")).isFalse(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -281,9 +299,11 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project"); |     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     assertThat(hasSubmodule(superRepo, "master", "subscribed-to-project")).isFalse(); |     assertThat(hasSubmodule(superRepo, "master", | ||||||
|  |         "subscribed-to-project")).isFalse(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   @Test |   @Test | ||||||
| @@ -294,9 +314,11 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "wrong-super-project", "refs/heads/master"); |         "wrong-super-project", "refs/heads/master"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     assertThat(hasSubmodule(superRepo, "master", "subscribed-to-project")).isFalse(); |     assertThat(hasSubmodule(superRepo, "master", | ||||||
|  |         "subscribed-to-project")).isFalse(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   @Test |   @Test | ||||||
| @@ -307,9 +329,11 @@ public class SubmoduleSubscriptionsIT extends AbstractSubmoduleSubscription { | |||||||
|         "super-project", "refs/heads/wrong-branch"); |         "super-project", "refs/heads/wrong-branch"); | ||||||
|  |  | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     createSubmoduleSubscription(superRepo, "master", "subscribed-to-project", "master"); |     createSubmoduleSubscription(superRepo, "master", | ||||||
|  |         "subscribed-to-project", "master"); | ||||||
|     pushChangeTo(subRepo, "master"); |     pushChangeTo(subRepo, "master"); | ||||||
|     assertThat(hasSubmodule(superRepo, "master", "subscribed-to-project")).isFalse(); |     assertThat(hasSubmodule(superRepo, "master", | ||||||
|  |         "subscribed-to-project")).isFalse(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   @Test |   @Test | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Stefan Beller
					Stefan Beller