--- a/jdk/test/tools/launcher/Arrrghs.java	Wed Feb 01 16:00:39 2012 -0800
+++ b/jdk/test/tools/launcher/Arrrghs.java	Thu Feb 02 15:37:22 2012 -0800
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 5030233 6214916 6356475 6571029 6684582 6742159 4459600 6758881 6753938
- *      6894719 6968053 7067922
+ *      6894719 6968053
  * @summary Argument parsing validation.
  * @compile -XDignore.symbol.file Arrrghs.java
  * @run main Arrrghs
@@ -373,21 +373,6 @@
         System.out.println(tr);
     }
 
-    /*
-     * a missing manifest entry 7067922, we ignore this test for locales
-     * which are localized, thus the testing is limited to English locales.
-     */
-    static void test7067922() {
-        if (!isEnglishLocale()) {
-            return;
-        }
-        TestResult tr = null;
-        createJar("cvf", "missingmainentry.jar", ".");
-        tr = doExec(javaCmd, "-jar", "missingmainentry.jar");
-        tr.contains("no main manifest attribute");
-        System.out.println(tr);
-    }
-
     /**
      * @param args the command line arguments
      * @throws java.io.FileNotFoundException
@@ -400,7 +385,6 @@
         runBasicErrorMessageTests();
         runMainMethodTests();
         test6894719();
-        test7067922();
         runDiagOptionTests();
         if (testExitValue > 0) {
             System.out.println("Total of " + testExitValue + " failed");

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/tools/launcher/MainClassAttributeTest.java	Thu Feb 02 15:37:22 2012 -0800
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2012, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 7067922
+ * @author sogoel
+ * @summary Test negative scenarios for main class attribute
+ * @build MainClassAttributeTest
+ * @run main MainClassAttributeTest
+ */
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * This tests negative scenarios for Main class entry in a jar file.
+ * An error should be thrown for each of the test cases when such a
+ * jar is executed.
+ */
+
+public class MainClassAttributeTest extends TestHelper {
+
+    /*
+     * These tests compare messages which could be localized, therefore
+     * these tests compare messages only with English locales, and
+     * for all other locales,  the exit values are checked.
+     */
+    static void runTest(File jarFile, String expectedErrorMessage) {
+        TestResult tr = doExec(TestHelper.javaCmd,
+                "-jar", jarFile.getAbsolutePath());
+        if (isEnglishLocale() && !tr.contains(expectedErrorMessage)) {
+            System.out.println(tr);
+            throw new RuntimeException("expected string not found");
+        }
+        if (tr.isOK()) {
+            System.out.println(tr);
+            throw new RuntimeException("test exit with status 0");
+        }
+    }
+
+    // Missing manifest entry
+    static void test1() throws IOException {
+        File jarFile = new File("missingmainentry.jar");
+        createJar("cvf", jarFile.getName(), ".");
+        runTest(jarFile, "no main manifest attribute");
+    }
+
+    // Entry point in manifest file has .class extension
+    static void test2() throws IOException {
+        File jarFile = new File("extensionmainentry.jar");
+        createJar("Foo.class", jarFile, new File("Foo"), (String[])null);
+        runTest(jarFile, "Error: Could not find or load main class");
+    }
+
+    // Entry point in manifest file is misspelled
+    static void test3() throws IOException {
+        File jarFile = new File("misspelledmainentry.jar");
+        createJar("FooMIS", jarFile, new File("Foo"), (String[])null);
+        runTest(jarFile, "Error: Could not find or load main class");
+    }
+
+    // Main-Class attribute is misspelled in manifest file
+    static void test4() throws IOException {
+        File jarFile = new File("misspelledMainAttribute.jar");
+        File manifestFile = new File("manifest.txt");
+        List<String> contents = new ArrayList<>();
+        contents.add("MainClassName: Foo");
+        createFile(manifestFile, contents);
+        createJar("-cmf", manifestFile.getName(), jarFile.getName());
+        runTest(jarFile, "no main manifest attribute");
+    }
+
+    public static void main(String[] args) throws IOException {
+        test1();
+        test2();
+        test3();
+        test4();
+    }
+}