test/jdk/sun/security/jca/PreferredProviderNegativeTest.java

rev 59383 : [mq]: final

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 105,120 ****
      public static void main(String[] args)
              throws NoSuchAlgorithmException, NoSuchPaddingException {
  
          String expected;
          String value = args[1];
-         // If OS is solaris, expect OracleUcrypto, otherwise SunJCE
-         if (System.getProperty("os.name").toLowerCase().contains("sun")) {
-             expected = "OracleUcrypto";
-         } else {
              expected = "SunJCE";
-         }
  
          if (args.length >= 2) {
              switch (args[0]) {
                  case "preSet":
                      boolean negativeProvider = Boolean.valueOf(args[2]);
--- 105,115 ----