133 { 134 String moduleName = "m"; // 8163382 135 Path jmod = helper.generateDefaultJModule(moduleName).assertSuccess(); 136 JImageGenerator.getJLinkTask() 137 .modulePath(helper.defaultModulePath()) 138 .output(helper.createNewImageDir(moduleName)) 139 .addMods("m") 140 .option("") 141 .call().assertSuccess(); 142 moduleName = "mod"; 143 jmod = helper.generateDefaultJModule(moduleName).assertSuccess(); 144 JImageGenerator.getJLinkTask() 145 .modulePath(helper.defaultModulePath()) 146 .output(helper.createNewImageDir(moduleName)) 147 .addMods("m") 148 .option("") 149 .call().assertSuccess(); 150 } 151 152 { 153 // Help 154 StringWriter writer = new StringWriter(); 155 jdk.tools.jlink.internal.Main.run(new String[]{"--help"}, new PrintWriter(writer)); 156 String output = writer.toString(); 157 if (output.split("\n").length < 10) { 158 System.err.println(output); 159 throw new AssertionError("Help"); 160 } 161 } 162 163 { 164 // License files 165 String copied = "LICENSE"; 166 String[] arr = copied.split(","); 167 String[] copyFiles = new String[2]; 168 copyFiles[0] = "--copy-files"; 169 copyFiles[1] = copied; 170 Path imageDir = helper.generateDefaultImage(copyFiles, "composite2").assertSuccess(); 171 helper.checkImage(imageDir, "composite2", null, null, arr); 172 } | 133 { 134 String moduleName = "m"; // 8163382 135 Path jmod = helper.generateDefaultJModule(moduleName).assertSuccess(); 136 JImageGenerator.getJLinkTask() 137 .modulePath(helper.defaultModulePath()) 138 .output(helper.createNewImageDir(moduleName)) 139 .addMods("m") 140 .option("") 141 .call().assertSuccess(); 142 moduleName = "mod"; 143 jmod = helper.generateDefaultJModule(moduleName).assertSuccess(); 144 JImageGenerator.getJLinkTask() 145 .modulePath(helper.defaultModulePath()) 146 .output(helper.createNewImageDir(moduleName)) 147 .addMods("m") 148 .option("") 149 .call().assertSuccess(); 150 } 151 152 { 153 String moduleName = "m_8165735"; // JDK-8165735 154 helper.generateDefaultJModule(moduleName+"dependency").assertSuccess(); 155 Path jmod = helper.generateDefaultJModule(moduleName, moduleName+"dependency").assertSuccess(); 156 JImageGenerator.getJLinkTask() 157 .modulePath(helper.defaultModulePath()) 158 .repeatedModulePath(".") // second --module-path overrides the first one 159 .output(helper.createNewImageDir(moduleName)) 160 .addMods(moduleName) 161 // second --module-path does not have that module 162 .call().assertFailure("Error: Module m_8165735 not found"); 163 164 JImageGenerator.getJLinkTask() 165 .modulePath(".") // first --module-path overridden later 166 .repeatedModulePath(helper.defaultModulePath()) 167 .output(helper.createNewImageDir(moduleName)) 168 .addMods(moduleName) 169 // second --module-path has that module 170 .call().assertSuccess(); 171 172 JImageGenerator.getJLinkTask() 173 .modulePath(helper.defaultModulePath()) 174 .output(helper.createNewImageDir(moduleName)) 175 .limitMods(moduleName) 176 .repeatedLimitMods("java.base") // second --limit-modules overrides first 177 .addMods(moduleName) 178 .call().assertFailure("Error: Module m_8165735dependency not found, required by m_8165735"); 179 180 JImageGenerator.getJLinkTask() 181 .modulePath(helper.defaultModulePath()) 182 .output(helper.createNewImageDir(moduleName)) 183 .limitMods("java.base") 184 .repeatedLimitMods(moduleName) // second --limit-modules overrides first 185 .addMods(moduleName) 186 .call().assertSuccess(); 187 } 188 189 { 190 // Help 191 StringWriter writer = new StringWriter(); 192 jdk.tools.jlink.internal.Main.run(new String[]{"--help"}, new PrintWriter(writer)); 193 String output = writer.toString(); 194 if (output.split("\n").length < 10) { 195 System.err.println(output); 196 throw new AssertionError("Help"); 197 } 198 } 199 200 { 201 // License files 202 String copied = "LICENSE"; 203 String[] arr = copied.split(","); 204 String[] copyFiles = new String[2]; 205 copyFiles[0] = "--copy-files"; 206 copyFiles[1] = copied; 207 Path imageDir = helper.generateDefaultImage(copyFiles, "composite2").assertSuccess(); 208 helper.checkImage(imageDir, "composite2", null, null, arr); 209 } |