Skip to content

Commit 80fc613

Browse files
committed
Revert "Disable integration tests that has no possibility to work."
This reverts commit 28f1176.
1 parent edc6b1b commit 80fc613

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

tests/binding-integrated-Tests/BindingBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void AdjustApiXml ()
255255
api.FindDefects ();
256256
api.Save (project.GeneratedApiXmlFile);
257257
project.ApiXmlAdjusterExecutionOutput = writer.ToString ();
258-
if (!project.IgnoreApiXmlAdjusterWarnings && project.ApiXmlAdjusterExecutionOutput != string.Empty)
258+
if (project.ApiXmlAdjusterExecutionOutput != string.Empty)
259259
throw new Exception ("api-xml-adjuster failed: " + project.ApiXmlAdjusterExecutionOutput);
260260
}
261261

tests/binding-integrated-Tests/BindingProject.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ public class BindingProject
2020
public string Id { get; set; }
2121

2222
public string JavacOptions { get; set; } = "-g";
23-
public string GeneratorOptions { get; set; } = " --codegen-target=XAJavaInterop1 --public";
23+
public string GeneratorOptions { get; internal set; } = " --codegen-target=XAJavaInterop1 --public";
2424
public CSharpStubUsage CSharpStubUsage { get; set; } = CSharpStubUsage.Full;
25-
public bool IgnoreApiXmlAdjusterWarnings { get; set; }
2625

2726
public IList<string> JavaSourceFiles { get; set; } = new List<string> ();
2827
public IList<SourceFile> JavaSourceStrings { get; set; } = new List<SourceFile> ();

tests/binding-integrated-Tests/SampleTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,12 @@ public void VerifyCsc ()
145145
builder.Clean ();
146146
builder.Build ();
147147

148-
var dll = Path.Combine (builder.IntermediateOutputPathAbsolute, project.Id + ".dll");
148+
var dll = Path.Combine (builder.IntermediateOutputPathAbsolute, project.Id);
149149
Assert.AreEqual (dll, project.GeneratedDllFile, "C# generated code directory path mismatch.");
150150
Assert.IsTrue (File.Exists (dll), "gnerated dll not found");
151151
}
152152

153153
[Test]
154-
[Ignore ("rt.jar should be resolved at api-xml-adjuster step too, which is not part of its feature.")]
155154
public void BindRtJar ()
156155
{
157156
var project = new BindingProject { Id = nameof (BindRtJar) };

0 commit comments

Comments
 (0)