From 4f4c32588d8dc0e765793a9e317e912da2ddf05b Mon Sep 17 00:00:00 2001
From: Goktug Gokdogan <goktug@google.com>
Date: Thu, 19 May 2022 15:41:20 -0700
Subject: [PATCH] Add test case to validate @After is called even if @Before is
 failed.

PiperOrigin-RevId: 449848649
---
 .../junit/integration/junit4/JUnit4IntegrationTest2.java    | 2 +-
 .../junit/integration/junit4/data/ThrowsInBeforeTest.java   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/JUnit4IntegrationTest2.java b/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/JUnit4IntegrationTest2.java
index 1f8a153a6f..a602cc1fad 100644
--- a/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/JUnit4IntegrationTest2.java
+++ b/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/JUnit4IntegrationTest2.java
@@ -106,7 +106,7 @@ public void testThrowsInBefore() throws Exception {
             .testClassName(testName)
             .addTestFailure("test")
             .addTestSuccess("testOther")
-            .addJavaLogLineSequence("before", "before", "testOther")
+            .addJavaLogLineSequence("before", "after", "before", "testOther", "after")
             .addBlackListedWord("should_not_be_in_log")
             .build();
 
diff --git a/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/data/ThrowsInBeforeTest.java b/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/data/ThrowsInBeforeTest.java
index e0927dd2ad..15c2efab33 100644
--- a/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/data/ThrowsInBeforeTest.java
+++ b/junit/generator/javatests/com/google/j2cl/junit/integration/junit4/data/ThrowsInBeforeTest.java
@@ -16,6 +16,7 @@
 package com.google.j2cl.junit.integration.junit4.data;
 
 import com.google.j2cl.junit.integration.testlogger.TestCaseLogger;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -44,6 +45,11 @@ public void before() {
     }
   }
 
+  @After
+  public void after() {
+    TestCaseLogger.log("after");
+  }
+
   @Test
   public void test() {
     TestCaseLogger.log("should_not_be_in_log");