commit 8b0d5d93615462c88c8bbb1c3ba1b0954daa73da
author Goktug Gokdogan <goktug@google.com> Sat Dec 26 00:45:53 2015 -0800
committer Goktug Gokdogan <goktug@google.com> Sat Dec 26 01:03:34 2015 -0800
tree 73867c7f04fba79da798cf373831023a85c71f2e
parent ad8ed35116bf22efdfdcf6984a3a3d79e26ded04

Skip NullPointerException backing object test in JVM

Change-Id: I1fe380db58f27983a11f93633fcf95a789fd5b3f

user/test/com/google/gwt/emultest/java/lang/NullPointerExceptionTest.java

diff --git a/user/test/com/google/gwt/emultest/java/lang/NullPointerExceptionTest.java b/user/test/com/google/gwt/emultest/java/lang/NullPointerExceptionTest.java
index a72dcc2..8930a1a 100644
--- a/user/test/com/google/gwt/emultest/java/lang/NullPointerExceptionTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/NullPointerExceptionTest.java
@@ -16,9 +16,8 @@
 package com.google.gwt.emultest.java.lang;
 
 import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
 import com.google.gwt.junit.client.GWTTestCase;
+import com.google.gwt.testing.TestUtils;
 
 import jsinterop.annotations.JsFunction;
 
@@ -32,8 +31,11 @@
     return "com.google.gwt.emultest.EmulSuite";
   }
 
-  @DoNotRunWith(Platform.Devel)
   public void testBackingJsObject() {
+    // Do not run the test in JVM.
+    if (TestUtils.isJvm()) {
+      return;
+    }
     Object caughtNative = catchNpeInNative(new Callback() {
       @Override
       public void call() {