Skip to content

Commit 1bc3ec6

Browse files
evantevant
committed
fixed tests and updated CHANGELOG and README
1 parent 729949d commit 1bc3ec6

File tree

6 files changed

+42
-14
lines changed

6 files changed

+42
-14
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
#### 3.3.0-beta4
2+
- Merged in all changes up to `3.2.5`
3+
- Supports running with other transforms (this is a bit hackey, hopefully we'll get per-variant
4+
transforms and it can be implemented far more cleanly).
5+
16
#### 3.3.0-beta3
2-
- Supports transform api in android plugin '1.5.0'
7+
- Supports transform api in android plugin `1.5.0`
38

49
#### 3.3.0-beta2
510
Experimental support for the new transform api

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Usage
2424
}
2525
2626
dependencies {
27-
classpath 'me.tatarka:gradle-retrolambda:3.3.0-beta3'
27+
classpath 'me.tatarka:gradle-retrolambda:3.3.0-beta4'
2828
}
2929
}
3030

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
allprojects {
22
group = 'me.tatarka'
3-
version = '3.3.0-SNAPSHOT'
3+
version = '3.3.0-beta4'
44
ext.androidPluginVersion = '2.0.0-beta2'
55
}

‎gradle-retrolambda/src/test/java/me/tatarka/AndroidAppPluginTest.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import java.io.File;
1414
import java.io.IOException;
15+
import java.io.StringWriter;
1516

1617
import static me.tatarka.TestHelpers.writeBuildFile;
1718
import static me.tatarka.TestHelpers.writeFile;
@@ -85,12 +86,14 @@ public void assembleDebug() throws Exception {
8586
" }\n" +
8687
"}");
8788

89+
StringWriter errorOutput = new StringWriter();
8890
BuildResult result = GradleRunner.create()
8991
.withProjectDir(testProjectDir.getRoot())
9092
.withArguments("assembleDebug", "--stacktrace")
93+
.forwardStdError(errorOutput)
9194
.build();
9295

93-
assertThat(result.getStandardError()).isNullOrEmpty();
96+
assertThat(errorOutput.toString()).isNullOrEmpty();
9497

9598
File mainClassFile = new File(rootDir, "build/intermediates/transforms/retrolambda/debug/folders/1/1/retrolambda/test/MainActivity.class");
9699
File lambdaClassFile = new File(rootDir, "build/intermediates/transforms/retrolambda/debug/folders/1/1/retrolambda/test/MainActivity$$Lambda$1.class");
@@ -152,12 +155,14 @@ public void assembleDebugIncremental() throws Exception {
152155
" }\n" +
153156
"}");
154157

158+
StringWriter errorOutput = new StringWriter();
155159
BuildResult result = GradleRunner.create()
156160
.withProjectDir(testProjectDir.getRoot())
157161
.withArguments("assembleDebug", "--stacktrace")
162+
.forwardStdError(errorOutput)
158163
.build();
159164

160-
assertThat(result.getStandardError()).isNullOrEmpty();
165+
assertThat(errorOutput.toString()).isNullOrEmpty();
161166

162167
writeFile(javaFile, "package test;" +
163168
"import android.app.Activity;" +
@@ -170,12 +175,14 @@ public void assembleDebugIncremental() throws Exception {
170175
" }\n" +
171176
"}");
172177

178+
errorOutput = new StringWriter();
173179
result = GradleRunner.create()
174180
.withProjectDir(testProjectDir.getRoot())
175181
.withArguments("assembleDebug", "--stacktrace")
182+
.forwardStdError(errorOutput)
176183
.build();
177184

178-
assertThat(result.getStandardError()).isNullOrEmpty();
185+
assertThat(errorOutput.toString()).isNullOrEmpty();
179186

180187
File mainClassFile = new File(rootDir, "build/intermediates/transforms/retrolambda/debug/folders/1/1/retrolambda/test/MainActivity.class");
181188
File lambdaClassFile = new File(rootDir, "build/intermediates/transforms/retrolambda/debug/folders/1/1/retrolambda/test/MainActivity$$Lambda$1.class");
@@ -256,11 +263,13 @@ public void unitTest() throws Exception {
256263
" }\n" +
257264
"}");
258265

266+
StringWriter errorOutput = new StringWriter();
259267
BuildResult result = GradleRunner.create()
260268
.withProjectDir(testProjectDir.getRoot())
261269
.withArguments("test", "--stacktrace")
270+
.forwardStdError(errorOutput)
262271
.build();
263272

264-
assertThat(result.getStandardError()).isNullOrEmpty();
273+
assertThat(errorOutput.toString()).isNullOrEmpty();
265274
}
266275
}

‎gradle-retrolambda/src/test/java/me/tatarka/AndroidLibPluginTest.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import java.io.File;
1616
import java.io.IOException;
17+
import java.io.StringWriter;
1718

1819
import static me.tatarka.TestHelpers.writeBuildFile;
1920
import static me.tatarka.TestHelpers.writeFile;
@@ -87,12 +88,14 @@ public void assembleDebug() throws Exception {
8788
" }\n" +
8889
"}");
8990

91+
StringWriter errorOutput = new StringWriter();
9092
BuildResult result = GradleRunner.create()
9193
.withProjectDir(testProjectDir.getRoot())
9294
.withArguments("assembleDebug", "--stacktrace")
95+
.forwardStdError(errorOutput)
9396
.build();
9497

95-
assertThat(result.getStandardError()).isNullOrEmpty();
98+
assertThat(errorOutput.toString()).isNullOrEmpty();
9699

97100
File mainClassFile = new File(rootDir, "build/intermediates/transforms/retrolambda/debug/folders/1/1/retrolambda/test/MainActivity.class");
98101
File lambdaClassFile = new File(rootDir, "build/intermediates/transforms/retrolambda/debug/folders/1/1/retrolambda/test/MainActivity$$Lambda$1.class");
@@ -173,12 +176,14 @@ public void unitTest() throws Exception {
173176
" }\n" +
174177
"}");
175178

179+
StringWriter errorOutput = new StringWriter();
176180
BuildResult result = GradleRunner.create()
177181
.withProjectDir(testProjectDir.getRoot())
178182
.withArguments("test", "--stacktrace")
183+
.forwardStdError(errorOutput)
179184
.build();
180185

181-
assertThat(result.getStandardError()).isNullOrEmpty();
186+
assertThat(errorOutput.toString()).isNullOrEmpty();
182187
}
183188

184189
@Test
@@ -255,11 +260,13 @@ public void androidTest() throws Exception {
255260
" }\n" +
256261
"}");
257262

263+
StringWriter errorOutput = new StringWriter();
258264
BuildResult result = GradleRunner.create()
259265
.withProjectDir(testProjectDir.getRoot())
260266
.withArguments("connectedCheck", "--stacktrace")
267+
.forwardStdError(errorOutput)
261268
.build();
262269

263-
assertThat(result.getStandardError()).isNullOrEmpty();
270+
assertThat(errorOutput.toString()).isNullOrEmpty();
264271
}
265272
}

‎gradle-retrolambda/src/test/java/me/tatarka/JavaPluginTest.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import java.io.File;
1414
import java.io.IOException;
15+
import java.io.StringWriter;
1516

1617
import static me.tatarka.TestHelpers.writeBuildFile;
1718
import static me.tatarka.TestHelpers.writeFile;
@@ -55,12 +56,14 @@ public void assemble() throws Exception {
5556
" }\n" +
5657
"}");
5758

59+
StringWriter errorOutput = new StringWriter();
5860
BuildResult result = GradleRunner.create()
5961
.withProjectDir(testProjectDir.getRoot())
6062
.withArguments("assemble", "--stacktrace")
63+
.forwardStdError(errorOutput)
6164
.build();
6265

63-
assertThat(result.getStandardError()).isNullOrEmpty();
66+
assertThat(errorOutput.toString()).isNullOrEmpty();
6467

6568
File mainClassFile = new File(rootDir, "build/classes/main/Main.class");
6669
File lambdaClassFile = new File(rootDir, "build/classes/main/Main$$Lambda$1.class");
@@ -120,12 +123,14 @@ public void test() throws Exception {
120123
" }\n" +
121124
"}");
122125

126+
StringWriter errorOutput = new StringWriter();
123127
BuildResult result = GradleRunner.create()
124128
.withProjectDir(testProjectDir.getRoot())
125129
.withArguments("test", "--stacktrace")
130+
.forwardStdError(errorOutput)
126131
.build();
127132

128-
assertThat(result.getStandardError()).isNullOrEmpty();
133+
assertThat(errorOutput.toString()).isNullOrEmpty();
129134
}
130135

131136
@Test
@@ -161,12 +166,14 @@ public void run() throws Exception {
161166
" }\n" +
162167
"}");
163168

169+
StringWriter errorOutput = new StringWriter();
164170
BuildResult result = GradleRunner.create()
165171
.withProjectDir(testProjectDir.getRoot())
166172
.withArguments("run")
173+
.forwardStdError(errorOutput)
167174
.build();
168175

169-
assertThat(result.getStandardError()).isNullOrEmpty();
170-
assertThat(result.getStandardOutput()).contains("Hello, Lambda Run!");
176+
assertThat(errorOutput.toString()).isNullOrEmpty();
177+
assertThat(result.getOutput()).contains("Hello, Lambda Run!");
171178
}
172179
}

0 commit comments

Comments
 (0)