commonlisp
diff --git a/‎javalib/src/main/scala/java/net/URI.scala
Lines changed: 4 additions & 4 deletions b/‎javalib/src/main/scala/java/net/URI.scala
Lines changed: 4 additions & 4 deletions
diff --git a/‎test-suite/src/test/scala/org/scalajs/testsuite/javalib/URITest.scala
Lines changed: 11 additions & 2 deletions b/‎test-suite/src/test/scala/org/scalajs/testsuite/javalib/URITest.scala
Lines changed: 11 additions & 2 deletions
@@ -493,8 +493,8 @@ object URI {
     val absoluteURI = scheme+":(?:("+hier_part+")|("+opaque_part+"))" /*2CAPT*/
 
     // relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
-    val relativeURI = /*2CAPT*/
-      "(?:"+net_path+"|("+abs_path+")|("+rel_path+"))(?:\\?"+query+")?"
+    val relativeURI = /*3CAPT*/
+      "((?:"+net_path+"|("+abs_path+")|("+rel_path+"))(?:\\?"+query+")?)"
 
     // URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
     val uriRef = "^(?:"+absoluteURI+"|"+relativeURI+")(?:#"+fragment+")?$"
@@ -513,8 +513,8 @@ object URI {
     final val AbsAbsPath = AbsNetPath+1
     final val AbsQuery = AbsAbsPath+1
     final val AbsOpaquePart = AbsQuery+1
-    final val RelSchemeSpecificPart = 0 // It's the whole string
-    final val RelAuthority = AbsOpaquePart+1
+    final val RelSchemeSpecificPart = AbsOpaquePart+1 // Everything but the fragment
+    final val RelAuthority = RelSchemeSpecificPart+1
     final val RelUserInfo = RelAuthority+1
     final val RelHost = RelUserInfo+1
     final val RelPort = RelHost+1
 
@@ -100,7 +100,7 @@ object URITest extends JasmineTest {
       expectURI(new URI("docs/guide/collections/designfaq.html#28"), false, false)(
           path = "docs/guide/collections/designfaq.html",
           fragment = "28",
-          schemeSpecificPart = "docs/guide/collections/designfaq.html#28"
+          schemeSpecificPart = "docs/guide/collections/designfaq.html"
       )()
       expectURI(new URI("../../../demo/jfc/SwingSet2/src/SwingSet2.java"), false, false)(
           path = "../../../demo/jfc/SwingSet2/src/SwingSet2.java",
@@ -142,7 +142,16 @@ object URITest extends JasmineTest {
       expectURI(new URI("#foo"), false, false)(
           fragment = "foo",
           path = "",
-          schemeSpecificPart = "#foo"
+          schemeSpecificPart = ""
+          )()
+    }
+
+    it("should parse relative URIs with query and fragment") {
+      expectURI(new URI("?query=1#foo"), false, false)(
+          query = "query=1",
+          fragment = "foo",
+          path = "",
+          schemeSpecificPart = "?query=1"
45FE
;
           )()
     }